Feature/10456 question start index 1.1 fix #10456 (#10462)

* Support survey showQuestionNumbers: "recursive" & questionStartIndex: "1.1." fix #10456

* FIx unit tests

* Remove duplication for getStartIndex function

Author: andrewtelnov

packages/survey-core/src/page.ts

@@ -160,6 +160,21 @@ export class PageModel extends PanelModel implements IPage {
   protected canRenderFirstRows(): boolean {
     return !this.isDesignMode || this.visibleIndex == 0;
   }
+  protected isQuestionIndexRecursive(): boolean {
+    const res = super.isQuestionIndexRecursive();
+    return res && this.isComplexIndex(this.getStartIndex());
+  }
+  protected getPanelStartIndex(index: number): number {
+    if (this.isQuestionIndexRecursive()) return 0;
+    return index;
+  }
+  getQuestionStartIndex(): string {
+    const res = this.getStartIndex();
+    if (this.isQuestionIndexRecursive()) {
+      return this.getQuestionStartIndexVsVisibleIndex(res, this.visibleIndex);
+    }
+    return res;
+  }
   /**
    * Returns `true` if this page is a start page.
    *

packages/survey-core/src/panel.ts

@@ -1367,13 +1367,34 @@ export class PanelModelBase extends SurveyElement<Question>
     (el as any).setPropertyValueDirectly("effectiveColSpan", result.length);
     return result;
   }
-  protected getStartIndex(): string {
-    if (!!this.parent) return this.parent.getQuestionStartIndex();
-    if (!!this.survey) return this.survey.questionStartIndex;
-    return "";
+  protected isQuestionIndexRecursive(): boolean {
+    return !!this.survey && this.survey.showQuestionNumbers === "recursive";
   }
   getQuestionStartIndex(): string {
-    return this.getStartIndex();
+    const res = this.getStartIndex();
+    if (this.isQuestionIndexRecursive()) {
+      return this.getStartIndexSubs(res, true);
+    }
+    return res;
+  }
+  protected getStartIndexSubs(str: string, isLast: boolean): string {
+    if (!str || !this.isComplexIndex(str)) return str;
+    const lastChar = str[str.length - 1] === "." ? "." : "";
+    if (lastChar) {
+      str = str.substring(0, str.length - 1);
+    }
+    const lastIndex = str.lastIndexOf(".");
+    str += lastChar;
+    return isLast ? str.substring(lastIndex + 1) : str.substring(0, lastIndex + 1);
+  }
+  protected getQuestionStartIndexVsVisibleIndex(str: string, index: number): string {
+    const prefix = this.getStartIndexSubs(str, false);
+    const postfix = this.getStartIndexSubs(str, true);
+    return Helpers.getNumberByIndex(index, prefix) + postfix;
+  }
+  protected isComplexIndex(str: string): boolean {
+    const index = str.indexOf(".");
+    return index > -1 && index < str.length - 1;
   }
   getChildrenLayoutType(): string {
     return "row";
@@ -2207,7 +2228,7 @@ export class PanelModel extends PanelModelBase implements IElement {
     this.notifySurveyOnVisibilityChanged();
   }
   public addNoFromChild(no: string): string {
-    if (this.isQuestionIndexRecursive)
+    if (this.isQuestionIndexRecursive())
       return this.calcNo() + no;
     return super.addNoFromChild(no);
   }
@@ -2251,8 +2272,10 @@ export class PanelModel extends PanelModelBase implements IElement {
     this.setPropertyValue("questionStartIndex", val);
   }
   getQuestionStartIndex(): string {
-    if (!!this.questionStartIndex) return this.questionStartIndex;
-    return super.getQuestionStartIndex();
+    const res = this.questionStartIndex;
+    if (!!res && this.isQuestionIndexOnPanel && this.isComplexIndex(res))
+      return this.getQuestionStartIndexVsVisibleIndex(res, this.visibleIndex);
+    return res || super.getQuestionStartIndex();
   }
   /**
    * A question number or letter (depends on the `questionStartIndex` property).
@@ -2298,7 +2321,7 @@ export class PanelModel extends PanelModelBase implements IElement {
   protected beforeSetVisibleIndex(index: number): number {
     if (this.isPage || !this.parent) return super.beforeSetVisibleIndex(index);
     let visibleIndex = -1;
-    if ((this.showNumber || this.isQuestionIndexRecursive) && (this.isDesignMode || !this.locTitle.isEmpty || this.hasParentInQuestionIndex())) {
+    if ((this.showNumber || this.isQuestionIndexRecursive()) && (this.isDesignMode || !this.locTitle.isEmpty || this.hasParentInQuestionIndex())) {
       visibleIndex = index;
     }
     this.setPropertyValue("visibleIndex", visibleIndex);
@@ -2311,13 +2334,12 @@ export class PanelModel extends PanelModelBase implements IElement {
     return index;
   }
   private get isQuestionIndexOnPanel(): boolean {
-    return this.showQuestionNumbers === "onpanel" || this.isQuestionIndexRecursive;
+    return this.showQuestionNumbers === "onpanel" || this.isQuestionIndexRecursive();
   }
-  private get isQuestionIndexRecursive(): boolean {
-    if (this.isPage) return false;
+  protected isQuestionIndexRecursive(): boolean {
     const val = this.showQuestionNumbers;
     if (val !== "default") return val === "recursive";
-    return !!this.survey && this.survey.showQuestionNumbers === "recursive";
+    return super.isQuestionIndexRecursive();
   }
   private hasParentInQuestionIndex(): boolean {
     if (!this.isQuestionIndexOnPanel) return false;

packages/survey-core/src/question.ts

@@ -2125,9 +2125,11 @@ export class Question extends SurveyElement<Question>
   private calcNo(): string {
     if (!this.hasTitle || !this.showNumber) return "";
     let parentIndex: number | undefined;
+    /*
     if (!!this.parent) {
       parentIndex = (<any>this.parent).visibleIndex;
     }
+    */
     let no = Helpers.getNumberByIndex(this.visibleIndex, this.getStartIndex(), parentIndex);
     if (!!this.parent) {
       no = (<any>this.parent).addNoFromChild(no);
@@ -2137,11 +2139,6 @@ export class Question extends SurveyElement<Question>
     }
     return no;
   }
