@ibiz-template/runtime 0.1.32 → 0.1.33

package/out/controller/common/control/md-control.controller.js

@@ -245,7 +245,7 @@ export class MDControlController extends ControlController {
             }
             // 刷新数据，补全这一页缺少的数据
             if (needRefresh) {
-                this.refresh();
+                await this.refresh();
             }
         }
         catch (error) {

package/out/controller/common/editor/code-list-editor.controller.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"code-list-editor.controller.d.ts","sourceRoot":"","sources":["../../../../src/controller/common/editor/code-list-editor.controller.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,eAAe,EAAE,MAAM,kBAAkB,CAAC;AACnD,OAAO,EAAE,YAAY,EAAE,MAAM,oBAAoB,CAAC;AAClD,OAAO,EAAE,gBAAgB,EAAE,MAAM,qBAAqB,CAAC;AAEvD;;;;;;;;GAQG;AACH,qBAAa,wBAAwB,CACnC,CAAC,SAAS,eAAe,GAAG,eAAe,CAC3C,SAAQ,gBAAgB,CAAC,CAAC,CAAC;IAC3B;;;;;OAKG;IACU,YAAY,CAAC,IAAI,EAAE,KAAK,GAAG,OAAO,CAAC,SAAS,YAAY,EAAE,CAAC;CAkBzE"}
+{"version":3,"file":"code-list-editor.controller.d.ts","sourceRoot":"","sources":["../../../../src/controller/common/editor/code-list-editor.controller.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,eAAe,EAAE,MAAM,kBAAkB,CAAC;AACnD,OAAO,EAAE,YAAY,EAAE,MAAM,oBAAoB,CAAC;AAClD,OAAO,EAAE,gBAAgB,EAAE,MAAM,qBAAqB,CAAC;AAEvD;;;;;;;;GAQG;AACH,qBAAa,wBAAwB,CACnC,CAAC,SAAS,eAAe,GAAG,eAAe,CAC3C,SAAQ,gBAAgB,CAAC,CAAC,CAAC;IAC3B;;;;;OAKG;IACU,YAAY,CAAC,IAAI,EAAE,KAAK,GAAG,OAAO,CAAC,SAAS,YAAY,EAAE,CAAC;CAqBzE"}

package/out/controller/common/editor/code-list-editor.controller.js

@@ -24,6 +24,6 @@ export class CodeListEditorController extends EditorController {
             dataItems = await app.codeList.get(this.model.appCodeListId, context, params);
             return dataItems;
         }
-        throw new RuntimeModelError(this.model, '请配置代码表');
+        throw new RuntimeModelError(this.model, `编辑器类型[${this.model.editorType}]，未配置代码表`);
     }
 }

package/out/controller/control/form/search-form/search-form.service.d.ts

@@ -38,5 +38,13 @@ export declare class SearchFormService<T extends IDESearchForm = IDESearchForm>
      * @returns {*}  {IHttpResponse}
      */
     handleResponse(response: IHttpResponse): IHttpResponse<ControlVO>;
+    /**
+     * 根据表单项过滤出数据
+     *
+     * @return {*}
+     * @author: zhujiamin
+     * @Date: 2023-09-01 10:04:25
+     */
+    getFilteredData(data: IData): IData;
 }
 //# sourceMappingURL=search-form.service.d.ts.map

