@ibiz-template/runtime 0.4.1 → 0.4.3-dev.0

package/out/controller/control/form/form-detail/form-mdctrl/form-mdctrl-md.controller.d.ts

@@ -27,6 +27,14 @@ export declare class FormMDCtrlMDController extends FormMDCtrlController {
      * @type {IMDControlController}
      */
     mdController: IMDControlController;
+    /**
+     * 表单项名称
+     *
+     * @author lxm
+     * @date 2022-09-04 18:09:32
+     * @readonly
+     */
+    get name(): string;
     protected onInit(): Promise<void>;
     /**
      * 设置多数据部件控制器
@@ -35,6 +43,7 @@ export declare class FormMDCtrlMDController extends FormMDCtrlController {
      * @param {IMDControlController} controller
      */
     setMDControl(controller: IMDControlController): void;
+    updateFormItem(): Promise<void>;
     /**
      * 删除多数据选中的数据
      * @author lxm

package/out/controller/control/form/form-detail/form-mdctrl/form-mdctrl-md.controller.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"form-mdctrl-md.controller.d.ts","sourceRoot":"","sources":["../../../../../../src/controller/control/form/form-detail/form-mdctrl/form-mdctrl-md.controller.ts"],"names":[],"mappings":"AAKA,OAAO,EACL,gBAAgB,EAEhB,oBAAoB,EACrB,MAAM,0BAA0B,CAAC;AAElC,OAAO,EAAE,oBAAoB,EAAE,MAAM,0BAA0B,CAAC;AAChE,OAAO,EAAE,eAAe,EAAE,MAAM,sBAAsB,CAAC;AAEvD;;;;;;;;;GASG;AACH,qBAAa,sBAAuB,SAAQ,oBAAoB;IAC9D;;;;;;OAMG;IACH,UAAU,EAAG,gBAAgB,CAAC;IAE9B;;;;;OAKG;IACH,YAAY,EAAG,oBAAoB,CAAC;cAEpB,MAAM,IAAI,OAAO,CAAC,IAAI,CAAC;IAqBvC;;;;;OAKG;IACH,YAAY,CAAC,UAAU,EAAE,oBAAoB,GAAG,IAAI;IAYpD;;;;OAIG;IACH,MAAM,IAAI,IAAI;IAId;;;;OAIG;IACH,MAAM,IAAI,IAAI;IAWd,OAAO,IAAI,IAAI;IAQf;;;;;OAKG;IACG,eAAe,CAAC,KAAK,EAAE,eAAe,GAAG,OAAO,CAAC,IAAI,CAAC;IAKtD,gBAAgB,CAAC,KAAK,EAAE,MAAM,EAAE,GAAG,OAAO,CAAC,IAAI,CAAC;CAQvD"}
+{"version":3,"file":"form-mdctrl-md.controller.d.ts","sourceRoot":"","sources":["../../../../../../src/controller/control/form/form-detail/form-mdctrl/form-mdctrl-md.controller.ts"],"names":[],"mappings":"AAKA,OAAO,EACL,gBAAgB,EAEhB,oBAAoB,EACrB,MAAM,0BAA0B,CAAC;AAElC,OAAO,EAAE,oBAAoB,EAAE,MAAM,0BAA0B,CAAC;AAChE,OAAO,EAAE,eAAe,EAAE,MAAM,sBAAsB,CAAC;AAEvD;;;;;;;;;GASG;AACH,qBAAa,sBAAuB,SAAQ,oBAAoB;IAC9D;;;;;;OAMG;IACH,UAAU,EAAG,gBAAgB,CAAC;IAE9B;;;;;OAKG;IACH,YAAY,EAAG,oBAAoB,CAAC;IAEpC;;;;;;OAMG;IACH,IAAI,IAAI,IAAI,MAAM,CAEjB;cAEe,MAAM,IAAI,OAAO,CAAC,IAAI,CAAC;IAqBvC;;;;;OAKG;IACH,YAAY,CAAC,UAAU,EAAE,oBAAoB,GAAG,IAAI;IAYpD,cAAc,IAAI,OAAO,CAAC,IAAI,CAAC;IAM/B;;;;OAIG;IACH,MAAM,IAAI,IAAI;IAId;;;;OAIG;IACH,MAAM,IAAI,IAAI;IAWd,OAAO,IAAI,IAAI;IAQf;;;;;OAKG;IACG,eAAe,CAAC,KAAK,EAAE,eAAe,GAAG,OAAO,CAAC,IAAI,CAAC;IAKtD,gBAAgB,CAAC,KAAK,EAAE,MAAM,EAAE,GAAG,OAAO,CAAC,IAAI,CAAC;CAQvD"}

package/out/controller/control/form/form-detail/form-mdctrl/form-mdctrl-md.controller.js

@@ -12,6 +12,16 @@ import { FormMDCtrlController } from './form-mdctrl.controller';
  * @extends {FormDetailController<IDEFormMDCtrl>}
  */
 export class FormMDCtrlMDController extends FormMDCtrlController {
+    /**
+     * 表单项名称
+     *
+     * @author lxm
+     * @date 2022-09-04 18:09:32
+     * @readonly
+     */
+    get name() {
+        return this.model.id;
+    }
     async onInit() {
         await super.onInit();
         const { contentControl } = this.model;
@@ -46,6 +56,11 @@ export class FormMDCtrlMDController extends FormMDCtrlController {
             this.updateFormItem();
         });
     }
+    updateFormItem() {
+        const items = this.mdController.state.items || [];
+        this.data[this.name] = items;
+        return super.updateFormItem();
+    }
     /**
      * 删除多数据选中的数据
      * @author lxm

package/out/controller/control/report-panel/generator/user-generator.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"user-generator.d.ts","sourceRoot":"","sources":["../../../../../src/controller/control/report-panel/generator/user-generator.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,wBAAwB,EAAE,MAAM,kBAAkB,CAAC;AAE5D;;;;;;GAMG;AACH,qBAAa,wBAAyB,SAAQ,wBAAwB;IACpE;;;;;OAKG;IACH,SAAS,CAAC,SAAS,IAAI,IAAI;IAiC3B;;;;;;OAMG;IACI,IAAI,CAAC,IAAI,EAAE,KAAK,GAAG,OAAO,CAAC,KAAK,CAAC;CAMzC"}
+{"version":3,"file":"user-generator.d.ts","sourceRoot":"","sources":["../../../../../src/controller/control/report-panel/generator/user-generator.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,wBAAwB,EAAE,MAAM,kBAAkB,CAAC;AAE5D;;;;;;GAMG;AACH,qBAAa,wBAAyB,SAAQ,wBAAwB;IACpE;;;;;OAKG;IACH,SAAS,CAAC,SAAS,IAAI,IAAI;IAoC3B;;;;;;OAMG;IACI,IAAI,CAAC,IAAI,EAAE,KAAK,GAAG,OAAO,CAAC,KAAK,CAAC;CAMzC"}

package/out/controller/control/report-panel/generator/user-generator.js

@@ -27,18 +27,20 @@ export class UserReportPanelGenerator extends ReportPanelBaseGenerator {
                 },
             },
             NODELEGENDCONFIG: {
-                valueField: 'source_lables',
-                selected: "{{return Object.is(data.source_lables, 'NEO4J_ZT')}}",
+                valueField: 'source_lables||target_lables',
+                selected: "{{return Object.is(data.source_lables, 'NEO4J_ZT') || Object.is(data.target_lables, 'NEO4J_ZT')}}",
+                codeListTag: 'web.nodetype',
             },
             EDGELEGENDCONFIG: {
                 valueField: 'relationship_type',
+                codeListTag: 'web.relationshiptype',
             },
             PLUGINCONFIG: {
                 gridConfig: {},
                 miniMapConfig: {},
             },
             HOOKS: {
-                nodeDataHook: "{{ data.forEach(node => {Object.assign(node, { label: node.data.name, size: 66,donutAttrs: { prop1: 10000, prop2: 10 },donutColorMap: { prop1: '#0095ee', prop2: '#0095ee' },icon: {show: true,img: './assets/images/user-avatar.png',width: 40,height: 40}})})}}",
+                nodeDataHook: "{{ data.forEach(node => { const type = node.data.source_lables || node.data.target_lables; Object.assign(node, { label: node.data.name, size: 66, style: { fill: node.color },donutAttrs: { prop1: 10000, prop2: 10 },donutColorMap: { prop1: node.color, prop2: node.color },icon: {show: true,img: type === 'NEO4J_ZT' ? './assets/images/user-avatar.png' : './assets/images/phone.png',width: 40,height: 40}})})}}",
                 edgeDataHook: '{{ data.forEach(edge => {Object.assign(edge, { label: edge.name })}) }}',
             },
         };

package/out/controller/utils/button-state/ui-action-button.state.d.ts

@@ -22,8 +22,22 @@ export declare class UIActionButtonState implements IButtonState {
     protected noPermissionHidden: boolean;
     /**
      * 有权限时且没数据时，是否禁用
+     *
+     * @author chitanda
+     * @date 2023-11-30 11:11:14
+     * @protected
+     * @type {boolean}
      */
     protected noDataDisabled: boolean;
+    /**
+     * 有权限时且没主键时，是否禁用
+     *
+     * @author chitanda
+     * @date 2023-11-30 11:11:03
+     * @protected
+     * @type {boolean}
+     */
+    protected noKeyDisabled: boolean;
     /**
      * 操作标识
      */

package/out/controller/utils/button-state/ui-action-button.state.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"ui-action-button.state.d.ts","sourceRoot":"","sources":["../../../../src/controller/utils/button-state/ui-action-button.state.ts"],"names":[],"mappings":"AAEA,OAAO,EAAE,YAAY,EAAE,MAAM,+BAA+B,CAAC;AAG7D;;;;;;;GAOG;AACH,qBAAa,mBAAoB,YAAW,YAAY;IACtD,IAAI,EAAE,MAAM,CAAC;IAEb,QAAQ,EAAE,OAAO,CAAS;IAE1B,OAAO,EAAE,OAAO,CAAQ;IAExB,OAAO,EAAE,OAAO,CAAS;IAEzB;;OAEG;IACH,SAAS,CAAC,SAAS,EAAE,OAAO,CAAQ;IAEpC;;OAEG;IACH,SAAS,CAAC,kBAAkB,EAAE,OAAO,CAAQ;IAE7C;;OAEG;IACH,SAAS,CAAC,cAAc,EAAE,OAAO,CAAS;IAE1C;;OAEG;IACH,SAAS,CAAC,gBAAgB,CAAC,EAAE,MAAM,CAAC;IAEpC;;OAEG;IACH,SAAS,CAAC,KAAK,EAAE,MAAM,CAAC;IAExB;;OAEG;IACH,SAAS,CAAC,UAAU,CAAC,EAAE,MAAM,CAAC;IAE9B;;OAEG;IACH,SAAS,CAAC,SAAS,CAAC,EAAE,MAAM,CAAC;IAE7B;;OAEG;IACH,SAAS,CAAC,MAAM,EAAE,OAAO,CAAS;gBAEtB,IAAI,EAAE,MAAM,EAAE,KAAK,EAAE,MAAM,EAAE,UAAU,CAAC,EAAE,MAAM;IAM5D;;;;;;OAMG;cACa,IAAI,IAAI,OAAO,CAAC,IAAI,CAAC;IA4CrC;;;;;;;;OAQG;cACa,cAAc,CAC5B,IAAI,CAAC,EAAE,KAAK,EACZ,OAAO,CAAC,EAAE,MAAM,GACf,OAAO,CAAC,IAAI,CAAC;IAkBV,MAAM,CAAC,IAAI,CAAC,EAAE,KAAK,EAAE,OAAO,CAAC,EAAE,MAAM,GAAG,OAAO,CAAC,IAAI,CAAC;CAgB5D"}
+{"version":3,"file":"ui-action-button.state.d.ts","sourceRoot":"","sources":["../../../../src/controller/utils/button-state/ui-action-button.state.ts"],"names":[],"mappings":"AAEA,OAAO,EAAE,YAAY,EAAE,MAAM,+BAA+B,CAAC;AAG7D;;;;;;;GAOG;AACH,qBAAa,mBAAoB,YAAW,YAAY;IACtD,IAAI,EAAE,MAAM,CAAC;IAEb,QAAQ,EAAE,OAAO,CAAS;IAE1B,OAAO,EAAE,OAAO,CAAQ;IAExB,OAAO,EAAE,OAAO,CAAS;IAEzB;;OAEG;IACH,SAAS,CAAC,SAAS,EAAE,OAAO,CAAQ;IAEpC;;OAEG;IACH,SAAS,CAAC,kBAAkB,EAAE,OAAO,CAAQ;IAE7C;;;;;;;OAOG;IACH,SAAS,CAAC,cAAc,EAAE,OAAO,CAAS;IAE1C;;;;;;;OAOG;IACH,SAAS,CAAC,aAAa,EAAE,OAAO,CAAS;IAEzC;;OAEG;IACH,SAAS,CAAC,gBAAgB,CAAC,EAAE,MAAM,CAAC;IAEpC;;OAEG;IACH,SAAS,CAAC,KAAK,EAAE,MAAM,CAAC;IAExB;;OAEG;IACH,SAAS,CAAC,UAAU,CAAC,EAAE,MAAM,CAAC;IAE9B;;OAEG;IACH,SAAS,CAAC,SAAS,CAAC,EAAE,MAAM,CAAC;IAE7B;;OAEG;IACH,SAAS,CAAC,MAAM,EAAE,OAAO,CAAS;gBAEtB,IAAI,EAAE,MAAM,EAAE,KAAK,EAAE,MAAM,EAAE,UAAU,CAAC,EAAE,MAAM;IAM5D;;;;;;OAMG;cACa,IAAI,IAAI,OAAO,CAAC,IAAI,CAAC;IAgDrC;;;;;;;;OAQG;cACa,cAAc,CAC5B,IAAI,CAAC,EAAE,KAAK,EACZ,OAAO,CAAC,EAAE,MAAM,GACf,OAAO,CAAC,IAAI,CAAC;IAkBV,MAAM,CAAC,IAAI,CAAC,EAAE,KAAK,EAAE,OAAO,CAAC,EAAE,MAAM,GAAG,OAAO,CAAC,IAAI,CAAC;CAiB5D"}

