@ibiz-template/runtime 0.4.11 → 0.4.13

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

@@ -0,0 +1,45 @@
+import { recursiveIterate } from '@ibiz-template/core';
+import { ControlService } from '../../../../service';
+import { getDefaultValue } from '../../../utils';
+/**
+ * 表单的部件服务
+ * @author lxm
+ * @date 2023-12-13 03:04:57
+ * @export
+ * @class FormService
+ * @extends {ControlService<T>}
+ * @template T
+ */
+export class FormService extends ControlService {
+    /**
+     * 设置表单项的默认值
+     * @author lxm
+     * @date 2023-12-13 03:16:19
+     * @param {IData} data 表单数据
+     * @param {IParams} context 上下文
+     * @param {IParams} params 视图参数
+     * @param {('create' | 'update')} type 新建还是更新
+     */
+    setDefault(data, context, params, type) {
+        // 递归所有的表单项，设置默认值
+        recursiveIterate(this.model, (item) => {
+            if (item.detailType === 'FORMITEM') {
+                const { createDVT, createDV, updateDVT, updateDV, valueFormat } = item;
+                const valueType = type === 'create' ? createDVT : updateDVT;
+                const defaultValue = type === 'create' ? createDV : updateDV;
+                const name = item.id.toLowerCase();
+                const defaultVal = getDefaultValue({
+                    name,
+                    valueType,
+                    defaultValue,
+                    valueFormat,
+                }, { data, context, params });
+                if (defaultVal !== undefined) {
+                    data[name] = defaultVal;
+                }
+            }
+        }, {
+            childrenFields: ['deformPages', 'deformTabPages', 'deformDetails'],
+        });
+    }
+}

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