package/out/controller/control/form/search-form/search-form.service.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"search-form.service.d.ts","sourceRoot":"","sources":["../../../../../src/controller/control/form/search-form/search-form.service.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,aAAa,EAAoB,MAAM,qBAAqB,CAAC;AACtE,OAAO,EAAE,aAAa,EAAiB,MAAM,kBAAkB,CAAC;AAChE,OAAO,EAAE,cAAc,EAAE,SAAS,EAAc,MAAM,qBAAqB,CAAC;AAE5E;;;;;;;;;GASG;AACH,qBAAa,iBAAiB,CAC5B,CAAC,SAAS,aAAa,GAAG,aAAa,CACvC,SAAQ,cAAc,CAAC,CAAC,CAAC;IACzB;;;;;;;;OAQG;IACG,QAAQ,CACZ,QAAQ,EAAE,OAAO,EACjB,MAAM,GAAE,OAAY,GACnB,OAAO,CAAC,aAAa,CAAC,SAAS,CAAC,CAAC;IAMpC;;;;;OAKG;IACH,SAAS,CAAC,aAAa,IAAI,IAAI;IAgB/B;;;;;;;OAOG;IACH,cAAc,CAAC,QAAQ,EAAE,aAAa,GAAG,aAAa,CAAC,SAAS,CAAC;CAOlE"}
+{"version":3,"file":"search-form.service.d.ts","sourceRoot":"","sources":["../../../../../src/controller/control/form/search-form/search-form.service.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,aAAa,EAAoB,MAAM,qBAAqB,CAAC;AACtE,OAAO,EAAE,aAAa,EAAiB,MAAM,kBAAkB,CAAC;AAChE,OAAO,EAAE,cAAc,EAAE,SAAS,EAAc,MAAM,qBAAqB,CAAC;AAE5E;;;;;;;;;GASG;AACH,qBAAa,iBAAiB,CAC5B,CAAC,SAAS,aAAa,GAAG,aAAa,CACvC,SAAQ,cAAc,CAAC,CAAC,CAAC;IACzB;;;;;;;;OAQG;IACG,QAAQ,CACZ,QAAQ,EAAE,OAAO,EACjB,MAAM,GAAE,OAAY,GACnB,OAAO,CAAC,aAAa,CAAC,SAAS,CAAC,CAAC;IAOpC;;;;;OAKG;IACH,SAAS,CAAC,aAAa,IAAI,IAAI;IAgB/B;;;;;;;OAOG;IACH,cAAc,CAAC,QAAQ,EAAE,aAAa,GAAG,aAAa,CAAC,SAAS,CAAC;IAQjE;;;;;;OAMG;IACH,eAAe,CAAC,IAAI,EAAE,KAAK,GAAG,KAAK;CASpC"}

package/out/controller/control/form/search-form/search-form.service.js

@@ -21,7 +21,8 @@ export class SearchFormService extends ControlService {
      * @returns {*}  {Promise<IHttpResponse>}
      */
     async getDraft(_context, params = {}) {
-        let res = { ok: true, status: 200, data: Object.assign({}, params) };
+        const tempData = this.getFilteredData(Object.assign({}, params));
+        let res = { ok: true, status: 200, data: tempData };
         res = this.handleResponse(res);
         return res;
     }
@@ -39,7 +40,7 @@ export class SearchFormService extends ControlService {
                 this.dataUIMap.set(uiKey, new UIMapField(uiKey, uiKey));
             }
         }, {
-            childrenFields: ['deformPages', 'deformDetails'],
+            childrenFields: ['deformPages', 'deformTabPages', 'deformDetails'],
         });
     }
     /**
@@ -57,4 +58,20 @@ export class SearchFormService extends ControlService {
         }
         return res;
     }
+    /**
+     * 根据表单项过滤出数据
+     *
+     * @return {*}
+     * @author: zhujiamin
+     * @Date: 2023-09-01 10:04:25
+     */
+    getFilteredData(data) {
+        const tempData = {};
+        this.dataUIMap.forEach(dataUI => {
+            if (data[dataUI.dataKey] !== undefined) {
+                tempData[dataUI.dataKey] = data[dataUI.dataKey];
+            }
+        });
+        return tempData;
+    }
 }