package/out/controller/utils/button-state/ui-action-button.state.js

@@ -22,8 +22,22 @@ export class UIActionButtonState {
         this.noPermissionHidden = true;
         /**
          * 有权限时且没数据时，是否禁用
+         *
+         * @author chitanda
+         * @date 2023-11-30 11:11:14
+         * @protected
+         * @type {boolean}
          */
         this.noDataDisabled = false;
+        /**
+         * 有权限时且没主键时，是否禁用
+         *
+         * @author chitanda
+         * @date 2023-11-30 11:11:03
+         * @protected
+         * @type {boolean}
+         */
+        this.noKeyDisabled = false;
         /**
          *  是否初始化
          */
@@ -70,6 +84,10 @@ export class UIActionButtonState {
                     'RemoveAndExit',
                 ].includes(uiactionTag))) {
             this.noDataDisabled = true;
+            // 单项数据主键或者多项数据主键的时候，没主键的时候需要禁用
+            if (actionTarget === 'SINGLEKEY' || actionTarget === 'MULTIKEY') {
+                this.noKeyDisabled = true;
+            }
         }
         this.isInit = true;
     }
@@ -106,8 +124,9 @@ export class UIActionButtonState {
         else {
             // 有权限时显示
             this.visible = true;
-            // 有权限时没数据有些要禁用
-            this.disabled = this.noDataDisabled && !data;
+            // 有权限时没数据有些要禁用，有数据没主见时(单项数据)需要禁用
+            this.disabled =
+                this.noDataDisabled && (!data || (this.noKeyDisabled && !data.srfkey));
         }
     }
 }