-  protected getStartIndex(): string {
-    if (!!this.parent) return this.parent.getQuestionStartIndex();
-    if (!!this.survey) return this.survey.questionStartIndex;
-    return "";
-  }
   public onSurveyLoad(): void {
     this.isCustomWidgetRequested = false;
     this.fireCallback(this.surveyLoadCallback);

packages/survey-core/src/survey-element.ts

@@ -851,6 +851,11 @@ export class SurveyElement<E = any> extends SurveyElementCore implements ISurvey
   public setVisibleIndex(index: number): number {
     return 0;
   }
+  protected getStartIndex(): string {
+    if (!!this.parent) return this.parent.getQuestionStartIndex();
+    if (!!this.survey) return this.survey.questionStartIndex;
+    return "";
+  }
   public delete(doDispose: boolean): void { }
   //ILocalizableOwner
   locOwner: ILocalizableOwner;

packages/survey-core/tests/paneltests.ts

@@ -3478,7 +3478,7 @@ QUnit.test("panel.showQuestionNumbers: 'recursive'", function (assert) {
   assert.equal(survey.getQuestionByName("q6").no, "2.2.", "q6.no");
   assert.equal(survey.getQuestionByName("q7").no, "3.", "q7.no");
 });
-QUnit.test("panel.showQuestionNumbers: 'recursive'", function (assert) {
+QUnit.test("survey.showQuestionNumbers: 'recursive' & panels", function (assert) {
   const survey = new SurveyModel({
     showQuestionNumbers: "recursive",
     elements: [
@@ -3520,6 +3520,61 @@ QUnit.test("panel.showQuestionNumbers: 'recursive'", function (assert) {
   assert.equal(survey.getQuestionByName("q6").no, "2.2.", "q6.no");
   assert.equal(survey.getQuestionByName("q7").no, "3.", "q7.no");
 });
+QUnit.test("survey.showQuestionNumbers: 'recursive' & panels & questionStartIndex 1.1, Issue#10456", function (assert) {
+  const survey = new SurveyModel();
+  survey.fromJSON({
+    showQuestionNumbers: "recursive",
+    questionStartIndex: "1.1.",
+    pages: [{
+      elements: [
+        {
+          type: "panel", name: "panel1", title: "Panel 1",
+          showNumber: true,
+          elements: [
+            {
+              type: "panel", name: "panel2",
+              title: "Panel 2",
+              elements: [
+                { type: "text", name: "q1" },
+                { type: "text", name: "q2" }
+              ]
+            },
+            { type: "text", name: "q3" },
+            { type: "text", name: "q4" }
+          ]
+        },
+        { type: "panel", name: "panel3", showNumber: true, title: "Panel 4", elements: [
+          { type: "text", name: "q5" }
+        ] },
+        { type: "text", name: "q6" }
+      ] },
+    {
+      elements: [
+        {
+          type: "panel", name: "panel4",
+          showNumber: true, title: "Panel 3",
+          elements: [
+            { type: "text", name: "q7" },
+            { type: "text", name: "q8" }
+          ]
+        },
+        { type: "text", name: "q9" }
+      ] }]
+  });
+  assert.equal(survey.getPanelByName("panel1").no, "1.1.", "panel1.no");
+  assert.equal(survey.getPanelByName("panel2").no, "1.1.1.", "panel2.no");
+  assert.equal(survey.getPanelByName("panel3").no, "1.2.", "panel2.no");
+  assert.equal(survey.getPanelByName("panel4").no, "2.1.", "panel4.no");
+  assert.equal(survey.getQuestionByName("q1").no, "1.1.1.1.", "q1.no");
+  assert.equal(survey.getQuestionByName("q2").no, "1.1.1.2.", "q2.no");
+  assert.equal(survey.getQuestionByName("q3").no, "1.1.2.", "q3.no");
+  assert.equal(survey.getQuestionByName("q4").no, "1.1.3.", "q4.no");
+  assert.equal(survey.getQuestionByName("q5").no, "1.2.1.", "q5.no");
+  assert.equal(survey.getQuestionByName("q6").no, "1.3.", "q6.no");
+  assert.equal(survey.getQuestionByName("q7").no, "2.1.1.", "q7.no");
+  assert.equal(survey.getQuestionByName("q8").no, "2.1.2.", "q8.no");
+  assert.equal(survey.getQuestionByName("q9").no, "2.2.", "q9.no");
+});
 QUnit.test("Check that startWithNewLine doesn't trigger animation", (assert) => {
   settings.animationEnabled = true;
   const survey = new SurveyModel({

packages/survey-core/tests/surveyquestiontests.ts

@@ -8378,7 +8378,7 @@ QUnit.test("survey.validateVisitedEmptyFields #8640", function (assert) {
     assert.equal(q.errors.length, 1, q.name + " errors");
   });
 });
-QUnit.test("Show parent number in the question #8813, #1", function (assert) {
+QUnit.test("Show parent number in the question Bug#8813, #1", function (assert) {
   const survey = new SurveyModel({
     showQuestionNumbers: "on",
     elements: [