npm - @ibiz-template/runtime - Versions diffs - 0.1.16 → 0.1.17 - Mend

@ibiz-template/runtime 0.1.16 → 0.1.17

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.

Files changed (101) hide show

package/out/controller/common/view/view.controller.d.ts.map CHANGED Viewed

	@@ -1 +1 @@
1	- {"version":3,"file":"view.controller.d.ts","sourceRoot":"","sources":["../../../../src/controller/common/view/view.controller.ts"],"names":[],"mappings":"AAGA,OAAO,EAAE,QAAQ,EAAE,MAAM,kBAAkB,CAAC;AAE5C,OAAO,EAAE,YAAY,EAAE,MAAM,mCAAmC,CAAC;AACjE,OAAO,EACL,eAAe,EACf,UAAU,EACV,0BAA0B,EAC1B,gBAAgB,EAChB,MAAM,EACN,UAAU,EACV,eAAe,EACf,cAAc,EACd,WAAW,EACZ,MAAM,oBAAoB,CAAC;AAG5B,OAAO,EAAE,GAAG,EAAE,MAAM,WAAW,CAAC;AAChC,OAAO,EAAE,eAAe,EAAE,MAAM,aAAa,CAAC;AAC9C,OAAO,EAAE,cAAc,EAAE,MAAM,oBAAoB,CAAC;AACpD,OAAO,EAAE,UAAU,EAAE,MAAM,qCAAqC,CAAC;AAEjE,OAAO,EAAE,UAAU,EAAkB,MAAM,kBAAkB,CAAC;AAM9D,OAAO,EAAE,kBAAkB,EAAE,MAAM,0BAA0B,CAAC;AAE9D;;;;;;;GAOG;AACH,qBAAa,cAAc,CACvB,CAAC,SAAS,QAAQ,GAAG,QAAQ,EAC7B,CAAC,SAAS,UAAU,GAAG,UAAU,EACjC,CAAC,SAAS,UAAU,GAAG,UAAU,CAEnC,SAAQ,cAAc,CAAC,CAAC,EAAE,CAAC,EAAE,CAAC,CAC9B,YAAW,eAAe,CAAC,CAAC,EAAE,CAAC,EAAE,CAAC,CAAC;IAEnC,OAAO,EAAE,KAAK,CAAM;IAEpB,KAAK,EAAE,MAAM,CAAiB;IAE9B,SAAS,KAAK,IAAI,IAAI,eAAe,CAAC,UAAU,CAAC,CAEhD;IAED,SAAS,EAAE;QAAE,CAAC,GAAG,EAAE,MAAM,GAAG,gBAAgB,CAAA;KAAE,CAAM;IAEpD,OAAO,EAAE,WAAW,EAAE,CAAM;IAE5B,SAAS,EAAE;QAAE,CAAC,GAAG,EAAE,MAAM,GAAG,KAAK,CAAA;KAAE,CAAM;IAEzC,QAAQ,EAAE;QAAE,CAAC,GAAG,EAAE,MAAM,GAAG,UAAU,CAAA;KAAE,CAAM;IAE7C;;;;;OAKG;IACH,SAAS,CAAC,WAAW,eAAsB;IAE3C;;;;;;;OAOG;IACH,SAAS,CAAC,WAAW,EAAE,OAAO,CAAS;IAEvC;;;;;;OAMG;IACH,IAAI,UAAU,IAAI,eAAe,GAAG,SAAS,CAE5C;IAED,SAAS,CAAC,SAAS,UAAQ;IAE3B,IAAI,QAAQ,IAAI,OAAO,CAEtB;IAED;;;;;OAKG;IACH,SAAS,CAAC,EAAE,kBAAkB,CAAC;IAE/B,WAAW,CAAC,EAAE,0BAA0B,CAAC;IAEzC;;;;;;;;OAQG;gBACS,KAAK,EAAE,CAAC,EAAE,OAAO,EAAE,QAAQ,EAAE,MAAM,CAAC,EAAE,OAAO,EAAE,GAAG,CAAC,EAAE,GAAG;IAcpE;;;;;OAKG;IACH,WAAW,IAAI,IAAI;IAKnB;;;;;OAKG;IACH,aAAa,IAAI,IAAI;IAKrB;;;;;OAKG;IACH,SAAS,CAAC,WAAW,IAAI,IAAI;IAqB7B;;;;;OAKG;cACa,YAAY,IAAI,OAAO,CAAC,IAAI,CAAC;IAoB7C,SAAS,CAAC,SAAS,IAAI,IAAI;cAOX,SAAS,IAAI,OAAO,CAAC,IAAI,CAAC;~~cAyD1B~~,SAAS,IAAI,OAAO,CAAC,IAAI,CAAC;cAW1B,WAAW,IAAI,OAAO,CAAC,IAAI,CAAC;IAe5C;;;;;;OAMG;IACH,mBAAmB,IAAI,IAAI;IAiCrB,IAAI,CAAC,CAAC,SAAS,KAAK,EAAE,GAAG,EAAE,MAAM,EAAE,IAAI,CAAC,EAAE,CAAC,GAAG,OAAO,CAAC,GAAG,CAAC;IAY1D,YAAY,CAChB,GAAG,EAAE,MAAM,EACX,IAAI,CAAC,EAAE,OAAO,CAAC,cAAc,CAAC,GAC7B,OAAO,CAAC,eAAe,GAAG,IAAI,CAAC;IAQ5B,SAAS,CACb,SAAS,GAAE,UAAoC,GAC9C,OAAO,CAAC,IAAI,CAAC;IAIhB,YAAY,IAAI,IAAI;IAKpB,UAAU,IAAI,IAAI;IAKlB;;;;;OAKG;IACH,cAAc,CAAC,KAAK,EAAE,0BAA0B,GAAG,IAAI;CAoBxD"}
1	+ {"version":3,"file":"view.controller.d.ts","sourceRoot":"","sources":["../../../../src/controller/common/view/view.controller.ts"],"names":[],"mappings":"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"}

package/out/controller/common/view/view.controller.js CHANGED Viewed

@@ -1,7 +1,7 @@
 /* eslint-disable @typescript-eslint/no-explicit-any */
 import { createUUID, notNilEmpty } from 'qx-util';
 import { IBizContext, RuntimeError } from '@ibiz-template/core';
-import { isEmpty, isNil } from 'ramda';
+import { isEmpty, isNil, isNotNil } from 'ramda';
 import { LoadingState } from '../../utils/loading/loading.state';
 import { SysUIActionTag } from '../../../constant';
 import { convertNavData, Modal } from '../../../utils';
@@ -154,6 +154,10 @@ export class ViewController extends BaseController {
         await super.onCreated();
         // 给modal的关闭前回调注入视图关闭事件
         this.modal.hooks.beforeDismiss.tapPromise(async (modalData) => {
+            // 如果视图设置了关闭状态，根据关闭状态返回
+            if (isNotNil(this.state.closeOK)) {
+                modalData.ok = this.state.closeOK;
+            }
             await this._evt.emit('onCloseView', Object.assign({}, modalData));
         });
         // 抛出初始的视图信息

package/out/controller/control/form/edit-form/edit-form.service.d.ts CHANGED Viewed

@@ -111,5 +111,13 @@ export declare class EditFormService<T extends IDEEditForm = IDEEditForm> extend
      * @returns {*}  {IHttpResponse}
      */
     handleResponse(response: IHttpResponse): IHttpResponse<ControlVO>;
+    /**
+     * 保存时根据表单项过滤出传给后台的数据
+     *
+     * @return {*}
+     * @author: zhujiamin
+     * @Date: 2023-09-01 10:04:25
+     */
+    getFilteredData(data: IData): IData;
 }
 //# sourceMappingURL=edit-form.service.d.ts.map

package/out/controller/control/form/edit-form/edit-form.service.d.ts.map CHANGED Viewed

	@@ -1 +1 @@