package/out/utils/nav-params/nav-params.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"nav-params.d.ts","sourceRoot":"","sources":["../../../src/utils/nav-params/nav-params.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,cAAc,EAAE,MAAM,kBAAkB,CAAC;AAIlD;;;;;;;GAOG;AACH,wBAAgB,wBAAwB,CAAC,SAAS,EAAE,KAAK,GAAG,cAAc,EAAE,CAmB3E;AAED;;;;;;;;;;;;GAYG;AACH,wBAAgB,cAAc,CAC5B,SAAS,EAAE,cAAc,EAAE,GAAG,KAAK,GAAG,SAAS,GAAG,IAAI,EACtD,GAAG,OAAO,EAAE,KAAK,EAAE,GAClB,KAAK,CAYP;AA8BD;;;;;;;;;;;;GAYG;AACH,wBAAgB,qBAAqB,CACnC,SAAS,EAAE,cAAc,EAAE,EAC3B,GAAG,OAAO,EAAE,KAAK,EAAE,GAClB,KAAK,CA8BP;AAED;;;;;;;;GAQG;AACH,wBAAgB,eAAe,CAC7B,SAAS,EAAE,cAAc,EAAE,GAAG,KAAK,GAAG,SAAS,GAAG,IAAI,EACtD,OAAO,EAAE,KAAK,EAAE,GACf,KAAK,CAsBP"}
+{"version":3,"file":"nav-params.d.ts","sourceRoot":"","sources":["../../../src/utils/nav-params/nav-params.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,cAAc,EAAE,MAAM,kBAAkB,CAAC;AAIlD;;;;;;;GAOG;AACH,wBAAgB,wBAAwB,CAAC,SAAS,EAAE,KAAK,GAAG,cAAc,EAAE,CAmB3E;AAED;;;;;;;;;;;;GAYG;AACH,wBAAgB,cAAc,CAC5B,SAAS,EAAE,cAAc,EAAE,GAAG,KAAK,GAAG,SAAS,GAAG,IAAI,EACtD,GAAG,OAAO,EAAE,KAAK,EAAE,GAClB,KAAK,CAYP;AA8BD;;;;;;;;;;;;GAYG;AACH,wBAAgB,qBAAqB,CACnC,SAAS,EAAE,cAAc,EAAE,EAC3B,GAAG,OAAO,EAAE,KAAK,EAAE,GAClB,KAAK,CAkCP;AAED;;;;;;;;GAQG;AACH,wBAAgB,eAAe,CAC7B,SAAS,EAAE,cAAc,EAAE,GAAG,KAAK,GAAG,SAAS,GAAG,IAAI,EACtD,OAAO,EAAE,KAAK,EAAE,GACf,KAAK,CAsBP"}

package/out/utils/nav-params/nav-params.js

@@ -98,7 +98,9 @@ export function convertNavDataByArray(naviDatas, ...origins) {
                 let valueStr = naviData.value;
                 matchArr.forEach(key => {
                     // 没有${xxx}
-                    const { find, value } = getVal(origins, key.slice(2, -1));
+                    const { find, value } = getVal(origins, 
+                    // 去掉${}，适配平台模型转小写取值
+                    key.slice(2, -1).toLowerCase());
                     if (find) {
                         valueStr = valueStr.replace(key, `${value}`);
                     }
@@ -106,8 +108,8 @@ export function convertNavDataByArray(naviDatas, ...origins) {
                 result[naviData.key.toLowerCase()] = valueStr;
             }
             else {
-                // 没有${xxx}
-                const { find, value } = getVal(origins, naviData.value);
+                // 没有${xxx}，适配平台模型转小写取值
+                const { find, value } = getVal(origins, naviData.value.toLowerCase());
                 if (find) {
                     result[naviData.key.toLowerCase()] = value;
                 }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@ibiz-template/runtime",
-  "version": "0.4.1",
+  "version": "0.4.3-dev.0",
   "description": "控制器包",
   "type": "module",
   "main": "out/index.js",
@@ -59,5 +59,5 @@
     "qx-util": "^0.4.8",
     "ramda": "^0.29.0"
   },
-  "gitHead": "49c2ab8952e9fdaf586a4819a8fa69c817bc8841"
+  "gitHead": "6d253dd3a055d1e9d284b640fbd3c80788b90950"
 }

package/src/controller/control/form/form-detail/form-mdctrl/form-mdctrl-md.controller.ts

@@ -40,6 +40,17 @@ export class FormMDCtrlMDController extends FormMDCtrlController {
    */
   mdController!: IMDControlController;
 
+  /**
+   * 表单项名称
+   *
+   * @author lxm
+   * @date 2022-09-04 18:09:32
+   * @readonly
+   */
+  get name(): string {
+    return this.model.id!;
+  }
+
   protected async onInit(): Promise<void> {
     await super.onInit();
     const { contentControl } = this.model;
@@ -79,6 +90,12 @@ export class FormMDCtrlMDController extends FormMDCtrlController {
     });
   }
 
+  updateFormItem(): Promise<void> {
+    const items = this.mdController.state.items || [];
+    this.data[this.name] = items;
+    return super.updateFormItem();
+  }
+
   /**
    * 删除多数据选中的数据
    * @author lxm

package/src/controller/control/report-panel/generator/user-generator.ts

@@ -28,11 +28,14 @@ export class UserReportPanelGenerator extends ReportPanelBaseGenerator {
         },
       },
       NODELEGENDCONFIG: {
-        valueField: 'source_lables',
-        selected: "{{return Object.is(data.source_lables, 'NEO4J_ZT')}}",
+        valueField: 'source_lables||target_lables',
+        selected:
+          "{{return Object.is(data.source_lables, 'NEO4J_ZT') || Object.is(data.target_lables, 'NEO4J_ZT')}}",
+        codeListTag: 'web.nodetype',
       },
       EDGELEGENDCONFIG: {
         valueField: 'relationship_type',
+        codeListTag: 'web.relationshiptype',
       },
       PLUGINCONFIG: {
         gridConfig: {},
@@ -40,7 +43,7 @@ export class UserReportPanelGenerator extends ReportPanelBaseGenerator {
       },
       HOOKS: {
         nodeDataHook:
-          "{{ data.forEach(node => {Object.assign(node, { label: node.data.name, size: 66,donutAttrs: { prop1: 10000, prop2: 10 },donutColorMap: { prop1: '#0095ee', prop2: '#0095ee' },icon: {show: true,img: './assets/images/user-avatar.png',width: 40,height: 40}})})}}",
+          "{{ data.forEach(node => { const type = node.data.source_lables || node.data.target_lables; Object.assign(node, { label: node.data.name, size: 66, style: { fill: node.color },donutAttrs: { prop1: 10000, prop2: 10 },donutColorMap: { prop1: node.color, prop2: node.color },icon: {show: true,img: type === 'NEO4J_ZT' ? './assets/images/user-avatar.png' : './assets/images/phone.png',width: 40,height: 40}})})}}",
         edgeDataHook:
           '{{ data.forEach(edge => {Object.assign(edge, { label: edge.name })}) }}',
       },

package/src/controller/utils/button-state/ui-action-button.state.ts

@@ -32,9 +32,24 @@ export class UIActionButtonState implements IButtonState {
 
   /**
    * 有权限时且没数据时，是否禁用
+   *
+   * @author chitanda
+   * @date 2023-11-30 11:11:14
+   * @protected
+   * @type {boolean}
    */
   protected noDataDisabled: boolean = false;
 
+  /**
+   * 有权限时且没主键时，是否禁用
+   *
+   * @author chitanda
+   * @date 2023-11-30 11:11:03
+   * @protected
+   * @type {boolean}
+   */
+  protected noKeyDisabled: boolean = false;
+
   /**
    * 操作标识
    */
@@ -113,6 +128,10 @@ export class UIActionButtonState implements IButtonState {
         ].includes(uiactionTag!))
     ) {
       this.noDataDisabled = true;
+      // 单项数据主键或者多项数据主键的时候，没主键的时候需要禁用
+      if (actionTarget === 'SINGLEKEY' || actionTarget === 'MULTIKEY') {
+        this.noKeyDisabled = true;
+      }
     }
     this.isInit = true;
   }