package/out/controller/control/tree/tree.controller.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"tree.controller.d.ts","sourceRoot":"","sources":["../../../../src/controller/control/tree/tree.controller.ts"],"names":[],"mappings":"AAEA,OAAO,EAAE,OAAO,EAAE,WAAW,EAAE,MAAM,kBAAkB,CAAC;AACxD,OAAO,EACL,UAAU,EACV,UAAU,EACV,eAAe,EACf,gBAAgB,EAChB,aAAa,EACd,MAAM,oBAAoB,CAAC;AAE5B,OAAO,EAAE,mBAAmB,EAAE,MAAM,cAAc,CAAC;AACnD,OAAO,EAAE,qBAAqB,EAAE,MAAM,iBAAiB,CAAC;AACxD,OAAO,EAAE,WAAW,EAAE,MAAM,gBAAgB,CAAC;AAE7C;;;;;;;;GAQG;AACH,qBAAa,cACX,SAAQ,mBAAmB,CAAC,OAAO,EAAE,UAAU,EAAE,UAAU,CAC3D,YAAW,eAAe;IAElB,OAAO,EAAE,WAAW,CAAC;IAE7B;;;;;OAKG;IACH,YAAY,EAAE;QAAE,CAAC,CAAC,EAAE,MAAM,GAAG,qBAAqB,CAAA;KAAE,CAAM;IAE1D,SAAS,CAAC,SAAS,IAAI,IAAI;cAQX,SAAS,IAAI,OAAO,CAAC,IAAI,CAAC;IA0B1C;;;;;OAKG;IACG,IAAI,CAAC,IAAI,GAAE,gBAAqB,GAAG,OAAO,CAAC,aAAa,EAAE,CAAC;IAsBjE;;;;;;OAMG;IACG,SAAS,CAAC,UAAU,CAAC,EAAE,aAAa,GAAG,OAAO,CAAC,aAAa,EAAE,CAAC;IAkCrE;;;;;;OAMG;IACG,eAAe,CAAC,QAAQ,EAAE,aAAa,GAAG,OAAO,CAAC,IAAI,CAAC;IAwB7D;;;;;;OAMG;IACH,cAAc,CAAC,QAAQ,EAAE,aAAa,EAAE,QAAQ,EAAE,OAAO,GAAG,IAAI;IAYhE;;;;;;OAMG;IACG,iBAAiB,CAAC,QAAQ,EAAE,aAAa,GAAG,OAAO,CAAC,IAAI,CAAC;IAM/D,SAAS,CAAC,IAAI,EAAE,aAAa,GAAG,OAAO,CAAC,IAAI,CAAC;IAK7C,YAAY,CAAC,SAAS,EAAE,KAAK,EAAE,GAAG,IAAI;IAWtC;;;;;;OAMG;IACH,YAAY,CAAC,EAAE,EAAE,MAAM,GAAG,WAAW,GAAG,SAAS;IAIjD;;;;;;;;OAQG;IACG,UAAU,CACd,UAAU,EAAE,MAAM,EAClB,QAAQ,EAAE,aAAa,EACvB,KAAK,EAAE,UAAU,GAChB,OAAO,CAAC,IAAI,CAAC;IA6BhB;;;;;;OAMG;IACH,SAAS,CAAC,iBAAiB,CAAC,QAAQ,EAAE,aAAa,GAAG;QACpD,IAAI,EAAE,KAAK,EAAE,CAAC;QACd,OAAO,EAAE,QAAQ,CAAC;QAClB,MAAM,EAAE,OAAO,CAAC;KACjB;IAQD;;;;;;;OAOG;IACH,gBAAgB,CAAC,KAAK,EAAE,aAAa,EAAE,GAAG,MAAM,EAAE;IAgBlD;;;;;;;OAOG;IACG,mBAAmB,CACvB,QAAQ,EAAE,aAAa,GAAG,KAAK,EAC/B,aAAa,UAAQ,GACpB,OAAO,CAAC,IAAI,CAAC;CA+BjB"}
+{"version":3,"file":"tree.controller.d.ts","sourceRoot":"","sources":["../../../../src/controller/control/tree/tree.controller.ts"],"names":[],"mappings":"AAEA,OAAO,EAAE,OAAO,EAAE,WAAW,EAAE,MAAM,kBAAkB,CAAC;AACxD,OAAO,EACL,UAAU,EACV,UAAU,EACV,eAAe,EACf,gBAAgB,EAChB,aAAa,EACd,MAAM,oBAAoB,CAAC;AAE5B,OAAO,EAAE,mBAAmB,EAAE,MAAM,cAAc,CAAC;AACnD,OAAO,EAAE,qBAAqB,EAAE,MAAM,iBAAiB,CAAC;AACxD,OAAO,EAAE,WAAW,EAAE,MAAM,gBAAgB,CAAC;AAE7C;;;;;;;;GAQG;AACH,qBAAa,cACX,SAAQ,mBAAmB,CAAC,OAAO,EAAE,UAAU,EAAE,UAAU,CAC3D,YAAW,eAAe;IAElB,OAAO,EAAE,WAAW,CAAC;IAE7B;;;;;OAKG;IACH,YAAY,EAAE;QAAE,CAAC,CAAC,EAAE,MAAM,GAAG,qBAAqB,CAAA;KAAE,CAAM;IAE1D,SAAS,CAAC,SAAS,IAAI,IAAI;cAQX,SAAS,IAAI,OAAO,CAAC,IAAI,CAAC;IA0B1C;;;;;OAKG;IACG,IAAI,CAAC,IAAI,GAAE,gBAAqB,GAAG,OAAO,CAAC,aAAa,EAAE,CAAC;IAsBjE;;;;;;OAMG;IACG,SAAS,CAAC,UAAU,CAAC,EAAE,aAAa,GAAG,OAAO,CAAC,aAAa,EAAE,CAAC;IAyCrE;;;;;;OAMG;IACG,eAAe,CAAC,QAAQ,EAAE,aAAa,GAAG,OAAO,CAAC,IAAI,CAAC;IAwB7D;;;;;;OAMG;IACH,cAAc,CAAC,QAAQ,EAAE,aAAa,EAAE,QAAQ,EAAE,OAAO,GAAG,IAAI;IAYhE;;;;;;OAMG;IACG,iBAAiB,CAAC,QAAQ,EAAE,aAAa,GAAG,OAAO,CAAC,IAAI,CAAC;IAM/D,SAAS,CAAC,IAAI,EAAE,aAAa,GAAG,OAAO,CAAC,IAAI,CAAC;IAK7C,YAAY,CAAC,SAAS,EAAE,KAAK,EAAE,GAAG,IAAI;IAWtC;;;;;;OAMG;IACH,YAAY,CAAC,EAAE,EAAE,MAAM,GAAG,WAAW,GAAG,SAAS;IAIjD;;;;;;;;OAQG;IACG,UAAU,CACd,UAAU,EAAE,MAAM,EAClB,QAAQ,EAAE,aAAa,EACvB,KAAK,EAAE,UAAU,GAChB,OAAO,CAAC,IAAI,CAAC;IA6BhB;;;;;;OAMG;IACH,SAAS,CAAC,iBAAiB,CAAC,QAAQ,EAAE,aAAa,GAAG;QACpD,IAAI,EAAE,KAAK,EAAE,CAAC;QACd,OAAO,EAAE,QAAQ,CAAC;QAClB,MAAM,EAAE,OAAO,CAAC;KACjB;IAQD;;;;;;;OAOG;IACH,gBAAgB,CAAC,KAAK,EAAE,aAAa,EAAE,GAAG,MAAM,EAAE;IAgBlD;;;;;;;OAOG;IACG,mBAAmB,CACvB,QAAQ,EAAE,aAAa,GAAG,KAAK,EAC/B,aAAa,UAAQ,GACpB,OAAO,CAAC,IAAI,CAAC;CA+BjB"}

package/out/controller/control/tree/tree.controller.js