@@ -1 +1 @@
-{"version":3,"file":"form-detail.controller.d.ts","sourceRoot":"","sources":["../../../../../../src/controller/control/form/form-detail/form-detail/form-detail.controller.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,aAAa,EAAE,MAAM,kBAAkB,CAAC;AACjD,OAAO,EACL,qBAAqB,EACrB,8BAA8B,EAE/B,MAAM,0BAA0B,CAAC;AAGlC,OAAO,EAAE,eAAe,EAAE,MAAM,sBAAsB,CAAC;AACvD,OAAO,EAAE,eAAe,EAAE,MAAM,qBAAqB,CAAC;AACtD,OAAO,EAAE,cAAc,EAAE,MAAM,YAAY,CAAC;AAE5C,qBAAa,oBAAoB,CAAC,CAAC,SAAS,aAAa,GAAG,aAAa,CACvE,YAAW,qBAAqB;IAEhC;;;;;;OAMG;IACH,QAAQ,CAAC,KAAK,EAAE,CAAC,CAAC;IAElB;;;;;;OAMG;IACH,KAAK,EAAE,eAAe,CAAC;IAEvB;;;;;;OAMG;IACH,QAAQ,CAAC,IAAI,EAAE,cAAc,CAAC;IAE9B;;;;;;OAMG;IACH,QAAQ,CAAC,MAAM,CAAC,EAAE,8BAA8B,CAAC;IAEjD;;;;;;OAMG;IACH,IAAI,IAAI,IAAI,KAAK,CAEhB;IAED;;;;;;;OAOG;IACH,IAAI,OAAO,IAAI,QAAQ,CAEtB;IAED;;;;;;OAMG;IACH,IAAI,MAAM,IAAI,OAAO,CAEpB;IAED;;;;;;OAMG;IACH,IAAI,cAAc,IAAI,MAAM,EAAE,CAE7B;IAED;;;;;;OAMG;IACH,IAAI,UAAU,IAAI,MAAM,EAAE,CAEzB;IAED;;;;;OAKG;IACH,SAAS,CAAC,eAAe,EAAE;QACzB,OAAO,CAAC,EAAE,OAAO,CAAC;QAClB,QAAQ,CAAC,EAAE,OAAO,CAAC;QACnB,QAAQ,CAAC,EAAE,OAAO,CAAC;KACpB,CAIC;IAEF;;;;;OAKG;gBAED,KAAK,EAAE,CAAC,EACR,IAAI,EAAE,cAAc,EACpB,MAAM,CAAC,EAAE,8BAA8B;IAQzC;;;;;;OAMG;IACG,IAAI,IAAI,OAAO,CAAC,IAAI,CAAC;cAIX,MAAM,IAAI,OAAO,CAAC,IAAI,CAAC;IAsBvC;;;;;;;OAOG;IACH,SAAS,CAAC,WAAW,IAAI,eAAe;IAIxC;;;;;;OAMG;IACG,gBAAgB,CAAC,KAAK,EAAE,MAAM,EAAE,GAAG,OAAO,CAAC,IAAI,CAAC;IAatD;;;;;OAKG;IACG,eAAe,CAAC,MAAM,EAAE,eAAe,GAAG,OAAO,CAAC,IAAI,CAAC;IAa7D;;;;;;;;;OASG;IACH,SAAS,CAAC,gBAAgB,CAAC,KAAK,EAAE,MAAM,EAAE,EAAE,QAAQ,GAAE,OAAe,GAAG,IAAI;IAmC5E;;;;;;OAMG;IACH,KAAK,CAAC,SAAS,CAAC,EAAE,MAAM,IAAI,GAAG,IAAI;IAKnC;;;;;OAKG;IACH,SAAS,CAAC,aAAa,CAAC,IAAI,EAAE,KAAK,GAAG,IAAI;IAe1C;;;;OAIG;IACH,kBAAkB,CAAC,IAAI,EAAE,KAAK,GAAG,IAAI;IAmBrC;;;;OAIG;IACH,iBAAiB,CAAC,IAAI,EAAE,KAAK,GAAG,IAAI;IAsBpC;;;;OAIG;IACH,kBAAkB,CAAC,IAAI,EAAE,KAAK,GAAG,IAAI;IAsBrC;;;;OAIG;IACG,OAAO,CAAC,KAAK,CAAC,EAAE,UAAU,GAAG,OAAO,CAAC,IAAI,CAAC;CAOjD"}
+{"version":3,"file":"form-detail.controller.d.ts","sourceRoot":"","sources":["../../../../../../src/controller/control/form/form-detail/form-detail/form-detail.controller.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,aAAa,EAAE,MAAM,kBAAkB,CAAC;AACjD,OAAO,EACL,qBAAqB,EACrB,8BAA8B,EAE/B,MAAM,0BAA0B,CAAC;AAGlC,OAAO,EAAE,eAAe,EAAE,MAAM,sBAAsB,CAAC;AACvD,OAAO,EAAE,eAAe,EAAE,MAAM,qBAAqB,CAAC;AACtD,OAAO,EAAE,cAAc,EAAE,MAAM,YAAY,CAAC;AAE5C,qBAAa,oBAAoB,CAAC,CAAC,SAAS,aAAa,GAAG,aAAa,CACvE,YAAW,qBAAqB;IAEhC;;;;;;OAMG;IACH,QAAQ,CAAC,KAAK,EAAE,CAAC,CAAC;IAElB;;;;;;OAMG;IACH,KAAK,EAAE,eAAe,CAAC;IAEvB;;;;;;OAMG;IACH,QAAQ,CAAC,IAAI,EAAE,cAAc,CAAC;IAE9B;;;;;;OAMG;IACH,QAAQ,CAAC,MAAM,CAAC,EAAE,8BAA8B,CAAC;IAEjD;;;;;;OAMG;IACH,IAAI,IAAI,IAAI,KAAK,CAEhB;IAED;;;;;;;OAOG;IACH,IAAI,OAAO,IAAI,QAAQ,CAEtB;IAED;;;;;;OAMG;IACH,IAAI,MAAM,IAAI,OAAO,CAEpB;IAED;;;;;;OAMG;IACH,IAAI,cAAc,IAAI,MAAM,EAAE,CAE7B;IAED;;;;;;OAMG;IACH,IAAI,UAAU,IAAI,MAAM,EAAE,CAEzB;IAED;;;;;OAKG;IACH,SAAS,CAAC,eAAe,EAAE;QACzB,OAAO,CAAC,EAAE,OAAO,CAAC;QAClB,QAAQ,CAAC,EAAE,OAAO,CAAC;QACnB,QAAQ,CAAC,EAAE,OAAO,CAAC;KACpB,CAIC;IAEF;;;;;OAKG;gBAED,KAAK,EAAE,CAAC,EACR,IAAI,EAAE,cAAc,EACpB,MAAM,CAAC,EAAE,8BAA8B;IAQzC;;;;;;OAMG;IACG,IAAI,IAAI,OAAO,CAAC,IAAI,CAAC;cAIX,MAAM,IAAI,OAAO,CAAC,IAAI,CAAC;IA8BvC;;;;;;;OAOG;IACH,SAAS,CAAC,WAAW,IAAI,eAAe;IAIxC;;;;;;OAMG;IACG,gBAAgB,CAAC,KAAK,EAAE,MAAM,EAAE,GAAG,OAAO,CAAC,IAAI,CAAC;IAatD;;;;;OAKG;IACG,eAAe,CAAC,MAAM,EAAE,eAAe,GAAG,OAAO,CAAC,IAAI,CAAC;IAa7D;;;;;;;;;OASG;IACH,SAAS,CAAC,gBAAgB,CAAC,KAAK,EAAE,MAAM,EAAE,EAAE,QAAQ,GAAE,OAAe,GAAG,IAAI;IAmC5E;;;;;;OAMG;IACH,KAAK,CAAC,SAAS,CAAC,EAAE,MAAM,IAAI,GAAG,IAAI;IAKnC;;;;;OAKG;IACH,SAAS,CAAC,aAAa,CAAC,IAAI,EAAE,KAAK,GAAG,IAAI;IAe1C;;;;OAIG;IACH,kBAAkB,CAAC,IAAI,EAAE,KAAK,GAAG,IAAI;IAmBrC;;;;OAIG;IACH,iBAAiB,CAAC,IAAI,EAAE,KAAK,GAAG,IAAI;IAsBpC;;;;OAIG;IACH,kBAAkB,CAAC,IAAI,EAAE,KAAK,GAAG,IAAI;IAsBrC;;;;OAIG;IACG,OAAO,CAAC,KAAK,CAAC,EAAE,UAAU,GAAG,OAAO,CAAC,IAAI,CAAC;CAOjD"}

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

@@ -91,7 +91,7 @@ export class FormDetailController {
     async onInit() {
         this.state.showMoreMode = this.model.showMoreMode;
         // 初始化布局参数
-        const { layoutPos, sysCss, labelSysCss } = this.model;
+        const { layoutPos, sysCss, labelSysCss, capLanguageRes } = this.model;
         // 初始化高宽
         if (layoutPos) {
             const { width, height } = calcLayoutHeightWidth(layoutPos);
@@ -104,6 +104,10 @@ export class FormDetailController {
         if (labelSysCss === null || labelSysCss === void 0 ? void 0 : labelSysCss.cssName) {
             this.state.class.label.push(labelSysCss.cssName);
         }
+        // 初始化多语言
+        if (capLanguageRes && capLanguageRes.lanResTag) {
+            this.model.caption = ibiz.i18n.t(capLanguageRes.lanResTag, this.model.caption);
+        }
     }
     /**
      * 创建表单状态对象

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

@@ -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;AAIjE,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,EAEL,0BAA0B,EAC1B,iBAAiB,EACjB,eAAe,EACf,8BAA8B,EAC/B,MAAM,0BAA0B,CAAC;AAIlC,OAAO,EAAE,eAAe,EAAE,MAAM,sBAAsB,CAAC;AAOvD,qBAAa,kBACX,SAAQ,oBAAoB,CAAC,WAAW,CACxC,YAAW,0BAA0B;IAE7B,KAAK,EAAE,aAAa,CAAC;IAE7B,SAAS,CAAC,WAAW,IAAI,aAAa;IAItC;;;;;;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,EAAE,CAAM;IAEpB;;;;;;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;;;;;;OAMG;IACH,IAAI,YAAY,IAAI,MAAM,GAAG,SAAS,CAMrC;IAED;;;;;;;;OAQG;gBAED,KAAK,EAAE,WAAW,EAClB,IAAI,EAAE,cAAc,EACpB,MAAM,CAAC,EAAE,8BAA8B;IAKzC;;;;;;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;IAsBvC;;;;;;;OAOG;cACa,SAAS,IAAI,OAAO,CAAC,IAAI,CAAC;IAsB1C;;;;;;;OAOG;IACH,cAAc,IAAI,IAAI;IAQhB,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,QAAQ,GAAE,OAAe,GAAG,IAAI;IAO5E;;;;;;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;IAShE;;;;;;OAMG;IACH,eAAe,CAAC,QAAQ,EAAE,OAAO,EAAE,IAAI,GAAE,KAAiB,GAAG,IAAI;IAmBjE;;;;OAIG;IACH,OAAO,CAAC,KAAK,EAAE,UAAU,GAAG,IAAI;IAQhC;;;;OAIG;IACH,MAAM,CAAC,KAAK,EAAE,UAAU,GAAG,IAAI;IAQ/B;;;;OAIG;IACH,OAAO,CAAC,KAAK,EAAE,UAAU,GAAG,IAAI;CAOjC"}
+{"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;AAIjE,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,EAEL,0BAA0B,EAC1B,iBAAiB,EACjB,eAAe,EACf,8BAA8B,EAC/B,MAAM,0BAA0B,CAAC;AAIlC,OAAO,EAAE,eAAe,EAAE,MAAM,sBAAsB,CAAC;AAOvD,qBAAa,kBACX,SAAQ,oBAAoB,CAAC,WAAW,CACxC,YAAW,0BAA0B;IAE7B,KAAK,EAAE,aAAa,CAAC;IAE7B,SAAS,CAAC,WAAW,IAAI,aAAa;IAItC;;;;;;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,EAAE,CAAM;IAEpB;;;;;;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;;;;;;OAMG;IACH,IAAI,YAAY,IAAI,MAAM,GAAG,SAAS,CAMrC;IAED;;;;;;;;OAQG;gBAED,KAAK,EAAE,WAAW,EAClB,IAAI,EAAE,cAAc,EACpB,MAAM,CAAC,EAAE,8BAA8B;IAKzC;;;;;;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;IAsBvC;;;;;;;OAOG;cACa,SAAS,IAAI,OAAO,CAAC,IAAI,CAAC;IAsB1C;;;;;;;OAOG;IACH,cAAc,IAAI,IAAI;IAQhB,gBAAgB,CAAC,IAAI,EAAE,MAAM,EAAE,GAAG,OAAO,CAAC,IAAI,CAAC;IA8B/C,eAAe,CAAC,KAAK,EAAE,eAAe,GAAG,OAAO,CAAC,IAAI,CAAC;IAO5D,SAAS,CAAC,gBAAgB,CAAC,KAAK,EAAE,MAAM,EAAE,EAAE,QAAQ,GAAE,OAAe,GAAG,IAAI;IAO5E;;;;;;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;IAShE;;;;;;OAMG;IACH,eAAe,CAAC,QAAQ,EAAE,OAAO,EAAE,IAAI,GAAE,KAAiB,GAAG,IAAI;IAmBjE;;;;OAIG;IACH,OAAO,CAAC,KAAK,EAAE,UAAU,GAAG,IAAI;IAQhC;;;;OAIG;IACH,MAAM,CAAC,KAAK,EAAE,UAAU,GAAG,IAAI;IAQ/B;;;;OAIG;IACH,OAAO,CAAC,KAAK,EAAE,UAAU,GAAG,IAAI;CAOjC"}

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

@@ -6,7 +6,6 @@ import { FormDetailEventName, } from '../../../../../interface';
 import { getEditorProvider } from '../../../../../register';
 import { Srfuf } from '../../../../../service';
 import { filterValueRules } from '../../../../../utils';
-import { FormNotifyState } from '../../../../constant';
 import { generateEditorRules, generateRules, getDefaultValue, } from '../../../../utils';
 export class FormItemController extends FormDetailController {
     createState() {
@@ -203,10 +202,6 @@ export class FormItemController extends FormDetailController {
         super.formStateNotify(state);
         // 计算启用条件
         this.calcEnableCond();
-        // 触发默认值
-        if (state === FormNotifyState.LOAD) {
-            this.setDefaultValue(false);
-        }
     }
     calcDynamicLogic(names, mustCalc = false) {
         // 隐藏表单项不计算动态逻辑

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

@@ -1 +1 @@
-{"version":3,"file":"search-form.controller.d.ts","sourceRoot":"","sources":["../../../../../src/controller/control/form/search-form/search-form.controller.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,aAAa,EAAE,MAAM,kBAAkB,CAAC;AACjD,OAAO,EACL,qBAAqB,EACrB,gBAAgB,EAChB,gBAAgB,EACjB,MAAM,uBAAuB,CAAC;AAE/B,OAAO,EAAE,cAAc,EAAE,MAAM,yBAAyB,CAAC;AACzD,OAAO,EAAE,iBAAiB,EAAE,MAAM,uBAAuB,CAAC;AAC1D,OAAO,EAAE,aAAa,EAAE,MAAM,qBAAqB,CAAC;AAEpD;;;;;;;;;GASG;AACH,qBAAa,oBACX,SAAQ,cAAc,CAAC,aAAa,EAAE,gBAAgB,EAAE,gBAAgB,CACxE,YAAW,qBAAqB;IAEhC;;;;;;OAMG;IACH,OAAO,EAAG,iBAAiB,CAAC;IAE5B;;;;;OAKG;IACH,MAAM,EAAG,aAAa,CAAC;IAEvB,SAAS,CAAC,SAAS,IAAI,IAAI;cAKX,SAAS,IAAI,OAAO,CAAC,IAAI,CAAC;IAqB1C;;;;;;OAMG;IACG,IAAI,IAAI,OAAO,CAAC,KAAK,CAAC;IAwB5B;;;;;;OAMG;IACH,eAAe,IAAI,OAAO;IAY1B;;;;;OAKG;IACG,MAAM,IAAI,OAAO,CAAC,IAAI,CAAC;IAI7B;;;;;OAKG;IACG,mBAAmB,IAAI,OAAO,CAAC,IAAI,CAAC;IAI1C;;;;;OAKG;IACG,KAAK,IAAI,OAAO,CAAC,IAAI,CAAC;IAK5B;;;;;;OAMG;IACG,gBAAgB,CAAC,KAAK,EAAE,MAAM,EAAE,GAAG,OAAO,CAAC,IAAI,CAAC;IAOtD;;;;;;OAMG;IACG,OAAO,CAAC,KAAK,EAAE,aAAa,GAAG,OAAO,CAAC,IAAI,CAAC;IAQlD;;;;;;;OAOG;IACH,SAAS,CAAC,qBAAqB,IAAI,IAAI;IAuDvC;;;;;OAKG;IACG,UAAU,IAAI,OAAO,CAAC,IAAI,CAAC;IAOjC;;;;;OAKG;IACG,UAAU,IAAI,OAAO,CAAC,IAAI,CAAC;IAMjC;;;;;;OAMG;IACG,WAAW,CAAC,IAAI,EAAE,MAAM,GAAG,OAAO,CAAC,IAAI,CAAC;IAS9C;;;;;OAKG;IACH,iBAAiB,CAAC,KAAK,EAAE,MAAM,GAAG,IAAI;IAYtC;;;;;OAKG;IACG,kBAAkB,CAAC,KAAK,EAAE,MAAM,GAAG,OAAO,CAAC,IAAI,CAAC;CAQvD"}
+{"version":3,"file":"search-form.controller.d.ts","sourceRoot":"","sources":["../../../../../src/controller/control/form/search-form/search-form.controller.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,aAAa,EAAE,MAAM,kBAAkB,CAAC;AACjD,OAAO,EACL,qBAAqB,EACrB,gBAAgB,EAChB,gBAAgB,EACjB,MAAM,uBAAuB,CAAC;AAE/B,OAAO,EAAE,cAAc,EAAE,MAAM,yBAAyB,CAAC;AACzD,OAAO,EAAE,iBAAiB,EAAE,MAAM,uBAAuB,CAAC;AAC1D,OAAO,EAAE,aAAa,EAAE,MAAM,qBAAqB,CAAC;AAEpD;;;;;;;;;GASG;AACH,qBAAa,oBACX,SAAQ,cAAc,CAAC,aAAa,EAAE,gBAAgB,EAAE,gBAAgB,CACxE,YAAW,qBAAqB;IAEhC;;;;;;OAMG;IACH,OAAO,EAAG,iBAAiB,CAAC;IAE5B;;;;;OAKG;IACH,MAAM,EAAG,aAAa,CAAC;IAEvB,SAAS,CAAC,SAAS,IAAI,IAAI;cAKX,SAAS,IAAI,OAAO,CAAC,IAAI,CAAC;IAqB1C;;;;;;OAMG;IACG,IAAI,IAAI,OAAO,CAAC,KAAK,CAAC;IAoB5B;;;;;;OAMG;IACH,eAAe,IAAI,OAAO;IAY1B;;;;;OAKG;IACG,MAAM,IAAI,OAAO,CAAC,IAAI,CAAC;IAI7B;;;;;OAKG;IACG,mBAAmB,IAAI,OAAO,CAAC,IAAI,CAAC;IAI1C;;;;;OAKG;IACG,KAAK,IAAI,OAAO,CAAC,IAAI,CAAC;IAK5B;;;;;;OAMG;IACG,gBAAgB,CAAC,KAAK,EAAE,MAAM,EAAE,GAAG,OAAO,CAAC,IAAI,CAAC;IAOtD;;;;;;OAMG;IACG,OAAO,CAAC,KAAK,EAAE,aAAa,GAAG,OAAO,CAAC,IAAI,CAAC;IAQlD;;;;;;;OAOG;IACH,SAAS,CAAC,qBAAqB,IAAI,IAAI;IAuDvC;;;;;OAKG;IACG,UAAU,IAAI,OAAO,CAAC,IAAI,CAAC;IAOjC;;;;;OAKG;IACG,UAAU,IAAI,OAAO,CAAC,IAAI,CAAC;IAMjC;;;;;;OAMG;IACG,WAAW,CAAC,IAAI,EAAE,MAAM,GAAG,OAAO,CAAC,IAAI,CAAC;IAS9C;;;;;OAKG;IACH,iBAAiB,CAAC,KAAK,EAAE,MAAM,GAAG,IAAI;IAYtC;;;;;OAKG;IACG,kBAAkB,CAAC,KAAK,EAAE,MAAM,GAAG,OAAO,CAAC,IAAI,CAAC;CAQvD"}

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

@@ -1,4 +1,4 @@
-import { RuntimeError, mergeDefaultInLeft } from '@ibiz-template/core';
+import { RuntimeError } from '@ibiz-template/core';
 import { FormNotifyState } from '../../../constant';
 import { FormController } from '../form/form.controller';
 import { SearchFormService } from './search-form.service';
@@ -39,9 +39,6 @@ export class SearchFormController extends FormController {
      */
     async load() {
         const queryParams = Object.assign({}, this.params);
-        // 新建默认值给到graft接口，接口会回来
-        const params = await this.getDraftParams();
-        Object.assign(queryParams, params);
         await this.evt.emit('onBeforeLoadDraft', { params: queryParams });
         let res;
         try {
@@ -54,7 +51,6 @@ export class SearchFormController extends FormController {
             throw error;
         }
         this.state.data = res.data;
-        mergeDefaultInLeft(this.data, params);
         this.state.isLoaded = true;
         this.formStateNotify(FormNotifyState.DRAFT);
         this.actionNotification('GETDRAFTSUCCESS');

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

@@ -1,6 +1,7 @@
 import { IHttpResponse } from '@ibiz-template/core';
 import { IDESearchForm } from '@ibiz/model-core';
-import { ControlService, ControlVO } from '../../../../service';
+import { ControlVO } from '../../../../service';
+import { FormService } from '../form/form.service';
 /**
  * 搜索表单服务
  *
@@ -11,7 +12,7 @@ import { ControlService, ControlVO } from '../../../../service';
  * @extends {ControlService<T>}
  * @template T
  */
-export declare class SearchFormService<T extends IDESearchForm = IDESearchForm> extends ControlService<T> {
+export declare class SearchFormService<T extends IDESearchForm = IDESearchForm> extends FormService<T> {
     /**
      * 执行获取草稿方法
      *
@@ -21,7 +22,7 @@ export declare class SearchFormService<T extends IDESearchForm = IDESearchForm>
      * @param {IParams} [params={}] 视图参数
      * @returns {*}  {Promise<IHttpResponse>}
      */
-    getDraft(_context: IParams, params?: IParams): Promise<IHttpResponse<ControlVO>>;
+    getDraft(context: IParams, params?: IParams): Promise<IHttpResponse<ControlVO>>;
     /**
      * 初始化属性映射
      *

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;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"}
+{"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,SAAS,EAAc,MAAM,qBAAqB,CAAC;AAC5D,OAAO,EAAE,WAAW,EAAE,MAAM,sBAAsB,CAAC;AAEnD;;;;;;;;;GASG;AACH,qBAAa,iBAAiB,CAC5B,CAAC,SAAS,aAAa,GAAG,aAAa,CACvC,SAAQ,WAAW,CAAC,CAAC,CAAC;IACtB;;;;;;;;OAQG;IACG,QAAQ,CACZ,OAAO,EAAE,OAAO,EAChB,MAAM,GAAE,OAAY,GACnB,OAAO,CAAC,aAAa,CAAC,SAAS,CAAC,CAAC;IAWpC;;;;;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

@@ -1,5 +1,6 @@
 import { recursiveIterate } from '@ibiz-template/core';
-import { ControlService, UIMapField } from '../../../../service';
+import { UIMapField } from '../../../../service';
+import { FormService } from '../form/form.service';
 /**
  * 搜索表单服务
  *
@@ -10,7 +11,7 @@ import { ControlService, UIMapField } from '../../../../service';
  * @extends {ControlService<T>}
  * @template T
  */
-export class SearchFormService extends ControlService {
+export class SearchFormService extends FormService {
     /**
      * 执行获取草稿方法
      *
@@ -20,10 +21,14 @@ export class SearchFormService extends ControlService {
      * @param {IParams} [params={}] 视图参数
      * @returns {*}  {Promise<IHttpResponse>}
      */
-    async getDraft(_context, params = {}) {
+    async getDraft(context, params = {}) {
         const tempData = this.getFilteredData(Object.assign({}, params));
         let res = { ok: true, status: 200, data: tempData };
         res = this.handleResponse(res);
+        // 设置默认值
+        if (res.ok && res.data) {
+            this.setDefault(res.data, context, params, 'create');
+        }
         return res;
     }
     /**

package/out/controller/control/gantt/gantt.controller.d.ts

@@ -1,8 +1,9 @@
-import { IDEGantt } from '@ibiz/model-core';
-import { IGanttController, IGanttEvent, IGanttNodeData, IGanttState, MDCtrlLoadParams } from '../../../interface';
+import { IDEGantt, IDETreeColumn, IDETreeNode } from '@ibiz/model-core';
+import { IGanttController, IGanttEvent, IGanttNodeData, IGanttState, IGridColumnProvider, MDCtrlLoadParams } from '../../../interface';
 import { MDControlController } from '../../common';
 import { GanttService } from './gantt.service';
 import { ContextMenuController } from '../context-menu';
+import { GridColumnController, GridFieldColumnController, GridUAColumnController } from '../grid';
 /**
  * 甘特图控制器
  *
@@ -15,6 +16,42 @@ import { ContextMenuController } from '../context-menu';
  */
 export declare class GanttController extends MDControlController<IDEGantt, IGanttState, IGanttEvent> implements IGanttController {
     service: GanttService;
+    /**
+     * 表格列适配器
+     *
+     * @type {{ [key: string]: IGridColumnProvider }}
+     * @memberof GanttController
+     */
+    providers: {
+        [key: string]: IGridColumnProvider;
+    };
+    /**
+     * 所有表格列控制器集合
+     *
+     * @type {{ [key: string]: GridColumnController }}
+     * @memberof GanttController
+     */
+    columns: {
+        [key: string]: GridColumnController;
+    };
+    /**
+     * 所有表格属性列的控制器
+     *
+     * @type {{ [key: string]: GridFieldColumnController }}
+     * @memberof GanttController
+     */
+    fieldColumns: {
+        [key: string]: GridFieldColumnController;
+    };
+    /**
+     * 所有表格操作列的控制器
+     *
+     * @type {{ [key: string]: GridUAColumnController }}
+     * @memberof GanttController
+     */
+    uaColumns: {
+        [key: string]: GridUAColumnController;
+    };
     /**
      * 上下文菜单控制器
      *
@@ -42,6 +79,37 @@ export declare class GanttController extends MDControlController<IDEGantt, IGant
      */
     protected initState(): void;
     protected onCreated(): Promise<void>;
+    /**
+     * 初始化表格列
+     *
+     * @protected
+     * @return {*}  {Promise<void>}
+     * @memberof GanttController
+     */
+    protected initGridColumns(): Promise<void>;
+    /**
+     * 初始化表格属性列，操作列，编辑项控制器
+     *
+     * @protected
+     * @param {IDETreeColumn} column
+     * @return {*}  {Promise<void>}
+     * @memberof GanttController
+     */
+    protected initColumnsController(column: IDETreeColumn): Promise<void>;
+    /**
+     * 初始化表格列状态
+     *
+     * @protected
+     * @memberof GanttController
+     */
+    protected initColumnStates(): void;
+    /**
+     * 计算列的固定状态
+     *
+     * @protected
+     * @memberof GanttController
+     */
+    protected calcColumnFixed(): void;
     /**
      * 加载
      *
@@ -51,6 +119,14 @@ export declare class GanttController extends MDControlController<IDEGantt, IGant
      * @return {*}  {Promise<IGanttNodeData[]>}
      */
     load(args?: MDCtrlLoadParams): Promise<IGanttNodeData[]>;
+    /**
+     * 获取节点模型
+     *
+     * @param {string} id
+     * @return {*}  {(IDETreeNode | undefined)}
+     * @memberof GanttController
+     */
+    getNodeModel(id: string): IDETreeNode | undefined;
     /**
      * 获取查询参数
      *
@@ -69,5 +145,73 @@ export declare class GanttController extends MDControlController<IDEGantt, IGant
      * @return {*}  {Promise<IGanttNodeData[]>}
      */
     loadNodes(parentNode?: IGanttNodeData): Promise<IGanttNodeData[]>;
+    /**
+     * 甘特节点点击事件
+     *
+     * @param {IGanttNodeData} nodeData
+     * @return {*}  {Promise<void>}
+     * @memberof GanttController
+     */
+    onGanttNodeClick(nodeData: IGanttNodeData): Promise<void>;
+    /**
+     * 甘特节点双击事件
+     *
+     * @param {IGanttNodeData} nodeData
+     * @return {*}  {Promise<void>}
+     * @memberof GanttController
+     */
+    onDbGanttNodeClick(nodeData: IGanttNodeData): Promise<void>;
+    /**
+     * 设置激活
+     *
+     * @param {IGanttNodeData} item
+     * @return {*}  {Promise<void>}
+     * @memberof GanttController
+     */
+    setActive(item: IGanttNodeData): Promise<void>;
+    /**
+     * 设置选中
+     *
+     * @param {IData[]} selection
+     * @memberof GanttController
+     */
+    setSelection(selection: IData[]): void;
+    /**
+     * 执行界面行为
+     *
+     * @param {string} uiActionId
+     * @param {IGanttNodeData} nodeData
+     * @param {MouseEvent} event
+     * @param {string} appId
+     * @return {*}  {Promise<void>}
+     * @memberof GanttController
+     */
+    doUIAction(uiActionId: string, nodeData: IGanttNodeData, event: MouseEvent, appId: string): Promise<void>;
+    /**
+     * 解析甘特节点获取通用数据，和完整的上下文和视图参数。
+     *
+     * @protected
+     * @param {IGanttNodeData} nodeData
+     * @return {*}  {{
+     *     data: IData[];
+     *     context: IContext;
+     *     params: IParams;
+     *   }}
+     * @memberof GanttController
+     */
+    protected parseGanttNodeData(nodeData: IGanttNodeData): {
+        data: IData[];
+        context: IContext;
+        params: IParams;
+    };
+    /**
+     * 刷新指定树节点的子节点数据
+     *
+     * @param {(IGanttNodeData | IData)} nodeData 指定树节点数据，可以是节点数据，也可以是对应的实体数据
+     * @param {boolean} [refreshParent=false] 是否是刷新给定节点数据的父节点的子节点数据
+     * @return {*}  {Promise<void>}
+     * @memberof GanttController
+     */
+    refreshNodeChildren(nodeData: IGanttNodeData | IData, refreshParent?: boolean): Promise<void>;
 }
 //# sourceMappingURL=gantt.controller.d.ts.map

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

@@ -1 +1 @@
-{"version":3,"file":"gantt.controller.d.ts","sourceRoot":"","sources":["../../../../src/controller/control/gantt/gantt.controller.ts"],"names":[],"mappings":"AAEA,OAAO,EAAE,QAAQ,EAAE,MAAM,kBAAkB,CAAC;AAC5C,OAAO,EACL,gBAAgB,EAChB,WAAW,EACX,cAAc,EACd,WAAW,EACX,gBAAgB,EACjB,MAAM,oBAAoB,CAAC;AAC5B,OAAO,EAAE,mBAAmB,EAAE,MAAM,cAAc,CAAC;AACnD,OAAO,EAAE,YAAY,EAAE,MAAM,iBAAiB,CAAC;AAC/C,OAAO,EAAE,qBAAqB,EAAE,MAAM,iBAAiB,CAAC;AAExD;;;;;;;;;GASG;AACH,qBAAa,eACX,SAAQ,mBAAmB,CAAC,QAAQ,EAAE,WAAW,EAAE,WAAW,CAC9D,YAAW,gBAAgB;IAEnB,OAAO,EAAE,YAAY,CAAC;IAE9B;;;;;;OAMG;IACH,YAAY,EAAE;QAAE,CAAC,CAAC,EAAE,MAAM,GAAG,qBAAqB,CAAA;KAAE,CAAM;IAE1D;;;;;;OAMG;IACH,iBAAiB,EAAE,OAAO,CAAS;IAEnC;;;;;;OAMG;IACH,SAAS,CAAC,SAAS,IAAI,IAAI;cAMX,SAAS,IAAI,OAAO,CAAC,IAAI,CAAC;IAoD1C;;;;;;;OAOG;IACG,IAAI,CAAC,IAAI,GAAE,gBAAqB,GAAG,OAAO,CAAC,cAAc,EAAE,CAAC;IAsBlE;;;;;;;OAOG;IACG,cAAc,CAAC,WAAW,CAAC,EAAE,OAAO,GAAG,OAAO,CAAC,OAAO,CAAC;IAQ7D;;;;;;;OAOG;IACG,SAAS,CAAC,UAAU,CAAC,EAAE,cAAc,GAAG,OAAO,CAAC,cAAc,EAAE,CAAC;CAqCxE"}
+{"version":3,"file":"gantt.controller.d.ts","sourceRoot":"","sources":["../../../../src/controller/control/gantt/gantt.controller.ts"],"names":[],"mappings":"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"}