@@ -159,8 +178,9 @@ export class UIActionButtonState implements IButtonState {
     } else {
       // 有权限时显示
       this.visible = true;
-      // 有权限时没数据有些要禁用
-      this.disabled = this.noDataDisabled && !data;
+      // 有权限时没数据有些要禁用，有数据没主见时(单项数据)需要禁用
+      this.disabled =
+        this.noDataDisabled && (!data || (this.noKeyDisabled && !data.srfkey));
     }
   }
 }

package/src/utils/nav-params/nav-params.ts

@@ -116,15 +116,19 @@ export function convertNavDataByArray(
         let valueStr = naviData.value!;
         matchArr.forEach(key => {
           // 没有${xxx}
-          const { find, value } = getVal(origins, key.slice(2, -1));
+          const { find, value } = getVal(
+            origins,
+            // 去掉${}，适配平台模型转小写取值
+            key.slice(2, -1).toLowerCase(),
+          );
           if (find) {
             valueStr = valueStr.replace(key, `${value}`);
           }
         });
         result[naviData.key!.toLowerCase()] = valueStr;
       } else {
-        // 没有${xxx}
-        const { find, value } = getVal(origins, naviData.value!);
+        // 没有${xxx}，适配平台模型转小写取值
+        const { find, value } = getVal(origins, naviData.value!.toLowerCase());
         if (find) {
           result[naviData.key!.toLowerCase()] = value;
         }