@@ -83,13 +83,21 @@ export class TreeController extends MDControlController {
     async loadNodes(parentNode) {
         const params = await this.getFetchParams();
         const hasQuery = !!params.query;
-        // 请求服务获取子节点数据
-        const nodes = (await this.service.fetchChildNodes(parentNode, {
-            context: this.context.clone(),
-            params,
-            hasQuery,
-            defaultExpandedKeys: this.state.expandedKeys,
-        })) || [];
+        this.state.isLoading = true;
+        let nodes;
+        try {
+            // 请求服务获取子节点数据
+            nodes =
+                (await this.service.fetchChildNodes(parentNode, {
+                    context: this.context.clone(),
+                    params,
+                    hasQuery,
+                    defaultExpandedKeys: this.state.expandedKeys,
+                })) || [];
+        }
+        finally {
+            this.state.isLoading = false;
+        }
         // 有父节点绑定到父节点数据上，无父节点替换rootNodes
         if (parentNode) {
             parentNode.children = nodes;

package/out/service/service/entity/method/de-action.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"de-action.d.ts","sourceRoot":"","sources":["../../../../../src/service/service/entity/method/de-action.ts"],"names":[],"mappings":"AAAA,OAAO,EACL,YAAY,EACZ,aAAa,EAEd,MAAM,qBAAqB,CAAC;AAC7B,OAAO,EAAE,YAAY,EAAE,MAAM,kBAAkB,CAAC;AAChD,OAAO,EAAE,MAAM,EAAE,MAAM,UAAU,CAAC;AAClC,OAAO,EAAE,WAAW,EAAE,MAAM,uBAAuB,CAAC;AAKpD;;;;;;;;GAQG;AACH,qBAAa,cAAe,SAAQ,MAAM;IAChC,MAAM,EAAE,YAAY,CAAC;IAE7B;;;;;;;;OAQG;IACH,SAAS,KAAK,WAAW,IAAI,OAAO,CAEnC;IAEK,IAAI,CACR,OAAO,EAAE,OAAO,EAChB,IAAI,CAAC,EAAE,KAAK,EACZ,MAAM,CAAC,EAAE,OAAO,GACf,OAAO,CAAC,YAAY,CAAC,KAAK,CAAC,CAAC;IA8E/B;;;;;;;;OAQG;IACG,MAAM,CACV,OAAO,EAAE,OAAO,EAChB,IAAI,EAAE,KAAK,EACX,MAAM,EAAE,OAAO,GACd,OAAO,CAAC,aAAa,CAAC,WAAW,CAAC,CAAC;IAUtC;;;;;;;;OAQG;IACG,MAAM,CACV,OAAO,EAAE,OAAO,EAChB,MAAM,CAAC,EAAE,OAAO,GACf,OAAO,CAAC,aAAa,CAAC,WAAW,CAAC,CAAC;IAYtC;;;;;;;;;OASG;IACG,MAAM,CACV,OAAO,EAAE,OAAO,EAChB,IAAI,EAAE,KAAK,GAAG,WAAW,EACzB,MAAM,GAAE,OAAY,GACnB,OAAO,CAAC,aAAa,CAAC,WAAW,CAAC,CAAC;IActC;;;;;;;;OAQG;IACG,GAAG,CACP,OAAO,EAAE,OAAO,EAChB,MAAM,GAAE,OAAY,GACnB,OAAO,CAAC,aAAa,CAAC,WAAW,CAAC,CAAC;IAatC;;;;;;;;OAQG;IACG,QAAQ,CACZ,OAAO,EAAE,OAAO,EAChB,MAAM,CAAC,EAAE,OAAO,GACf,OAAO,CAAC,aAAa,CAAC,KAAK,CAAC,CAAC;IAUhC;;;;;;;;OAQG;IACG,UAAU,CACd,OAAO,EAAE,OAAO,EAChB,MAAM,EAAE,KAAK,GACZ,OAAO,CAAC,aAAa,CAAC,WAAW,CAAC,CAAC;IAUtC;;;;;;;;OAQG;IACG,YAAY,CAChB,QAAQ,EAAE,OAAO,EACjB,OAAO,CAAC,EAAE,OAAO,GAChB,OAAO,CAAC,aAAa,CAAC,WAAW,CAAC,CAAC;IAatC;;;;;;;;OAQG;IACG,UAAU,CACd,OAAO,EAAE,OAAO,EAChB,MAAM,CAAC,EAAE,OAAO,GACf,OAAO,CAAC,aAAa,CAAC,WAAW,CAAC,CAAC;IAoBtC;;;;;;;;OAQG;IACG,UAAU,CACd,OAAO,EAAE,OAAO,EAChB,MAAM,EAAE,KAAK,GACZ,OAAO,CAAC,aAAa,CAAC,WAAW,CAAC,CAAC;IAatC;;;;;;;;OAQG;IACG,OAAO,CACX,OAAO,EAAE,OAAO,EAChB,MAAM,CAAC,EAAE,OAAO,GACf,OAAO,CAAC,aAAa,CAAC,WAAW,CAAC,CAAC;IAqBtC;;;;;;OAMG;IACG,eAAe,CACnB,QAAQ,EAAE,OAAO,EACjB,OAAO,CAAC,EAAE,OAAO,GAChB,OAAO,CAAC,aAAa,CAAC;CAc1B"}
+{"version":3,"file":"de-action.d.ts","sourceRoot":"","sources":["../../../../../src/service/service/entity/method/de-action.ts"],"names":[],"mappings":"AAAA,OAAO,EACL,YAAY,EACZ,aAAa,EAEd,MAAM,qBAAqB,CAAC;AAC7B,OAAO,EAAE,YAAY,EAAE,MAAM,kBAAkB,CAAC;AAEhD,OAAO,EAAE,MAAM,EAAE,MAAM,UAAU,CAAC;AAClC,OAAO,EAAE,WAAW,EAAE,MAAM,uBAAuB,CAAC;AAKpD;;;;;;;;GAQG;AACH,qBAAa,cAAe,SAAQ,MAAM;IAChC,MAAM,EAAE,YAAY,CAAC;IAE7B;;;;;;;;OAQG;IACH,SAAS,KAAK,WAAW,IAAI,OAAO,CAEnC;IAEK,IAAI,CACR,OAAO,EAAE,OAAO,EAChB,IAAI,CAAC,EAAE,KAAK,EACZ,MAAM,CAAC,EAAE,OAAO,GACf,OAAO,CAAC,YAAY,CAAC,KAAK,CAAC,CAAC;IAmF/B;;;;;;;;OAQG;IACG,MAAM,CACV,OAAO,EAAE,OAAO,EAChB,IAAI,EAAE,KAAK,EACX,MAAM,EAAE,OAAO,GACd,OAAO,CAAC,aAAa,CAAC,WAAW,CAAC,CAAC;IAUtC;;;;;;;;OAQG;IACG,MAAM,CACV,OAAO,EAAE,OAAO,EAChB,MAAM,CAAC,EAAE,OAAO,GACf,OAAO,CAAC,aAAa,CAAC,WAAW,CAAC,CAAC;IAYtC;;;;;;;;;OASG;IACG,MAAM,CACV,OAAO,EAAE,OAAO,EAChB,IAAI,EAAE,KAAK,GAAG,WAAW,EACzB,MAAM,GAAE,OAAY,GACnB,OAAO,CAAC,aAAa,CAAC,WAAW,CAAC,CAAC;IActC;;;;;;;;OAQG;IACG,GAAG,CACP,OAAO,EAAE,OAAO,EAChB,MAAM,GAAE,OAAY,GACnB,OAAO,CAAC,aAAa,CAAC,WAAW,CAAC,CAAC;IAatC;;;;;;;;OAQG;IACG,QAAQ,CACZ,OAAO,EAAE,OAAO,EAChB,MAAM,CAAC,EAAE,OAAO,GACf,OAAO,CAAC,aAAa,CAAC,KAAK,CAAC,CAAC;IAUhC;;;;;;;;OAQG;IACG,UAAU,CACd,OAAO,EAAE,OAAO,EAChB,MAAM,EAAE,KAAK,GACZ,OAAO,CAAC,aAAa,CAAC,WAAW,CAAC,CAAC;IAUtC;;;;;;;;OAQG;IACG,YAAY,CAChB,QAAQ,EAAE,OAAO,EACjB,OAAO,CAAC,EAAE,OAAO,GAChB,OAAO,CAAC,aAAa,CAAC,WAAW,CAAC,CAAC;IAatC;;;;;;;;OAQG;IACG,UAAU,CACd,OAAO,EAAE,OAAO,EAChB,MAAM,CAAC,EAAE,OAAO,GACf,OAAO,CAAC,aAAa,CAAC,WAAW,CAAC,CAAC;IAoBtC;;;;;;;;OAQG;IACG,UAAU,CACd,OAAO,EAAE,OAAO,EAChB,MAAM,EAAE,KAAK,GACZ,OAAO,CAAC,aAAa,CAAC,WAAW,CAAC,CAAC;IAatC;;;;;;;;OAQG;IACG,OAAO,CACX,OAAO,EAAE,OAAO,EAChB,MAAM,CAAC,EAAE,OAAO,GACf,OAAO,CAAC,aAAa,CAAC,WAAW,CAAC,CAAC;IAqBtC;;;;;;OAMG;IACG,eAAe,CACnB,QAAQ,EAAE,OAAO,EACjB,OAAO,CAAC,EAAE,OAAO,GAChB,OAAO,CAAC,aAAa,CAAC;CAc1B"}

package/out/service/service/entity/method/de-action.js

@@ -1,4 +1,5 @@
 import { HttpResponse, RuntimeModelError, } from '@ibiz-template/core';
+import { clone } from 'ramda';
 import { Method } from './method';
 import { findDELogic } from '../../../../model';
 import { execDELogicAction, execFieldLogics } from '../../../../de-logic';
@@ -32,7 +33,7 @@ export class DEActionMethod extends Method {
             if (!deLogic) {
                 throw new RuntimeModelError(this.method, '缺少实体处理逻辑');
             }
-            return execDELogicAction(deLogic, context, data || {}, params || {});
+            return execDELogicAction(deLogic, clone(context), data ? clone(data) : {}, params ? clone(params) : {});
         }
         if (data && !this.isLocalMode) {
             data = await this.input.handle(context, data);

package/out/ui-logic/ui-logic-node/prepare-js-param-node/prepare-js-param-node.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"prepare-js-param-node.d.ts","sourceRoot":"","sources":["../../../../src/ui-logic/ui-logic-node/prepare-js-param-node/prepare-js-param-node.ts"],"names":[],"mappings":"AAEA,OAAO,EAAE,mBAAmB,EAAE,MAAM,kBAAkB,CAAC;AAEvD,OAAO,EAAE,cAAc,EAAE,MAAM,wBAAwB,CAAC;AAExD,OAAO,EAAE,WAAW,EAAE,MAAM,kBAAkB,CAAC;AAE/C;;;;;;;;GAQG;AACH,qBAAa,kBAAmB,SAAQ,WAAW;IAC3C,IAAI,CAAC,GAAG,EAAE,cAAc,GAAG,OAAO,CAAC,IAAI,CAAC;IA4C9C;;;;;;;OAOG;IACH,SAAS,CAAC,aAAa,CACrB,SAAS,EAAE,mBAAmB,EAC9B,GAAG,EAAE,cAAc,GAClB,IAAI;IAmBP;;;;;;;;OAQG;IACH,SAAS,CAAC,SAAS,CACjB,SAAS,EAAE,mBAAmB,EAC9B,GAAG,EAAE,cAAc,GAClB,IAAI;IAMP;;;;;;;OAOG;IACH,SAAS,CAAC,SAAS,CACjB,SAAS,EAAE,mBAAmB,EAC9B,GAAG,EAAE,cAAc,GAClB,IAAI;IAKP;;;;;;;OAOG;IACH,SAAS,CAAC,UAAU,CAClB,SAAS,EAAE,mBAAmB,EAC9B,GAAG,EAAE,cAAc,GAClB,IAAI;IAKP;;;;;;;OAOG;IACH,SAAS,CAAC,UAAU,CAClB,SAAS,EAAE,mBAAmB,EAC9B,GAAG,EAAE,cAAc,GAClB,IAAI;IAKP;;;;;;;OAOG;IACH,SAAS,CAAC,WAAW,CACnB,SAAS,EAAE,mBAAmB,EAC9B,GAAG,EAAE,cAAc,GAClB,IAAI;IAaP;;;;;;;OAOG;IACH,SAAS,CAAC,SAAS,CACjB,SAAS,EAAE,mBAAmB,EAC9B,GAAG,EAAE,cAAc,GAClB,IAAI;CAQR"}
+{"version":3,"file":"prepare-js-param-node.d.ts","sourceRoot":"","sources":["../../../../src/ui-logic/ui-logic-node/prepare-js-param-node/prepare-js-param-node.ts"],"names":[],"mappings":"AAEA,OAAO,EAAE,mBAAmB,EAAE,MAAM,kBAAkB,CAAC;AAGvD,OAAO,EAAE,cAAc,EAAE,MAAM,wBAAwB,CAAC;AAExD,OAAO,EAAE,WAAW,EAAE,MAAM,kBAAkB,CAAC;AAE/C;;;;;;;;GAQG;AACH,qBAAa,kBAAmB,SAAQ,WAAW;IAC3C,IAAI,CAAC,GAAG,EAAE,cAAc,GAAG,OAAO,CAAC,IAAI,CAAC;IA4C9C;;;;;;;OAOG;IACH,SAAS,CAAC,aAAa,CACrB,SAAS,EAAE,mBAAmB,EAC9B,GAAG,EAAE,cAAc,GAClB,IAAI;IAwCP;;;;;;;;OAQG;IACH,SAAS,CAAC,SAAS,CACjB,SAAS,EAAE,mBAAmB,EAC9B,GAAG,EAAE,cAAc,GAClB,IAAI;IAMP;;;;;;;OAOG;IACH,SAAS,CAAC,SAAS,CACjB,SAAS,EAAE,mBAAmB,EAC9B,GAAG,EAAE,cAAc,GAClB,IAAI;IAKP;;;;;;;OAOG;IACH,SAAS,CAAC,UAAU,CAClB,SAAS,EAAE,mBAAmB,EAC9B,GAAG,EAAE,cAAc,GAClB,IAAI;IAKP;;;;;;;OAOG;IACH,SAAS,CAAC,UAAU,CAClB,SAAS,EAAE,mBAAmB,EAC9B,GAAG,EAAE,cAAc,GAClB,IAAI;IAKP;;;;;;;OAOG;IACH,SAAS,CAAC,WAAW,CACnB,SAAS,EAAE,mBAAmB,EAC9B,GAAG,EAAE,cAAc,GAClB,IAAI;IAaP;;;;;;;OAOG;IACH,SAAS,CAAC,SAAS,CACjB,SAAS,EAAE,mBAAmB,EAC9B,GAAG,EAAE,cAAc,GAClB,IAAI;CAQR"}

package/out/ui-logic/ui-logic-node/prepare-js-param-node/prepare-js-param-node.js

@@ -1,6 +1,7 @@
 /* eslint-disable no-await-in-loop */
-import { ModelError } from '@ibiz-template/core';
+import { ModelError, RuntimeError } from '@ibiz-template/core';
 import { clone } from 'ramda';
+import { ScriptFactory } from '../../../utils';
 import { handleSrcVal } from '../../utils';
 import { UILogicNode } from '../ui-logic-node';
 /**
@@ -63,6 +64,9 @@ export class PrepareJSParamNode extends UILogicNode {
      */
     setParamValue(nodeParam, ctx) {
         const { dstFieldName, dstDEUILogicParamId } = nodeParam;
+        if (!dstDEUILogicParamId) {
+            throw new RuntimeError('没有目标参数对象id');
+        }
         // 目标参数
         let dstField = dstFieldName;
         // 实体参数对象转小写
@@ -72,7 +76,17 @@ export class PrepareJSParamNode extends UILogicNode {
         // 源参数
         const srcVal = handleSrcVal(ctx, nodeParam);
         if (dstField) {
-            ctx.params[dstDEUILogicParamId][dstField] = srcVal;
+            // 赋值属性的时候支持脚本写法
+            try {
+                ScriptFactory.execScriptFn({ srcVal, dstParam: ctx.params[dstDEUILogicParamId] }, `dstParam.${dstFieldName} = srcVal`, {
+                    singleRowReturn: false,
+                    isAsync: false,
+                });
+            }
+            catch (error) {
+                ibiz.log.error(`给目标参数属性${dstFieldName}赋值报错，目标参数：`, ctx.params[dstDEUILogicParamId]);
+                throw error;
+            }
         }
         else {
             ctx.params[dstDEUILogicParamId] = srcVal;

package/out/ui-logic/ui-logic-param/ui-logic-param.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"ui-logic-param.d.ts","sourceRoot":"","sources":["../../../src/ui-logic/ui-logic-param/ui-logic-param.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,eAAe,EAAE,MAAM,kBAAkB,CAAC;AACnD,OAAO,EAAE,cAAc,EAAE,MAAM,qBAAqB,CAAC;AAErD;;;;;;;GAOG;AACH,qBAAa,YAAY;IAQJ,KAAK,EAAE,eAAe;IAPzC;;;;;;OAMG;gBACgB,KAAK,EAAE,eAAe;IAEzC;;;;;;OAMG;IACH,IAAI,CAAC,GAAG,EAAE,cAAc,GAAG,IAAI;IA8D/B;;;;;OAKG;IACH,KAAK,CAAC,GAAG,EAAE,cAAc,GAAG,IAAI;CAWjC"}
+{"version":3,"file":"ui-logic-param.d.ts","sourceRoot":"","sources":["../../../src/ui-logic/ui-logic-param/ui-logic-param.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,eAAe,EAAE,MAAM,kBAAkB,CAAC;AACnD,OAAO,EAAE,cAAc,EAAE,MAAM,qBAAqB,CAAC;AAErD;;;;;;;GAOG;AACH,qBAAa,YAAY;IAQJ,KAAK,EAAE,eAAe;IAPzC;;;;;;OAMG;gBACgB,KAAK,EAAE,eAAe;IAEzC;;;;;;OAMG;IACH,IAAI,CAAC,GAAG,EAAE,cAAc,GAAG,IAAI;IAqE/B;;;;;OAKG;IACH,KAAK,CAAC,GAAG,EAAE,cAAc,GAAG,IAAI;CAWjC"}

package/out/ui-logic/ui-logic-param/ui-logic-param.js

@@ -30,6 +30,11 @@ export class UILogicParam {
         const m = this.model;
         const { context, viewParams, data, parameters } = ctx;
         const app = ibiz.hub.getApp(context.srfappid);
+        // 特殊变量的特殊处理
+        if (m.codeName === 'layoutPanel') {
+            ctx.params[tag] = parameters.view.layoutPanel.panelItems;
+            return;
+        }
         if (m.default) {
             ctx.params[tag] = data && data.length > 0 ? data[0] : {};
         }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@ibiz-template/runtime",
-  "version": "0.1.32",
+  "version": "0.1.33",
   "description": "控制器包",
   "type": "module",
   "main": "out/index.js",
@@ -29,8 +29,8 @@
   "author": "chitanda",
   "license": "MIT",
   "devDependencies": {
-    "@ibiz-template/core": "^0.1.32",
-    "@ibiz/model-core": "^0.0.18",
+    "@ibiz-template/core": "^0.1.33",
+    "@ibiz/model-core": "^0.0.19",
     "@types/path-browserify": "^1.0.0",
     "@types/qs": "^6.9.8",
     "@types/systemjs": "^6.13.3",
@@ -46,7 +46,7 @@
   },
   "peerDependencies": {
     "@ibiz-template/core": "^0.1.0",
-    "@ibiz/model-core": "^0.0.18",
+    "@ibiz/model-core": "^0.0.19",
     "async-validator": "^4.2.5",
     "dayjs": "^1.11.7",
     "echarts": "^5.4.3",
@@ -57,5 +57,5 @@
     "qx-util": "^0.4.8",
     "ramda": "^0.29.0"
   },
-  "gitHead": "594d722ab71f8c9e5fa88e685597b221c70e56e0"
+  "gitHead": "769acca4bc7229f5d27f57e803a9f1d3ea7172ac"
 }

package/src/controller/common/control/md-control.controller.ts

@@ -309,7 +309,7 @@ export class MDControlController<
 
       // 刷新数据，补全这一页缺少的数据
       if (needRefresh) {
-        this.refresh();
+        await this.refresh();
       }
     } catch (error) {
       await this._evt.emit('onRemoveError', undefined);

package/src/controller/common/editor/code-list-editor.controller.ts

@@ -37,6 +37,9 @@ export class CodeListEditorController<
       );
       return dataItems;
     }
-    throw new RuntimeModelError(this.model, '请配置代码表');
+    throw new RuntimeModelError(
+      this.model,
+      `编辑器类型[${this.model.editorType}]，未配置代码表`,
+    );
   }
 }

package/src/controller/control/form/search-form/search-form.service.ts

@@ -28,7 +28,8 @@ export class SearchFormService<
     _context: IParams,
     params: IParams = {},
   ): Promise<IHttpResponse<ControlVO>> {
-    let res = { ok: true, status: 200, data: { ...params } } as IHttpResponse;
+    const tempData = this.getFilteredData({ ...params });
+    let res = { ok: true, status: 200, data: tempData } as IHttpResponse;
     res = this.handleResponse(res);
     return res as IHttpResponse<ControlVO>;
   }
@@ -50,7 +51,7 @@ export class SearchFormService<
         }
       },
       {
-        childrenFields: ['deformPages', 'deformDetails'],
+        childrenFields: ['deformPages', 'deformTabPages', 'deformDetails'],
       },
     );
   }