1	- {"version":3,"file":"edit-form.service.d.ts","sourceRoot":"","sources":["../../../../../src/controller/control/form/edit-form/edit-form.service.ts"],"names":[],"mappings":"AAAA,OAAO,EACL,aAAa,EAGd,MAAM,qBAAqB,CAAC;AAC7B,OAAO,EACL,WAAW,~~EAMZ~~,MAAM,kBAAkB,CAAC;AAC1B,OAAO,EAAE,cAAc,EAAE,SAAS,EAAc,MAAM,qBAAqB,CAAC;AAE5E,qBAAa,eAAe,CAC1B,CAAC,SAAS,WAAW,GAAG,WAAW,CACnC,SAAQ,cAAc,CAAC,CAAC,CAAC;IACzB;;;;;;;;OAQG;IACG,GAAG,CACP,OAAO,EAAE,OAAO,EAChB,MAAM,GAAE,OAAY,GACnB,OAAO,CAAC,aAAa,CAAC,SAAS,CAAC,CAAC;IAWpC;;;;;;;;OAQG;IACG,QAAQ,CACZ,OAAO,EAAE,OAAO,EAChB,MAAM,GAAE,OAAY,GACnB,OAAO,CAAC,aAAa,CAAC,SAAS,CAAC,CAAC;IAWpC;;;;;;;;OAQG;IACG,MAAM,CAAC,OAAO,EAAE,OAAO,EAAE,MAAM,GAAE,OAAY,GAAG,OAAO,CAAC,aAAa,CAAC;IAU5E;;;;;;;;OAQG;IACG,MAAM,CACV,OAAO,EAAE,OAAO,EAChB,IAAI,EAAE,KAAK,GACV,OAAO,CAAC,aAAa,CAAC,SAAS,CAAC,CAAC;~~IAUpC~~;;;;;;;;OAQG;IACG,MAAM,CACV,OAAO,EAAE,OAAO,EAChB,IAAI,EAAE,KAAK,GACV,OAAO,CAAC,aAAa,CAAC,SAAS,CAAC,CAAC;~~IAUpC~~;;;;;;;;OAQG;IACG,MAAM,CACV,OAAO,EAAE,OAAO,EAChB,IAAI,EAAE,KAAK,GACV,OAAO,CAAC,aAAa,CAAC,SAAS,CAAC,CAAC;IAepC;;;;;;;;;OASG;IACG,cAAc,CAClB,UAAU,EAAE,MAAM,EAClB,OAAO,EAAE,OAAO,EAChB,MAAM,GAAE,OAAY,GACnB,OAAO,CAAC,aAAa,CAAC,SAAS,CAAC,CAAC;IAMpC;;;;;;;;;OASG;IACG,OAAO,CACX,OAAO,EAAE,OAAO,EAChB,MAAM,EAAE,OAAO,EACf,IAAI,EAAE,KAAK,GACV,OAAO,CAAC,aAAa,CAAC,KAAK,CAAC,CAAC;IAchC;;;;;;;;;OASG;IACG,QAAQ,CACZ,OAAO,EAAE,OAAO,EAChB,MAAM,EAAE,OAAO,EACf,IAAI,EAAE,KAAK,GACV,OAAO,CAAC,aAAa,CAAC,KAAK,CAAC,CAAC;IAsBhC;;;;;OAKG;IACH,SAAS,CAAC,aAAa,IAAI,IAAI;~~IA8D~~/B;;;;;;;OAOG;IACH,cAAc,CAAC,QAAQ,EAAE,aAAa,GAAG,aAAa,CAAC,SAAS,CAAC;~~CAOlE~~"}
1	+ {"version":3,"file":"edit-form.service.d.ts","sourceRoot":"","sources":["../../../../../src/controller/control/form/edit-form/edit-form.service.ts"],"names":[],"mappings":"AAAA,OAAO,EACL,aAAa,EAGd,MAAM,qBAAqB,CAAC;AAC7B,OAAO,EACL,WAAW,EAKZ,MAAM,kBAAkB,CAAC;AAC1B,OAAO,EAAE,cAAc,EAAE,SAAS,EAAc,MAAM,qBAAqB,CAAC;AAE5E,qBAAa,eAAe,CAC1B,CAAC,SAAS,WAAW,GAAG,WAAW,CACnC,SAAQ,cAAc,CAAC,CAAC,CAAC;IACzB;;;;;;;;OAQG;IACG,GAAG,CACP,OAAO,EAAE,OAAO,EAChB,MAAM,GAAE,OAAY,GACnB,OAAO,CAAC,aAAa,CAAC,SAAS,CAAC,CAAC;IAWpC;;;;;;;;OAQG;IACG,QAAQ,CACZ,OAAO,EAAE,OAAO,EAChB,MAAM,GAAE,OAAY,GACnB,OAAO,CAAC,aAAa,CAAC,SAAS,CAAC,CAAC;IAWpC;;;;;;;;OAQG;IACG,MAAM,CAAC,OAAO,EAAE,OAAO,EAAE,MAAM,GAAE,OAAY,GAAG,OAAO,CAAC,aAAa,CAAC;IAU5E;;;;;;;;OAQG;IACG,MAAM,CACV,OAAO,EAAE,OAAO,EAChB,IAAI,EAAE,KAAK,GACV,OAAO,CAAC,aAAa,CAAC,SAAS,CAAC,CAAC;IAYpC;;;;;;;;OAQG;IACG,MAAM,CACV,OAAO,EAAE,OAAO,EAChB,IAAI,EAAE,KAAK,GACV,OAAO,CAAC,aAAa,CAAC,SAAS,CAAC,CAAC;IAYpC;;;;;;;;OAQG;IACG,MAAM,CACV,OAAO,EAAE,OAAO,EAChB,IAAI,EAAE,KAAK,GACV,OAAO,CAAC,aAAa,CAAC,SAAS,CAAC,CAAC;IAepC;;;;;;;;;OASG;IACG,cAAc,CAClB,UAAU,EAAE,MAAM,EAClB,OAAO,EAAE,OAAO,EAChB,MAAM,GAAE,OAAY,GACnB,OAAO,CAAC,aAAa,CAAC,SAAS,CAAC,CAAC;IAMpC;;;;;;;;;OASG;IACG,OAAO,CACX,OAAO,EAAE,OAAO,EAChB,MAAM,EAAE,OAAO,EACf,IAAI,EAAE,KAAK,GACV,OAAO,CAAC,aAAa,CAAC,KAAK,CAAC,CAAC;IAchC;;;;;;;;;OASG;IACG,QAAQ,CACZ,OAAO,EAAE,OAAO,EAChB,MAAM,EAAE,OAAO,EACf,IAAI,EAAE,KAAK,GACV,OAAO,CAAC,aAAa,CAAC,KAAK,CAAC,CAAC;IAsBhC;;;;;OAKG;IACH,SAAS,CAAC,aAAa,IAAI,IAAI;IA4C/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/edit-form/edit-form.service.js CHANGED Viewed

@@ -56,7 +56,9 @@ export class EditFormService extends ControlService {
      */
     async create(context, data) {
         var _a;
-        let res = await this.exec(((_a = this.model.createControlAction) === null || _a === void 0 ? void 0 : _a.appDEMethodId) || 'create', context, data instanceof ControlVO ? data.getOrigin() : data);
+        const _data = data instanceof ControlVO ? data.getOrigin() : data;
+        const tempData = this.getFilteredData(_data);
+        let res = await this.exec(((_a = this.model.createControlAction) === null || _a === void 0 ? void 0 : _a.appDEMethodId) || 'create', context, tempData);
         res = this.handleResponse(res);
         return res;
     }
@@ -71,7 +73,9 @@ export class EditFormService extends ControlService {
      */
     async update(context, data) {
         var _a;
-        let res = await this.exec(((_a = this.model.updateControlAction) === null || _a === void 0 ? void 0 : _a.appDEMethodId) || 'update', context, data instanceof ControlVO ? data.getOrigin() : data);
+        const _data = data instanceof ControlVO ? data.getOrigin() : data;
+        const tempData = this.getFilteredData(_data);
+        let res = await this.exec(((_a = this.model.updateControlAction) === null || _a === void 0 ? void 0 : _a.appDEMethodId) || 'update', context, tempData);
         res = this.handleResponse(res);
         return res;
     }
@@ -173,7 +177,7 @@ export class EditFormService extends ControlService {
         ];
         // *初始化表单的属性映射
         recursiveIterate(this.model, (item) => {
-            if (item.detailType === 'FORMITEM') {
+            if (item.detailType === 'FORMITEM' || item.detailType === 'MDCTRL') {
                 const formItem = item;
                 const uiKey = formItem.fieldName || formItem.id.toLowerCase();
                 const deField = formItem.fieldName || item.appDEFieldId;
@@ -191,24 +195,6 @@ export class EditFormService extends ControlService {
                 }
                 this.dataUIMap.set(uiKey, mapField);
             }
-            if (item.detailType === 'MDCTRL') {
-                const formItem = item;
-                const uiKey = formItem.fieldName || formItem.id.toLowerCase();
-                const deField = formItem.fieldName || item.appDEFieldId;
-                let mapField;
-                if (deField) {
-                    mapField = new UIMapField(uiKey, deField, {
-                        isOriginField: true,
-                    });
-                }
-                else {
-                    // 前台属性和没属性的表单项，或预置属性
-                    mapField = new UIMapField(uiKey, uiKey, {
-                        isOriginField: true,
-                    });
-                }
-                this.dataUIMap.set(uiKey, mapField);
-            }
         }, {
             childrenFields: ['deformPages', 'deformDetails'],
         });
@@ -228,4 +214,20 @@ export class EditFormService 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/form/form-detail/form-item/form-item.controller.d.ts CHANGED Viewed

@@ -106,6 +106,15 @@ export declare class FormItemController extends FormDetailController<IDEFormItem
      * @type {(string | undefined)}
      */
     get valueFormat(): string | undefined;
+    /**
+     * 数据类型
+     *
+     * @author zhanghengfeng
+     * @date 2023-09-01 11:09:00
+     * @readonly
+     * @type {(number | undefined)}
+     */
+    get dataType(): number | undefined;
     /**
      * 初始化
      *

package/out/controller/control/form/form-detail/form-item/form-item.controller.d.ts.map CHANGED Viewed

	@@ -1 +1 @@
1	- {"version":3,"file":"form-item.controller.d.ts","sourceRoot":"","sources":["../../../../../../src/controller/control/form/form-detail/form-item/form-item.controller.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,WAAW,EAAoB,MAAM,kBAAkB,CAAC;AAMjE,OAAO,EAAE,cAAc,EAAE,MAAM,4BAA4B,CAAC;AAC5D,OAAO,EAAE,oBAAoB,EAAE,MAAM,uCAAuC,CAAC;AAC7E,OAAO,EAAE,aAAa,EAAE,MAAM,mBAAmB,CAAC;AAClD,OAAO,EACL,0BAA0B,EAC1B,iBAAiB,EACjB,eAAe,EACf,8BAA8B,EAC/B,MAAM,0BAA0B,CAAC;AAIlC,OAAO,EAAE,eAAe,EAAE,MAAM,sBAAsB,CAAC;AAGvD,qBAAa,kBACX,SAAQ,oBAAoB,CAAC,WAAW,CACxC,YAAW,0BAA0B;IAE7B,KAAK,EAAE,aAAa,CAAC;IAE7B,SAAS,CAAC,WAAW,IAAI,aAAa;IAItC;;;;;;OAMG;IACH,QAAQ,CAAC,OAAO,EAAE,QAAQ,CAAC;IAE3B;;;;;;OAMG;IACH,QAAQ,CAAC,MAAM,EAAE,OAAO,CAAC;IAEzB;;;;;;OAMG;IACH,MAAM,CAAC,EAAE,iBAAiB,CAAC;IAE3B;;;;;OAKG;IACH,cAAc,CAAC,EAAE,eAAe,CAAC;IAEjC;;;;;;;OAOG;IACH,OAAO,CAAC,SAAS,CAAU;IAE3B;;;;;;OAMG;IACH,KAAK,EAAE,KAAK,CAAM;IAElB;;;;;;OAMG;IACH,IAAI,IAAI,IAAI,MAAM,CAEjB;IAED;;;;;;;OAOG;IACH,IAAI,KAAK,IAAI,OAAO,CAEnB;IAED;;;;;;OAMG;IACH,IAAI,aAAa,IAAI,MAAM,GAAG,SAAS,CAKtC;IAED;;;;;;;;OAQG;gBAED,KAAK,EAAE,WAAW,EAClB,IAAI,EAAE,cAAc,EACpB,MAAM,CAAC,EAAE,8BAA8B;IAOzC;;;;;;OAMG;IACH,IAAI,QAAQ,IAAI,MAAM,GAAG,SAAS,CAEjC;IAED;;;;;;OAMG;IACH,IAAI,WAAW,IAAI,MAAM,GAAG,SAAS,CAEpC;IAED;;;;;;;OAOG;cACa,MAAM,IAAI,OAAO,CAAC,IAAI,CAAC;IAiBvC;;;;;;;OAOG;cACa,SAAS,IAAI,OAAO,CAAC,IAAI,CAAC;IAa1C;;;;;;;OAOG;IACH,cAAc,IAAI,IAAI;IAWhB,gBAAgB,CAAC,IAAI,EAAE,MAAM,EAAE,GAAG,OAAO,CAAC,IAAI,CAAC;IA8B/C,eAAe,CAAC,KAAK,EAAE,eAAe,GAAG,OAAO,CAAC,IAAI,CAAC;IAY5D,SAAS,CAAC,gBAAgB,CAAC,KAAK,EAAE,MAAM,EAAE,EAAE,KAAK,CAAC,EAAE,eAAe,GAAG,IAAI;IAO1E;;;;;;OAMG;IACG,QAAQ,IAAI,OAAO,CAAC,OAAO,CAAC;IAyBlC;;;;;;;OAOG;IACG,YAAY,CAAC,KAAK,EAAE,OAAO,EAAE,IAAI,CAAC,EAAE,MAAM,GAAG,OAAO,CAAC,IAAI,CAAC;IAKhE;;;;;;OAMG;IACH,eAAe,CAAC,QAAQ,EAAE,OAAO,EAAE,IAAI,GAAE,KAAiB,GAAG,IAAI;CAsElE"}
1	+ {"version":3,"file":"form-item.controller.d.ts","sourceRoot":"","sources":["../../../../../../src/controller/control/form/form-detail/form-item/form-item.controller.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,WAAW,EAAoB,MAAM,kBAAkB,CAAC;AAMjE,OAAO,EAAE,cAAc,EAAE,MAAM,4BAA4B,CAAC;AAC5D,OAAO,EAAE,oBAAoB,EAAE,MAAM,uCAAuC,CAAC;AAC7E,OAAO,EAAE,aAAa,EAAE,MAAM,mBAAmB,CAAC;AAClD,OAAO,EACL,0BAA0B,EAC1B,iBAAiB,EACjB,eAAe,EACf,8BAA8B,EAC/B,MAAM,0BAA0B,CAAC;AAIlC,OAAO,EAAE,eAAe,EAAE,MAAM,sBAAsB,CAAC;AAGvD,qBAAa,kBACX,SAAQ,oBAAoB,CAAC,WAAW,CACxC,YAAW,0BAA0B;IAE7B,KAAK,EAAE,aAAa,CAAC;IAE7B,SAAS,CAAC,WAAW,IAAI,aAAa;IAItC;;;;;;OAMG;IACH,QAAQ,CAAC,OAAO,EAAE,QAAQ,CAAC;IAE3B;;;;;;OAMG;IACH,QAAQ,CAAC,MAAM,EAAE,OAAO,CAAC;IAEzB;;;;;;OAMG;IACH,MAAM,CAAC,EAAE,iBAAiB,CAAC;IAE3B;;;;;OAKG;IACH,cAAc,CAAC,EAAE,eAAe,CAAC;IAEjC;;;;;;;OAOG;IACH,OAAO,CAAC,SAAS,CAAU;IAE3B;;;;;;OAMG;IACH,KAAK,EAAE,KAAK,CAAM;IAElB;;;;;;OAMG;IACH,IAAI,IAAI,IAAI,MAAM,CAEjB;IAED;;;;;;;OAOG;IACH,IAAI,KAAK,IAAI,OAAO,CAEnB;IAED;;;;;;OAMG;IACH,IAAI,aAAa,IAAI,MAAM,GAAG,SAAS,CAKtC;IAED;;;;;;;;OAQG;gBAED,KAAK,EAAE,WAAW,EAClB,IAAI,EAAE,cAAc,EACpB,MAAM,CAAC,EAAE,8BAA8B;IAOzC;;;;;;OAMG;IACH,IAAI,QAAQ,IAAI,MAAM,GAAG,SAAS,CAEjC;IAED;;;;;;OAMG;IACH,IAAI,WAAW,IAAI,MAAM,GAAG,SAAS,CAEpC;IAED;;;;;;;OAOG;IACH,IAAI,QAAQ,IAAI,MAAM,GAAG,SAAS,CAEjC;IAED;;;;;;;OAOG;cACa,MAAM,IAAI,OAAO,CAAC,IAAI,CAAC;IAiBvC;;;;;;;OAOG;cACa,SAAS,IAAI,OAAO,CAAC,IAAI,CAAC;IAa1C;;;;;;;OAOG;IACH,cAAc,IAAI,IAAI;IAWhB,gBAAgB,CAAC,IAAI,EAAE,MAAM,EAAE,GAAG,OAAO,CAAC,IAAI,CAAC;IA8B/C,eAAe,CAAC,KAAK,EAAE,eAAe,GAAG,OAAO,CAAC,IAAI,CAAC;IAY5D,SAAS,CAAC,gBAAgB,CAAC,KAAK,EAAE,MAAM,EAAE,EAAE,KAAK,CAAC,EAAE,eAAe,GAAG,IAAI;IAO1E;;;;;;OAMG;IACG,QAAQ,IAAI,OAAO,CAAC,OAAO,CAAC;IAyBlC;;;;;;;OAOG;IACG,YAAY,CAAC,KAAK,EAAE,OAAO,EAAE,IAAI,CAAC,EAAE,MAAM,GAAG,OAAO,CAAC,IAAI,CAAC;IAKhE;;;;;;OAMG;IACH,eAAe,CAAC,QAAQ,EAAE,OAAO,EAAE,IAAI,GAAE,KAAiB,GAAG,IAAI;CAsElE"}

package/out/controller/control/form/form-detail/form-item/form-item.controller.js CHANGED Viewed

@@ -90,6 +90,17 @@ export class FormItemController extends FormDetailController {
     get valueFormat() {
         return this.model.valueFormat;
     }
+    /**
+     * 数据类型
+     *
+     * @author zhanghengfeng
+     * @date 2023-09-01 11:09:00
+     * @readonly
+     * @type {(number | undefined)}
+     */
+    get dataType() {
+        return this.model.dataType;
+    }
     /**
      * 初始化
      *

package/out/controller/control/form/form-detail/form-mdctrl/form-mdctrl-repeater/form-mdctrl-repeater-grid/form-mdctrl-repeater-grid.controller.d.ts.map CHANGED Viewed

	@@ -1 +1 @@
1	- {"version":3,"file":"form-mdctrl-repeater-grid.controller.d.ts","sourceRoot":"","sources":["../../../../../../../../src/controller/control/form/form-detail/form-mdctrl/form-mdctrl-repeater/form-mdctrl-repeater-grid/form-mdctrl-repeater-grid.controller.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,aAAa,EAAe,MAAM,kBAAkB,CAAC;AAC9D,OAAO,EACL,iBAAiB,EACjB,eAAe,EAChB,MAAM,gCAAgC,CAAC;AAIxC,OAAO,EAAE,+BAA+B,EAAE,MAAM,2CAA2C,CAAC;AAE5F;;;;;;;;;GASG;AACH,qBAAa,gCAAiC,SAAQ,+BAA+B;IACnF;;;;;;;OAOG;IACH,OAAO,EAAE;QAAE,QAAQ,EAAE,MAAM,CAAC;QAAC,OAAO,EAAE,MAAM,CAAA;KAAE,EAAE,CAAM;IAEtD;;;;;;;;;OASG;IACH,SAAS,EAAE;QACT,CAAC,GAAG,EAAE,MAAM,GAAG;YAAE,QAAQ,EAAE,eAAe,CAAC;YAAC,UAAU,EAAE,iBAAiB,CAAA;SAAE,CAAC;KAC7E,CAAM;IAEP;;;;;;;;OAQG;IACU,MAAM,IAAI,OAAO,CAAC,IAAI,CAAC;IAIpC;;;;;;;OAOG;IACI,WAAW,CAAC,OAAO,EAAE,aAAa,EAAE,GAAG,IAAI;~~IA6BlD~~;;;;;;;;;;OAUG;IACH,aAAa,CAAC,GAAG,EAAE,OAAO,EAAE,IAAI,EAAE,MAAM,EAAE,KAAK,EAAE,MAAM,GAAG,IAAI;CAY/D"}
1	+ {"version":3,"file":"form-mdctrl-repeater-grid.controller.d.ts","sourceRoot":"","sources":["../../../../../../../../src/controller/control/form/form-detail/form-mdctrl/form-mdctrl-repeater/form-mdctrl-repeater-grid/form-mdctrl-repeater-grid.controller.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,aAAa,EAAe,MAAM,kBAAkB,CAAC;AAC9D,OAAO,EACL,iBAAiB,EACjB,eAAe,EAChB,MAAM,gCAAgC,CAAC;AAIxC,OAAO,EAAE,+BAA+B,EAAE,MAAM,2CAA2C,CAAC;AAE5F;;;;;;;;;GASG;AACH,qBAAa,gCAAiC,SAAQ,+BAA+B;IACnF;;;;;;;OAOG;IACH,OAAO,EAAE;QAAE,QAAQ,EAAE,MAAM,CAAC;QAAC,OAAO,EAAE,MAAM,CAAA;KAAE,EAAE,CAAM;IAEtD;;;;;;;;;OASG;IACH,SAAS,EAAE;QACT,CAAC,GAAG,EAAE,MAAM,GAAG;YAAE,QAAQ,EAAE,eAAe,CAAC;YAAC,UAAU,EAAE,iBAAiB,CAAA;SAAE,CAAC;KAC7E,CAAM;IAEP;;;;;;;;OAQG;IACU,MAAM,IAAI,OAAO,CAAC,IAAI,CAAC;IAIpC;;;;;;;OAOG;IACI,WAAW,CAAC,OAAO,EAAE,aAAa,EAAE,GAAG,IAAI;IA8BlD;;;;;;;;;;OAUG;IACH,aAAa,CAAC,GAAG,EAAE,OAAO,EAAE,IAAI,EAAE,MAAM,EAAE,KAAK,EAAE,MAAM,GAAG,IAAI;CAY/D"}

package/out/controller/control/form/form-detail/form-mdctrl/form-mdctrl-repeater/form-mdctrl-repeater-grid/form-mdctrl-repeater-grid.controller.js CHANGED Viewed

@@ -59,7 +59,7 @@ export class FormMDCtrlRepeaterGridController extends FormMDCtrlContentTypeContr
     initColumns(details) {
         details.forEach(async (detail) => {
             if (detail.detailType === 'FORMITEM') {
-                const { editor } = detail;
+                const { editor, dataType } = detail;
                 const editorProvider = await getEditorProvider(editor);
                 if (editorProvider) {
                     const c = await editorProvider.createController(editor, {
@@ -67,6 +67,7 @@ export class FormMDCtrlRepeaterGridController extends FormMDCtrlContentTypeContr
                         valueFormat: editor.valueFormat,
                         context: this.parent.form.context,
                         params: this.parent.form.params,
+                        dataType,
                     });
                     this.editorMap[detail.codeName] = {
                         provider: editorProvider,

package/out/controller/control/grid/grid/grid.controller.d.ts.map CHANGED Viewed

	@@ -1 +1 @@
1	- {"version":3,"file":"grid.controller.d.ts","sourceRoot":"","sources":["../../../../../src/controller/control/grid/grid/grid.controller.ts"],"names":[],"mappings":"AASA,OAAO,EAAE,OAAO,EAAsB,aAAa,EAAE,MAAM,kBAAkB,CAAC;AAE9E,OAAO,EAAE,yBAAyB,EAAE,MAAM,+DAA+D,CAAC;AAC1G,OAAO,EAAE,oBAAoB,EAAE,MAAM,0BAA0B,CAAC;AAChE,OAAO,EAAE,YAAY,EAAE,MAAM,kBAAkB,CAAC;AAChD,OAAO,EAAE,WAAW,EAAE,MAAM,gBAAgB,CAAC;AAC7C,OAAO,EACL,6BAA6B,EAC7B,sBAAsB,EACvB,MAAM,gBAAgB,CAAC;AACxB,OAAO,EACL,UAAU,EACV,UAAU,EACV,eAAe,EACf,mBAAmB,EACnB,YAAY,EACZ,gBAAgB,EACjB,MAAM,uBAAuB,CAAC;AAG/B,OAAO,EAAE,SAAS,EAAS,MAAM,qBAAqB,CAAC;AACvD,OAAO,EAAE,mBAAmB,EAAE,MAAM,iBAAiB,CAAC;AACtD,OAAO,EAAE,eAAe,EAAE,MAAM,mBAAmB,CAAC;~~AAGpD~~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~~IA4B5E~~;;;;;;;;OAQG;IACG,QAAQ,CAAC,IAAI,EAAE,gBAAgB,GAAG,OAAO,CAAC,SAAS,EAAE,CAAC;IAe5D;;;;;;OAMG;IACG,UAAU,CAAC,KAAK,EAAE;QAAE,KAAK,EAAE,UAAU,CAAC;QAAC,MAAM,EAAE,KAAK,CAAA;KAAE,GAAG,OAAO,CAAC,IAAI,CAAC;CA4F7E"}
1	+ {"version":3,"file":"grid.controller.d.ts","sourceRoot":"","sources":["../../../../../src/controller/control/grid/grid/grid.controller.ts"],"names":[],"mappings":"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"}

package/out/controller/control/grid/grid/grid.controller.js CHANGED Viewed

@@ -9,6 +9,7 @@ import { Srfuf } from '../../../../service';
 import { MDControlController } from '../../../common';
 import { GridNotifyState } from '../../../constant';
 import { isValueChange } from '../../../utils';
+import { ScriptFactory } from '../../../../utils';
 /**
  * 表格控制器
  *
@@ -647,15 +648,22 @@ export class GridController extends MDControlController {
         if (!findUpdate) {
             throw new RuntimeError(`没找到${updateId}编辑列更新`);
         }
-        const { appDEMethodId, degeiupdateDetails } = findUpdate;
+        const { appDEMethodId, degeiupdateDetails, customCode, scriptCode } = findUpdate;
         const updateItems = degeiupdateDetails.map(item => item.id);
-        const params = Object.assign(Object.assign({}, this.params), row.data.getOrigin());
-        const res = await this.service.updateGridEditItem(appDEMethodId, this.context, params);
-        const result = res.data;
-        if (result && (updateItems === null || updateItems === void 0 ? void 0 : updateItems.length)) {
-            await Promise.all(updateItems.map(itemName => {
-                return this.setRowValue(row, itemName, result[itemName]);
-            }));
+        if (customCode && scriptCode) {
+            ScriptFactory.execScriptFn({ data: row.data }, scriptCode, {
+                isAsync: false,
+            });
+        }
+        else {
+            const params = Object.assign(Object.assign({}, this.params), row.data.getOrigin());
+            const res = await this.service.updateGridEditItem(appDEMethodId, this.context, params);
+            const result = res.data;
+            if (result && (updateItems === null || updateItems === void 0 ? void 0 : updateItems.length)) {
+                await Promise.all(updateItems.map(itemName => {
+                    return this.setRowValue(row, itemName, result[itemName]);
+                }));
+            }
         }
     }
     /**

package/out/controller/control/grid/grid/grid.service.d.ts.map CHANGED Viewed

	@@ -1 +1 @@
1	- {"version":3,"file":"grid.service.d.ts","sourceRoot":"","sources":["../../../../../src/controller/control/grid/grid/grid.service.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,aAAa,EAAE,MAAM,qBAAqB,CAAC;AACpD,OAAO,EAAE,OAAO,EAAE,MAAM,kBAAkB,CAAC;AAC3C,OAAO,EAAE,gBAAgB,EAAc,SAAS,EAAE,MAAM,qBAAqB,CAAC;AAE9E;;;;;;;GAOG;AACH,qBAAa,WAAY,SAAQ,gBAAgB,CAAC,OAAO,CAAC;IACxD;;;;;OAKG;IACH,aAAa,IAAI,IAAI;IAgCrB;;;;;;;;;OASG;IACG,kBAAkB,CACtB,UAAU,EAAE,MAAM,EAClB,OAAO,EAAE,OAAO,EAChB,MAAM,GAAE,OAAY,GACnB,OAAO,CAAC,aAAa,CAAC,SAAS,CAAC,CAAC;~~CAKrC~~"}
1	+ {"version":3,"file":"grid.service.d.ts","sourceRoot":"","sources":["../../../../../src/controller/control/grid/grid/grid.service.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,aAAa,EAAE,MAAM,qBAAqB,CAAC;AACpD,OAAO,EAAE,OAAO,EAAE,MAAM,kBAAkB,CAAC;AAC3C,OAAO,EAAE,gBAAgB,EAAc,SAAS,EAAE,MAAM,qBAAqB,CAAC;AAE9E;;;;;;;GAOG;AACH,qBAAa,WAAY,SAAQ,gBAAgB,CAAC,OAAO,CAAC;IACxD;;;;;OAKG;IACH,aAAa,IAAI,IAAI;IAgCrB;;;;;;;;;OASG;IACG,kBAAkB,CACtB,UAAU,EAAE,MAAM,EAClB,OAAO,EAAE,OAAO,EAChB,MAAM,GAAE,OAAY,GACnB,OAAO,CAAC,aAAa,CAAC,SAAS,CAAC,CAAC;CAQrC"}

package/out/controller/control/grid/grid/grid.service.js CHANGED Viewed

@@ -57,7 +57,8 @@ export class GridService extends MDControlService {
      * @returns {*}  {Promise<IHttpResponse<ControlVO>>}
      */
     async updateGridEditItem(methodName, context, params = {}) {
-        let res = await this.entityService.exec(methodName, context, params);
+        const entityService = await this.app.deService.getService(this.model.appDataEntityId);
+        let res = await entityService.exec(methodName, context, params);
         res = this.handleResponse(res);
         return res;
     }

package/out/de-logic/de-logic-context.d.ts CHANGED Viewed

@@ -12,6 +12,13 @@ export declare class DELogicContext {
     context: IParams;
     data: IData;
     viewParams: IParams;
+    /**
+     * 上一次返回值
+     * @author lxm
+     * @date 2023-09-04 09:22:52
+     * @type {unknown}
+     */
+    lastReturn: unknown;
     /**
      * Creates an instance of DELogicContext.
      * @author lxm
@@ -69,5 +76,19 @@ export declare class DELogicContext {
      * @type {string}
      */
     defaultParamName: string;
+    /**
+     * 设置上一次返回值
+     * @author lxm
+     * @date 2023-09-04 09:23:52
+     * @param {unknown} value
+     */
+    setLastReturn(value: unknown): void;
+    /**
+     * 初始化上一次返回参数类型的逻辑参数
+     * @author lxm
+     * @date 2023-09-04 09:52:00
+     * @param {string} tag
+     */
+    initLastReturnParam(tag: string): void;
 }
 //# sourceMappingURL=de-logic-context.d.ts.map

package/out/de-logic/de-logic-context.d.ts.map CHANGED Viewed

	@@ -1 +1 @@
1	- {"version":3,"file":"de-logic-context.d.ts","sourceRoot":"","sources":["../../src/de-logic/de-logic-context.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,YAAY,EAAE,MAAM,iCAAiC,CAAC;AAE/D;;;;;;;GAOG;AACH,qBAAa,cAAc;~~IAWvB~~,OAAO,CAAC,aAAa;IACd,OAAO,EAAE,OAAO;IAChB,IAAI,EAAE,KAAK;IACX,UAAU,EAAE,OAAO;~~IAb5B~~;;;;;;;;OAQG;gBAEO,aAAa,EAAE,GAAG,CAAC,MAAM,EAAE,YAAY,CAAC,EACzC,OAAO,EAAE,OAAO,EAChB,IAAI,EAAE,KAAK,EACX,UAAU,EAAE,OAAO;IAG5B;;;;;OAKG;IACH,UAAU,CAAC,IAAI,EAAE,MAAM,GAAG,IAAI;IAI9B;;;;;OAKG;IACH,UAAU,CAAC,IAAI,EAAE,MAAM,GAAG,IAAI;IAI9B;;;;;;;OAOG;IAEH,MAAM,EAAE,MAAM,CAAC,MAAM,EAAE,GAAG,CAAC,CAAM;IAEjC;;;;;;OAMG;IACH,MAAM,EAAE,OAAO,CAAQ;IAEvB;;;;;;OAMG;IACH,SAAS,EAAE,OAAO,CAAS;IAE3B;;;;;;OAMG;IACH,gBAAgB,EAAE,MAAM,CAAa;~~CACtC~~"}
1	+ {"version":3,"file":"de-logic-context.d.ts","sourceRoot":"","sources":["../../src/de-logic/de-logic-context.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,YAAY,EAAE,MAAM,iCAAiC,CAAC;AAE/D;;;;;;;GAOG;AACH,qBAAa,cAAc;IAmBvB,OAAO,CAAC,aAAa;IACd,OAAO,EAAE,OAAO;IAChB,IAAI,EAAE,KAAK;IACX,UAAU,EAAE,OAAO;IArB5B;;;;;OAKG;IACH,UAAU,EAAE,OAAO,CAAC;IAEpB;;;;;;;;OAQG;gBAEO,aAAa,EAAE,GAAG,CAAC,MAAM,EAAE,YAAY,CAAC,EACzC,OAAO,EAAE,OAAO,EAChB,IAAI,EAAE,KAAK,EACX,UAAU,EAAE,OAAO;IAG5B;;;;;OAKG;IACH,UAAU,CAAC,IAAI,EAAE,MAAM,GAAG,IAAI;IAI9B;;;;;OAKG;IACH,UAAU,CAAC,IAAI,EAAE,MAAM,GAAG,IAAI;IAI9B;;;;;;;OAOG;IAEH,MAAM,EAAE,MAAM,CAAC,MAAM,EAAE,GAAG,CAAC,CAAM;IAEjC;;;;;;OAMG;IACH,MAAM,EAAE,OAAO,CAAQ;IAEvB;;;;;;OAMG;IACH,SAAS,EAAE,OAAO,CAAS;IAE3B;;;;;;OAMG;IACH,gBAAgB,EAAE,MAAM,CAAa;IAErC;;;;;OAKG;IACH,aAAa,CAAC,KAAK,EAAE,OAAO,GAAG,IAAI;IAInC;;;;;OAKG;IACH,mBAAmB,CAAC,GAAG,EAAE,MAAM,GAAG,IAAI;CAOvC"}

package/out/de-logic/de-logic-context.js CHANGED Viewed

@@ -76,4 +76,26 @@ export class DELogicContext {
         var _a;
         (_a = this.deLogicParams.get(name)) === null || _a === void 0 ? void 0 : _a.renew(this);
     }
+    /**
+     * 设置上一次返回值
+     * @author lxm
+     * @date 2023-09-04 09:23:52
+     * @param {unknown} value
+     */
+    setLastReturn(value) {
+        this.lastReturn = value;
+    }
+    /**
+     * 初始化上一次返回参数类型的逻辑参数
+     * @author lxm
+     * @date 2023-09-04 09:52:00
+     * @param {string} tag
+     */
+    initLastReturnParam(tag) {
+        Object.defineProperty(this.params, tag, {
+            enumerable: true,
+            configurable: true,
+            get: () => this.lastReturn,
+        });
+    }
 }

package/out/de-logic/de-logic-param/de-logic-param.d.ts.map CHANGED Viewed

	@@ -1 +1 @@
1	- {"version":3,"file":"de-logic-param.d.ts","sourceRoot":"","sources":["../../../src/de-logic/de-logic-param/de-logic-param.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,aAAa,EAAE,MAAM,kBAAkB,CAAC;AAEjD,OAAO,EAAE,cAAc,EAAE,MAAM,qBAAqB,CAAC;AAErD;;;;;;;GAOG;AACH,qBAAa,YAAY;IAQJ,KAAK,EAAE,aAAa;IAPvC;;;;;;OAMG;gBACgB,KAAK,EAAE,aAAa;IAEvC;;;;;;;;;OASG;IACH,IAAI,CAAC,GAAG,EAAE,cAAc,GAAG,IAAI;~~IA+C~~/B;;;;;OAKG;IACH,KAAK,CAAC,GAAG,EAAE,cAAc,GAAG,IAAI;CAWjC"}
1	+ {"version":3,"file":"de-logic-param.d.ts","sourceRoot":"","sources":["../../../src/de-logic/de-logic-param/de-logic-param.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,aAAa,EAAE,MAAM,kBAAkB,CAAC;AAEjD,OAAO,EAAE,cAAc,EAAE,MAAM,qBAAqB,CAAC;AAErD;;;;;;;GAOG;AACH,qBAAa,YAAY;IAQJ,KAAK,EAAE,aAAa;IAPvC;;;;;;OAMG;gBACgB,KAAK,EAAE,aAAa;IAEvC;;;;;;;;;OASG;IACH,IAAI,CAAC,GAAG,EAAE,cAAc,GAAG,IAAI;IAgD/B;;;;;OAKG;IACH,KAAK,CAAC,GAAG,EAAE,cAAc,GAAG,IAAI;CAWjC"}

package/out/de-logic/de-logic-param/de-logic-param.js CHANGED Viewed

@@ -51,7 +51,8 @@ export class DELogicParam {
             ctx.params[tag] = {};
         }
         else if (m.lastReturnParam) {
-            throw new ModelError(m, `未支持的逻辑参数类型: 上次调用返回`);
+            // 上一次调用返回
+            ctx.initLastReturnParam(tag);
         }
         else if (m.appContextParam) {
             // 应用上下文

package/out/interface/controller/controller/editor/i-editor-container.controller.d.ts CHANGED Viewed

@@ -34,5 +34,13 @@ export interface IEditorContainerController {
      * @type {IParams}
      */
     params: IParams;
+    /**
+     * 数据类型
+     *
+     * @author zhanghengfeng
+     * @date 2023-09-01 11:09:38
+     * @type {(number | undefined)}
+     */
+    dataType: number | undefined;
 }
 //# sourceMappingURL=i-editor-container.controller.d.ts.map

package/out/interface/controller/controller/editor/i-editor-container.controller.d.ts.map CHANGED Viewed

	@@ -1 +1 @@
1	- {"version":3,"file":"i-editor-container.controller.d.ts","sourceRoot":"","sources":["../../../../../src/interface/controller/controller/editor/i-editor-container.controller.ts"],"names":[],"mappings":"AAAA;;;;;;GAMG;AACH,MAAM,WAAW,0BAA0B;IACzC;;;;;OAKG;IACH,QAAQ,EAAE,MAAM,GAAG,SAAS,CAAC;IAE7B;;;;;OAKG;IACH,WAAW,EAAE,MAAM,GAAG,SAAS,CAAC;IAEhC;;;;;OAKG;IACH,OAAO,EAAE,QAAQ,CAAC;IAElB;;;;;OAKG;IACH,MAAM,EAAE,OAAO,CAAC;~~CACjB~~"}
1	+ {"version":3,"file":"i-editor-container.controller.d.ts","sourceRoot":"","sources":["../../../../../src/interface/controller/controller/editor/i-editor-container.controller.ts"],"names":[],"mappings":"AAAA;;;;;;GAMG;AACH,MAAM,WAAW,0BAA0B;IACzC;;;;;OAKG;IACH,QAAQ,EAAE,MAAM,GAAG,SAAS,CAAC;IAE7B;;;;;OAKG;IACH,WAAW,EAAE,MAAM,GAAG,SAAS,CAAC;IAEhC;;;;;OAKG;IACH,OAAO,EAAE,QAAQ,CAAC;IAElB;;;;;OAKG;IACH,MAAM,EAAE,OAAO,CAAC;IAEhB;;;;;;OAMG;IACH,QAAQ,EAAE,MAAM,GAAG,SAAS,CAAC;CAC9B"}

package/out/interface/controller/event/view/i-form-pickup-data-view.event.d.ts ADDED Viewed

@@ -0,0 +1,13 @@
+import { IPickupDataViewEvent } from './i-pickup-data-view.event';
+/**
+ * 表单选择数据视图事件
+ *
+ * @author zk
+ * @date 2023-09-01 02:09:26
+ * @export
+ * @interface IFormPickupDataViewEvent
+ * @extends {IMDViewEvent}
+ */
+export interface IFormPickupDataViewEvent extends IPickupDataViewEvent {
+}
+//# sourceMappingURL=i-form-pickup-data-view.event.d.ts.map

package/out/interface/controller/event/view/i-form-pickup-data-view.event.d.ts.map ADDED Viewed

	@@ -0,0 +1 @@
1	+ {"version":3,"file":"i-form-pickup-data-view.event.d.ts","sourceRoot":"","sources":["../../../../../src/interface/controller/event/view/i-form-pickup-data-view.event.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,oBAAoB,EAAE,MAAM,4BAA4B,CAAC;AAElE;;;;;;;;GAQG;AACH,MAAM,WAAW,wBAAyB,SAAQ,oBAAoB;CAAG"}

package/out/interface/controller/event/view/i-form-pickup-data-view.event.js ADDED Viewed

	@@ -0,0 +1 @@
1	+ export {};

package/out/interface/controller/event/view/index.d.ts CHANGED Viewed

@@ -36,4 +36,5 @@ export * from './i-de-portal-view.event';
 export * from './i-calendar-view.event';
 export * from './i-calendar-exp-view.event';
 export * from './i-pickup-md-view.event';
+export * from './i-form-pickup-data-view.event';
 //# sourceMappingURL=index.d.ts.map

package/out/interface/controller/event/view/index.d.ts.map CHANGED Viewed

	@@ -1 +1 @@
1	- {"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../../../../src/interface/controller/event/view/index.ts"],"names":[],"mappings":"AAAA,cAAc,gBAAgB,CAAC;AAC/B,cAAc,qBAAqB,CAAC;AACpC,cAAc,sBAAsB,CAAC;AACrC,cAAc,sBAAsB,CAAC;AACrC,cAAc,sBAAsB,CAAC;AACrC,cAAc,oBAAoB,CAAC;AACnC,cAAc,mBAAmB,CAAC;AAClC,cAAc,qBAAqB,CAAC;AACpC,cAAc,qBAAqB,CAAC;AACpC,cAAc,qBAAqB,CAAC;AACpC,cAAc,qBAAqB,CAAC;AACpC,cAAc,uBAAuB,CAAC;AACtC,cAAc,wBAAwB,CAAC;AACvC,cAAc,4BAA4B,CAAC;AAC3C,cAAc,4BAA4B,CAAC;AAC3C,cAAc,wBAAwB,CAAC;AACvC,cAAc,6BAA6B,CAAC;AAC5C,cAAc,8BAA8B,CAAC;AAC7C,cAAc,8BAA8B,CAAC;AAC7C,cAAc,+BAA+B,CAAC;AAC9C,cAAc,yBAAyB,CAAC;AACxC,cAAc,wBAAwB,CAAC;AACvC,cAAc,yBAAyB,CAAC;AACxC,cAAc,sBAAsB,CAAC;AACrC,cAAc,uBAAuB,CAAC;AACtC,cAAc,yBAAyB,CAAC;AACxC,cAAc,uBAAuB,CAAC;AACtC,cAAc,oBAAoB,CAAC;AACnC,cAAc,8BAA8B,CAAC;AAC7C,cAAc,sBAAsB,CAAC;AACrC,cAAc,4BAA4B,CAAC;AAC3C,cAAc,8BAA8B,CAAC;AAC7C,cAAc,uBAAuB,CAAC;AACtC,cAAc,2BAA2B,CAAC;AAC1C,cAAc,0BAA0B,CAAC;AACzC,cAAc,yBAAyB,CAAC;AACxC,cAAc,6BAA6B,CAAC;AAC5C,cAAc,0BAA0B,CAAC"}
1	+ {"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../../../../src/interface/controller/event/view/index.ts"],"names":[],"mappings":"AAAA,cAAc,gBAAgB,CAAC;AAC/B,cAAc,qBAAqB,CAAC;AACpC,cAAc,sBAAsB,CAAC;AACrC,cAAc,sBAAsB,CAAC;AACrC,cAAc,sBAAsB,CAAC;AACrC,cAAc,oBAAoB,CAAC;AACnC,cAAc,mBAAmB,CAAC;AAClC,cAAc,qBAAqB,CAAC;AACpC,cAAc,qBAAqB,CAAC;AACpC,cAAc,qBAAqB,CAAC;AACpC,cAAc,qBAAqB,CAAC;AACpC,cAAc,uBAAuB,CAAC;AACtC,cAAc,wBAAwB,CAAC;AACvC,cAAc,4BAA4B,CAAC;AAC3C,cAAc,4BAA4B,CAAC;AAC3C,cAAc,wBAAwB,CAAC;AACvC,cAAc,6BAA6B,CAAC;AAC5C,cAAc,8BAA8B,CAAC;AAC7C,cAAc,8BAA8B,CAAC;AAC7C,cAAc,+BAA+B,CAAC;AAC9C,cAAc,yBAAyB,CAAC;AACxC,cAAc,wBAAwB,CAAC;AACvC,cAAc,yBAAyB,CAAC;AACxC,cAAc,sBAAsB,CAAC;AACrC,cAAc,uBAAuB,CAAC;AACtC,cAAc,yBAAyB,CAAC;AACxC,cAAc,uBAAuB,CAAC;AACtC,cAAc,oBAAoB,CAAC;AACnC,cAAc,8BAA8B,CAAC;AAC7C,cAAc,sBAAsB,CAAC;AACrC,cAAc,4BAA4B,CAAC;AAC3C,cAAc,8BAA8B,CAAC;AAC7C,cAAc,uBAAuB,CAAC;AACtC,cAAc,2BAA2B,CAAC;AAC1C,cAAc,0BAA0B,CAAC;AACzC,cAAc,yBAAyB,CAAC;AACxC,cAAc,6BAA6B,CAAC;AAC5C,cAAc,0BAA0B,CAAC;AACzC,cAAc,iCAAiC,CAAC"}

package/out/interface/controller/event/view/index.js CHANGED Viewed

@@ -36,3 +36,4 @@ export * from './i-de-portal-view.event';
 export * from './i-calendar-view.event';
 export * from './i-calendar-exp-view.event';
 export * from './i-pickup-md-view.event';
+export * from './i-form-pickup-data-view.event';

package/out/interface/controller/state/view/i-form-pickup-data-view.state.d.ts ADDED Viewed

@@ -0,0 +1,13 @@
+import { IPickupDataViewState } from './i-pickup-data-view.state';
+/**
+ * 表单选择数据视图UI状态
+ *
+ * @author zk
+ * @date 2023-09-01 02:09:26
+ * @export
+ * @interface IFormPickupDataViewState
+ * @extends {IMDViewState}
+ */
+export interface IFormPickupDataViewState extends IPickupDataViewState {
+}
+//# sourceMappingURL=i-form-pickup-data-view.state.d.ts.map

package/out/interface/controller/state/view/i-form-pickup-data-view.state.d.ts.map ADDED Viewed

	@@ -0,0 +1 @@
1	+ {"version":3,"file":"i-form-pickup-data-view.state.d.ts","sourceRoot":"","sources":["../../../../../src/interface/controller/state/view/i-form-pickup-data-view.state.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,oBAAoB,EAAE,MAAM,4BAA4B,CAAC;AAElE;;;;;;;;GAQG;AACH,MAAM,WAAW,wBAAyB,SAAQ,oBAAoB;CAAG"}

package/out/interface/controller/state/view/i-form-pickup-data-view.state.js ADDED Viewed

	@@ -0,0 +1 @@
1	+ export {};

package/out/interface/controller/state/view/i-view.state.d.ts CHANGED Viewed

@@ -29,5 +29,12 @@ export interface IViewState extends IControllerState, IViewSession {
      * @type {boolean}
      */
     noLoadDefault: boolean;
+    /**
+     * 设置关闭视图时返回给外面的状态
+     * @author lxm
+     * @date 2023-09-01 10:37:46
+     * @type {boolean}
+     */
+    closeOK?: boolean;
 }
 //# sourceMappingURL=i-view.state.d.ts.map

package/out/interface/controller/state/view/i-view.state.d.ts.map CHANGED Viewed

	@@ -1 +1 @@
1	- {"version":3,"file":"i-view.state.d.ts","sourceRoot":"","sources":["../../../../../src/interface/controller/state/view/i-view.state.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,YAAY,EAAE,MAAM,iBAAiB,CAAC;AAC/C,OAAO,EAAE,gBAAgB,EAAE,MAAM,8BAA8B,CAAC;AAEhE;;;;;GAKG;AACH,MAAM,WAAW,UAAW,SAAQ,gBAAgB,EAAE,YAAY;IAChE;;;;;;OAMG;IACH,OAAO,EAAE,MAAM,CAAC;IAEhB;;;;;OAKG;IACH,SAAS,EAAE,OAAO,CAAC;IAEnB;;;;;OAKG;IACH,aAAa,EAAE,OAAO,CAAC;~~CACxB~~"}
1	+ {"version":3,"file":"i-view.state.d.ts","sourceRoot":"","sources":["../../../../../src/interface/controller/state/view/i-view.state.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,YAAY,EAAE,MAAM,iBAAiB,CAAC;AAC/C,OAAO,EAAE,gBAAgB,EAAE,MAAM,8BAA8B,CAAC;AAEhE;;;;;GAKG;AACH,MAAM,WAAW,UAAW,SAAQ,gBAAgB,EAAE,YAAY;IAChE;;;;;;OAMG;IACH,OAAO,EAAE,MAAM,CAAC;IAEhB;;;;;OAKG;IACH,SAAS,EAAE,OAAO,CAAC;IAEnB;;;;;OAKG;IACH,aAAa,EAAE,OAAO,CAAC;IAEvB;;;;;OAKG;IACH,OAAO,CAAC,EAAE,OAAO,CAAC;CACnB"}

package/out/interface/controller/state/view/index.d.ts CHANGED Viewed

@@ -36,4 +36,5 @@ export * from './i-panel-view.state';
 export * from './i-calendar-view.state';
 export * from './i-calendar-exp-view.state';
 export * from './i-pickup-md-view.state';
+export * from './i-form-pickup-data-view.state';
 //# sourceMappingURL=index.d.ts.map

package/out/interface/controller/state/view/index.d.ts.map CHANGED Viewed

	@@ -1 +1 @@
1	- {"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../../../../src/interface/controller/state/view/index.ts"],"names":[],"mappings":"AAAA,cAAc,gBAAgB,CAAC;AAC/B,cAAc,sBAAsB,CAAC;AACrC,cAAc,mBAAmB,CAAC;AAClC,cAAc,qBAAqB,CAAC;AACpC,cAAc,qBAAqB,CAAC;AACpC,cAAc,qBAAqB,CAAC;AACpC,cAAc,qBAAqB,CAAC;AACpC,cAAc,oBAAoB,CAAC;AACnC,cAAc,wBAAwB,CAAC;AACvC,cAAc,uBAAuB,CAAC;AACtC,cAAc,4BAA4B,CAAC;AAC3C,cAAc,4BAA4B,CAAC;AAC3C,cAAc,wBAAwB,CAAC;AACvC,cAAc,oBAAoB,CAAC;AACnC,cAAc,yBAAyB,CAAC;AACxC,cAAc,yBAAyB,CAAC;AACxC,cAAc,8BAA8B,CAAC;AAC7C,cAAc,yBAAyB,CAAC;AACxC,cAAc,sBAAsB,CAAC;AACrC,cAAc,uBAAuB,CAAC;AACtC,cAAc,qBAAqB,CAAC;AACpC,cAAc,sBAAsB,CAAC;AACrC,cAAc,sBAAsB,CAAC;AACrC,cAAc,sBAAsB,CAAC;AACrC,cAAc,8BAA8B,CAAC;AAC7C,cAAc,+BAA+B,CAAC;AAC9C,cAAc,6BAA6B,CAAC;AAC5C,cAAc,8BAA8B,CAAC;AAC7C,cAAc,wBAAwB,CAAC;AACvC,cAAc,4BAA4B,CAAC;AAC3C,cAAc,8BAA8B,CAAC;AAC7C,cAAc,uBAAuB,CAAC;AACtC,cAAc,2BAA2B,CAAC;AAC1C,cAAc,0BAA0B,CAAC;AACzC,cAAc,sBAAsB,CAAC;AACrC,cAAc,yBAAyB,CAAC;AACxC,cAAc,6BAA6B,CAAC;AAC5C,cAAc,0BAA0B,CAAC"}
1	+ {"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../../../../src/interface/controller/state/view/index.ts"],"names":[],"mappings":"AAAA,cAAc,gBAAgB,CAAC;AAC/B,cAAc,sBAAsB,CAAC;AACrC,cAAc,mBAAmB,CAAC;AAClC,cAAc,qBAAqB,CAAC;AACpC,cAAc,qBAAqB,CAAC;AACpC,cAAc,qBAAqB,CAAC;AACpC,cAAc,qBAAqB,CAAC;AACpC,cAAc,oBAAoB,CAAC;AACnC,cAAc,wBAAwB,CAAC;AACvC,cAAc,uBAAuB,CAAC;AACtC,cAAc,4BAA4B,CAAC;AAC3C,cAAc,4BAA4B,CAAC;AAC3C,cAAc,wBAAwB,CAAC;AACvC,cAAc,oBAAoB,CAAC;AACnC,cAAc,yBAAyB,CAAC;AACxC,cAAc,yBAAyB,CAAC;AACxC,cAAc,8BAA8B,CAAC;AAC7C,cAAc,yBAAyB,CAAC;AACxC,cAAc,sBAAsB,CAAC;AACrC,cAAc,uBAAuB,CAAC;AACtC,cAAc,qBAAqB,CAAC;AACpC,cAAc,sBAAsB,CAAC;AACrC,cAAc,sBAAsB,CAAC;AACrC,cAAc,sBAAsB,CAAC;AACrC,cAAc,8BAA8B,CAAC;AAC7C,cAAc,+BAA+B,CAAC;AAC9C,cAAc,6BAA6B,CAAC;AAC5C,cAAc,8BAA8B,CAAC;AAC7C,cAAc,wBAAwB,CAAC;AACvC,cAAc,4BAA4B,CAAC;AAC3C,cAAc,8BAA8B,CAAC;AAC7C,cAAc,uBAAuB,CAAC;AACtC,cAAc,2BAA2B,CAAC;AAC1C,cAAc,0BAA0B,CAAC;AACzC,cAAc,sBAAsB,CAAC;AACrC,cAAc,yBAAyB,CAAC;AACxC,cAAc,6BAA6B,CAAC;AAC5C,cAAc,0BAA0B,CAAC;AACzC,cAAc,iCAAiC,CAAC"}

package/out/interface/controller/state/view/index.js CHANGED Viewed

@@ -36,3 +36,4 @@ export * from './i-panel-view.state';
 export * from './i-calendar-view.state';
 export * from './i-calendar-exp-view.state';
 export * from './i-pickup-md-view.state';
+export * from './i-form-pickup-data-view.state';

package/out/interface/util/i-modal-util/i-modal-util.d.ts CHANGED Viewed

@@ -23,6 +23,41 @@ export interface ModalParams {
      * @type {string}
      */
     desc?: string;
+    /**
+     * 显示确认按钮（默认显示）
+     * @author lxm
+     * @date 2023-09-04 05:37:59
+     * @type {boolean}
+     */
+    showConfirmButton?: boolean;
+    /**
+     * 是否显示取消按钮
+     * @author lxm
+     * @date 2023-09-04 05:38:49
+     * @type {boolean}
+     */
+    showCancelButton?: boolean;
+    /**
+     * 确认按钮显示文本
+     * @author lxm
+     * @date 2023-09-04 05:39:30
+     * @type {string}
+     */
+    confirmButtonText?: string;
+    /**
+     * 取消按钮显示文本
+     * @author lxm
+     * @date 2023-09-04 05:39:30
+     * @type {string}
+     */
+    cancelButtonText?: string;
+    /**
+     * 消息类型
+     * @author lxm
+     * @date 2023-09-04 05:40:25
+     * @type {('success' | '')}
+     */
+    type?: 'success' | 'info' | 'warning' | 'error';
     /**
      * 传递给时机组件的参数
      *

package/out/interface/util/i-modal-util/i-modal-util.d.ts.map CHANGED Viewed

	@@ -1 +1 @@
1	- {"version":3,"file":"i-modal-util.d.ts","sourceRoot":"","sources":["../../../../src/interface/util/i-modal-util/i-modal-util.ts"],"names":[],"mappings":"AAAA;;;;;;;GAOG;AACH,MAAM,WAAW,WAAW;IAC1B;;;;;;OAMG;IACH,KAAK,EAAE,MAAM,CAAC;IACd;;;;;;OAMG;IACH,IAAI,CAAC,EAAE,MAAM,CAAC;~~IACd~~;;;;;;OAMG;IACH,OAAO,CAAC,EAAE,OAAO,CAAC;CACnB;AAED;;;;;;;;GAQG;AACH,MAAM,WAAW,UAAU;IACzB;;;;;;;OAOG;IACH,IAAI,CAAC,MAAM,EAAE,WAAW,GAAG,OAAO,CAAC,IAAI,CAAC,CAAC;IACzC;;;;;;;OAOG;IACH,OAAO,CAAC,MAAM,EAAE,WAAW,GAAG,OAAO,CAAC,IAAI,CAAC,CAAC;IAC5C;;;;;;;OAOG;IACH,OAAO,CAAC,MAAM,EAAE,WAAW,GAAG,OAAO,CAAC,IAAI,CAAC,CAAC;IAC5C;;;;;;;OAOG;IACH,KAAK,CAAC,MAAM,EAAE,WAAW,GAAG,OAAO,CAAC,IAAI,CAAC,CAAC;IAC1C;;;;;;;OAOG;IACH,OAAO,CAAC,MAAM,EAAE,WAAW,GAAG,OAAO,CAAC,OAAO,CAAC,CAAC;CAChD"}
1	+ {"version":3,"file":"i-modal-util.d.ts","sourceRoot":"","sources":["../../../../src/interface/util/i-modal-util/i-modal-util.ts"],"names":[],"mappings":"AAAA;;;;;;;GAOG;AACH,MAAM,WAAW,WAAW;IAC1B;;;;;;OAMG;IACH,KAAK,EAAE,MAAM,CAAC;IACd;;;;;;OAMG;IACH,IAAI,CAAC,EAAE,MAAM,CAAC;IAEd;;;;;OAKG;IACH,iBAAiB,CAAC,EAAE,OAAO,CAAC;IAE5B;;;;;OAKG;IACH,gBAAgB,CAAC,EAAE,OAAO,CAAC;IAE3B;;;;;OAKG;IACH,iBAAiB,CAAC,EAAE,MAAM,CAAC;IAE3B;;;;;OAKG;IACH,gBAAgB,CAAC,EAAE,MAAM,CAAC;IAE1B;;;;;OAKG;IACH,IAAI,CAAC,EAAE,SAAS,GAAG,MAAM,GAAG,SAAS,GAAG,OAAO,CAAC;IAEhD;;;;;;OAMG;IACH,OAAO,CAAC,EAAE,OAAO,CAAC;CACnB;AAED;;;;;;;;GAQG;AACH,MAAM,WAAW,UAAU;IACzB;;;;;;;OAOG;IACH,IAAI,CAAC,MAAM,EAAE,WAAW,GAAG,OAAO,CAAC,IAAI,CAAC,CAAC;IACzC;;;;;;;OAOG;IACH,OAAO,CAAC,MAAM,EAAE,WAAW,GAAG,OAAO,CAAC,IAAI,CAAC,CAAC;IAC5C;;;;;;;OAOG;IACH,OAAO,CAAC,MAAM,EAAE,WAAW,GAAG,OAAO,CAAC,IAAI,CAAC,CAAC;IAC5C;;;;;;;OAOG;IACH,KAAK,CAAC,MAAM,EAAE,WAAW,GAAG,OAAO,CAAC,IAAI,CAAC,CAAC;IAC1C;;;;;;;OAOG;IACH,OAAO,CAAC,MAAM,EAAE,WAAW,GAAG,OAAO,CAAC,OAAO,CAAC,CAAC;CAChD"}

package/out/model/layout/layout.d.ts CHANGED Viewed

@@ -20,7 +20,7 @@ export declare function calcLayoutHeightWidth(layoutPos: ILayoutPos): {
  * @export
  * @param {ILayoutPos} layoutPos
  */
-export declare function calcContentAlignStyle(layoutPos: ILayoutPos): IData;
+export declare function calcContentAlignStyle(layoutPos: ILayoutPos): IData | undefined;
 /**
  * 计算栅格布局参数
  * @author lxm

package/out/model/layout/layout.d.ts.map CHANGED Viewed

	@@ -1 +1 @@
1	- {"version":3,"file":"layout.d.ts","sourceRoot":"","sources":["../../../src/model/layout/layout.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,cAAc,EAAE,UAAU,EAAE,MAAM,kBAAkB,CAAC;AAC9D,OAAO,KAAK,EAAE,eAAe,EAAE,UAAU,EAAE,MAAM,iBAAiB,CAAC;AAGnE;;;;;;;GAOG;AACH,wBAAgB,qBAAqB,CAAC,SAAS,EAAE,UAAU,GAAG;IAC5D,KAAK,EAAE,MAAM,CAAC;IACd,MAAM,EAAE,MAAM,CAAC;CAChB,CA0BA;AAED;;;;;;;GAOG;AACH,wBAAgB,qBAAqB,~~CAAC~~,SAAS,EAAE,UAAU,~~GAAG~~,KAAK,~~CAuClE~~;AAED;;;;;;;GAOG;AACH,wBAAgB,iBAAiB,CAC/B,SAAS,EAAE,cAAc,GACxB,MAAM,CAAC,UAAU,EAAE,eAAe,CAAC,CA+BrC;AAED;;;;;;;;GAQG;AACH,wBAAgB,aAAa,CAAC,UAAU,EAAE,MAAM,EAAE,IAAI,EAAE,KAAK,GAAG,MAAM,EAAE,CAKvE"}
1	+ {"version":3,"file":"layout.d.ts","sourceRoot":"","sources":["../../../src/model/layout/layout.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,cAAc,EAAE,UAAU,EAAE,MAAM,kBAAkB,CAAC;AAC9D,OAAO,KAAK,EAAE,eAAe,EAAE,UAAU,EAAE,MAAM,iBAAiB,CAAC;AAGnE;;;;;;;GAOG;AACH,wBAAgB,qBAAqB,CAAC,SAAS,EAAE,UAAU,GAAG;IAC5D,KAAK,EAAE,MAAM,CAAC;IACd,MAAM,EAAE,MAAM,CAAC;CAChB,CA0BA;AAED;;;;;;;GAOG;AACH,wBAAgB,qBAAqB,CACnC,SAAS,EAAE,UAAU,GACpB,KAAK,GAAG,SAAS,CAuCnB;AAED;;;;;;;GAOG;AACH,wBAAgB,iBAAiB,CAC/B,SAAS,EAAE,cAAc,GACxB,MAAM,CAAC,UAAU,EAAE,eAAe,CAAC,CA+BrC;AAED;;;;;;;;GAQG;AACH,wBAAgB,aAAa,CAAC,UAAU,EAAE,MAAM,EAAE,IAAI,EAAE,KAAK,GAAG,MAAM,EAAE,CAKvE"}

package/out/model/layout/layout.js CHANGED Viewed

@@ -50,10 +50,10 @@ export function calcLayoutHeightWidth(layoutPos) {
  */
 export function calcContentAlignStyle(layoutPos) {
     const { valignSelf, halignSelf } = layoutPos;
-    const result = {};
+    let result;
     // 自身对齐方式
     if (valignSelf || halignSelf) {
-        Object.assign(result, { display: 'flex' });
+        result = { display: 'flex' };
         // 自身垂直对齐模式
         switch (valignSelf) {
             case 'TOP':

package/out/service/dto/method.dto.d.ts CHANGED Viewed

@@ -15,7 +15,6 @@ export declare class MethodDto {
     protected app?: Application;
     protected fields: IAppDEMethodDTOField[];
     protected dtoMap: Map<string, MethodDto>;
-    get isLocalMode(): boolean;
     constructor(entity: IAppDataEntity, dto?: IAppDEMethodDTO | undefined);
     /**
      * 请求参数组合 DTO

package/out/service/dto/method.dto.d.ts.map CHANGED Viewed

	@@ -1 +1 @@
1	- {"version":3,"file":"method.dto.d.ts","sourceRoot":"","sources":["../../../src/service/dto/method.dto.ts"],"names":[],"mappings":"AACA,OAAO,EACL,cAAc,EACd,eAAe,EACf,oBAAoB,EACrB,MAAM,kBAAkB,CAAC;AAE1B,OAAO,EAAE,WAAW,EAAE,MAAM,mBAAmB,CAAC;AAChD,OAAO,EAAE,aAAa,EAAE,MAAM,oCAAoC,CAAC;AAGnE;;;;;;;GAOG;AACH,qBAAa,SAAS;~~IAYlB~~,SAAS,CAAC,MAAM,EAAE,cAAc;IAChC,SAAS,CAAC,GAAG,CAAC;~~IAZhB~~,SAAS,CAAC,GAAG,CAAC,EAAE,WAAW,CAAC;IAE5B,SAAS,CAAC,MAAM,EAAG,oBAAoB,EAAE,CAAC;IAE1C,SAAS,CAAC,MAAM,EAAE,GAAG,CAAC,MAAM,EAAE,SAAS,CAAC,CAAa;~~IAErD~~,~~IAAI,WAAW,IAAI,OAAO,CAEzB;gBAGW,~~MAAM,EAAE,cAAc,EACtB,GAAG,CAAC,6BAAiB;IAUjC;;;;;;;;OAQG;IACG,GAAG,CAAC,OAAO,EAAE,OAAO,EAAE,IAAI,EAAE,KAAK,GAAG,OAAO,CAAC,KAAK,CAAC;IA0CxD;;;;;;;;OAQG;IACG,IAAI,CAAC,OAAO,EAAE,OAAO,EAAE,IAAI,EAAE,KAAK,EAAE,GAAG,OAAO,CAAC,aAAa,EAAE,CAAC;~~IA+BrE~~;;;;;;;;OAQG;cACa,WAAW,CAAC,KAAK,EAAE,oBAAoB,GAAG,OAAO,CAAC,SAAS,CAAC;CAgB7E"}
1	+ {"version":3,"file":"method.dto.d.ts","sourceRoot":"","sources":["../../../src/service/dto/method.dto.ts"],"names":[],"mappings":"AACA,OAAO,EACL,cAAc,EACd,eAAe,EACf,oBAAoB,EACrB,MAAM,kBAAkB,CAAC;AAE1B,OAAO,EAAE,WAAW,EAAE,MAAM,mBAAmB,CAAC;AAChD,OAAO,EAAE,aAAa,EAAE,MAAM,oCAAoC,CAAC;AAGnE;;;;;;;GAOG;AACH,qBAAa,SAAS;IAQlB,SAAS,CAAC,MAAM,EAAE,cAAc;IAChC,SAAS,CAAC,GAAG,CAAC;IARhB,SAAS,CAAC,GAAG,CAAC,EAAE,WAAW,CAAC;IAE5B,SAAS,CAAC,MAAM,EAAG,oBAAoB,EAAE,CAAC;IAE1C,SAAS,CAAC,MAAM,EAAE,GAAG,CAAC,MAAM,EAAE,SAAS,CAAC,CAAa;gBAGzC,MAAM,EAAE,cAAc,EACtB,GAAG,CAAC,6BAAiB;IAUjC;;;;;;;;OAQG;IACG,GAAG,CAAC,OAAO,EAAE,OAAO,EAAE,IAAI,EAAE,KAAK,GAAG,OAAO,CAAC,KAAK,CAAC;IA0CxD;;;;;;;;OAQG;IACG,IAAI,CAAC,OAAO,EAAE,OAAO,EAAE,IAAI,EAAE,KAAK,EAAE,GAAG,OAAO,CAAC,aAAa,EAAE,CAAC;IA6BrE;;;;;;;;OAQG;cACa,WAAW,CAAC,KAAK,EAAE,oBAAoB,GAAG,OAAO,CAAC,SAAS,CAAC;CAgB7E"}

package/out/service/dto/method.dto.js CHANGED Viewed

@@ -10,9 +10,6 @@ import { findModelChild } from '../../model';
  * @class MethodDto
  */
 export class MethodDto {
-    get isLocalMode() {
-        return this.entity.storageMode === 1 || this.entity.storageMode === 4;
-    }
     constructor(entity, dto) {
         this.entity = entity;
         this.dto = dto;
@@ -101,9 +98,7 @@ export class MethodDto {
                 await all[i];
             }
             const entityData = new AppDataEntity(this.entity, datum);
-            if (this.isLocalMode) {
-                await service.local.add(context, entityData);
-            }
+            await service.local.add(context, entityData);
             return entityData;
         }));
     }