@@ -70,4 +71,21 @@ export class SearchFormService<
     }
     return res as IHttpResponse<ControlVO>;
   }
+
+  /**
+   * 根据表单项过滤出数据
+   *
+   * @return {*}
+   * @author: zhujiamin
+   * @Date: 2023-09-01 10:04:25
+   */
+  getFilteredData(data: IData): IData {
+    const tempData: IData = {};
+    this.dataUIMap.forEach(dataUI => {
+      if (data[dataUI.dataKey] !== undefined) {
+        tempData[dataUI.dataKey] = data[dataUI.dataKey];
+      }
+    });
+    return tempData;
+  }
 }

package/src/controller/control/tree/tree.controller.ts

@@ -109,14 +109,21 @@ export class TreeController
     const params = await this.getFetchParams();
     const hasQuery = !!params.query;
 
-    // 请求服务获取子节点数据
-    const nodes =
-      (await this.service.fetchChildNodes(parentNode, {
-        context: this.context.clone(),
-        params,
-        hasQuery,
-        defaultExpandedKeys: this.state.expandedKeys,
-      })) || [];
+    this.state.isLoading = true;
+
+    let nodes;
+    try {
+      // 请求服务获取子节点数据
+      nodes =
+        (await this.service.fetchChildNodes(parentNode, {
+          context: this.context.clone(),
+          params,
+          hasQuery,
+          defaultExpandedKeys: this.state.expandedKeys,
+        })) || [];
+    } finally {
+      this.state.isLoading = false;
+    }
 
     // 有父节点绑定到父节点数据上，无父节点替换rootNodes
     if (parentNode) {

package/src/service/service/entity/method/de-action.ts

@@ -4,6 +4,7 @@ import {
   RuntimeModelError,
 } from '@ibiz-template/core';
 import { IAppDEAction } from '@ibiz/model-core';
+import { clone } from 'ramda';
 import { Method } from './method';
 import { IDataEntity } from '../../../../interface';
 import { findDELogic } from '../../../../model';
@@ -47,7 +48,12 @@ export class DEActionMethod extends Method {
       if (!deLogic) {
         throw new RuntimeModelError(this.method, '缺少实体处理逻辑');
       }
-      return execDELogicAction(deLogic, context, data || {}, params || {});
+      return execDELogicAction(
+        deLogic,
+        clone(context),
+        data ? clone(data) : {},
+        params ? clone(params) : {},
+      );
     }
 
     if (data && !this.isLocalMode) {

package/src/ui-logic/ui-logic-node/prepare-js-param-node/prepare-js-param-node.ts

@@ -1,7 +1,8 @@
 /* eslint-disable no-await-in-loop */
-import { ModelError } from '@ibiz-template/core';
+import { ModelError, RuntimeError } from '@ibiz-template/core';
 import { IDEUILogicNodeParam } from '@ibiz/model-core';
 import { clone } from 'ramda';
+import { ScriptFactory } from '../../../utils';
 import { UILogicContext } from '../../ui-logic-context';
 import { handleSrcVal } from '../../utils';
 import { UILogicNode } from '../ui-logic-node';
@@ -73,6 +74,11 @@ export class PrepareJSParamNode extends UILogicNode {
     ctx: UILogicContext,
   ): void {
     const { dstFieldName, dstDEUILogicParamId } = nodeParam;
+
+    if (!dstDEUILogicParamId) {
+      throw new RuntimeError('没有目标参数对象id');
+    }
+
     // 目标参数
     let dstField = dstFieldName;
 
@@ -84,7 +90,23 @@ export class PrepareJSParamNode extends UILogicNode {
     // 源参数
     const srcVal = handleSrcVal(ctx, nodeParam);
     if (dstField) {
-      ctx.params[dstDEUILogicParamId!][dstField] = srcVal;
+      // 赋值属性的时候支持脚本写法
+      try {
+        ScriptFactory.execScriptFn(
+          { srcVal, dstParam: ctx.params[dstDEUILogicParamId] },
+          `dstParam.${dstFieldName} = srcVal`,
+          {
+            singleRowReturn: false,
+            isAsync: false,
+          },
+        );
+      } catch (error) {
+        ibiz.log.error(
+          `给目标参数属性${dstFieldName}赋值报错，目标参数：`,
+          ctx.params[dstDEUILogicParamId],
+        );
+        throw error;
+      }
     } else {
       ctx.params[dstDEUILogicParamId!] = srcVal;
     }

package/src/ui-logic/ui-logic-param/ui-logic-param.ts

@@ -32,6 +32,13 @@ export class UILogicParam {
     const m = this.model;
     const { context, viewParams, data, parameters } = ctx;
     const app = ibiz.hub.getApp(context.srfappid);
+
+    // 特殊变量的特殊处理
+    if (m.codeName === 'layoutPanel') {
+      ctx.params[tag] = parameters.view.layoutPanel!.panelItems;
+      return;
+    }
+
     if (m.default) {
       ctx.params[tag] = data && data.length > 0 ? data[0] : {};
     } else if (m.activeContainerParam) {