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

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

@@ -1,5 +1,6 @@
 import { IControlProvider, IMDControlController } from '../../../../../interface';
 import { FormMDCtrlController } from './form-mdctrl.controller';
+import { FormNotifyState } from '../../../../constant';
 /**
  * 表单多数据部件(引用实体多数据部件模型)控制器
  * 类型是列表，卡片，表格时
@@ -26,6 +27,14 @@ export declare class FormMDCtrlMDController extends FormMDCtrlController {
      * @type {IMDControlController}
      */
     mdController: IMDControlController;
+    /**
+     * 表单项名称
+     *
+     * @author lxm
+     * @date 2022-09-04 18:09:32
+     * @readonly
+     */
+    get name(): string;
     protected onInit(): Promise<void>;
     /**
      * 设置多数据部件控制器
@@ -34,6 +43,7 @@ export declare class FormMDCtrlMDController extends FormMDCtrlController {
      * @param {IMDControlController} controller
      */
     setMDControl(controller: IMDControlController): void;
+    updateFormItem(): Promise<void>;
     /**
      * 删除多数据选中的数据
      * @author lxm
@@ -47,6 +57,13 @@ export declare class FormMDCtrlMDController extends FormMDCtrlController {
      */
     create(): void;
     refresh(): void;
+    /**
+     * 表单状态变更通知
+     *
+     * @author lxm
+     * @date 2022-09-20 18:09:07
+     */
+    formStateNotify(state: FormNotifyState): Promise<void>;
     dataChangeNotify(names: string[]): Promise<void>;
 }
 //# sourceMappingURL=form-mdctrl-md.controller.d.ts.map

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

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

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

@@ -12,6 +12,16 @@ import { FormMDCtrlController } from './form-mdctrl.controller';
  * @extends {FormDetailController<IDEFormMDCtrl>}
  */
 export class FormMDCtrlMDController extends FormMDCtrlController {
+    /**
+     * 表单项名称
+     *
+     * @author lxm
+     * @date 2022-09-04 18:09:32
+     * @readonly
+     */
+    get name() {
+        return this.model.id;
+    }
     async onInit() {
         await super.onInit();
         const { contentControl } = this.model;
@@ -46,6 +56,11 @@ export class FormMDCtrlMDController extends FormMDCtrlController {
             this.updateFormItem();
         });
     }
+    updateFormItem() {
+        const items = this.mdController.state.items || [];
+        this.data[this.name] = items;
+        return super.updateFormItem();
+    }
     /**
      * 删除多数据选中的数据
      * @author lxm
@@ -68,7 +83,22 @@ export class FormMDCtrlMDController extends FormMDCtrlController {
         }
     }
     refresh() {
-        this.mdController.refresh();
+        if (this.mdController) {
+            this.mdController.refresh();
+        }
+        else {
+            ibiz.log.debug('mdController不存在');
+        }
+    }
+    /**
+     * 表单状态变更通知
+     *
+     * @author lxm
+     * @date 2022-09-20 18:09:07
+     */
+    async formStateNotify(state) {
+        await super.formStateNotify(state);
+        this.refresh();
     }
     async dataChangeNotify(names) {
         await super.dataChangeNotify(names);

package/out/controller/utils/data-file-util/data-file-util.js

@@ -101,9 +101,9 @@ export async function exportData(header, data, fileName) {
     }
     try {
         exportExcel.exportJsonToExcel({
-            header,
-            data,
-            filename: fileName,
+            header, // 表头内容 数组格式
+            data, // 具体数据 这是个二维数组
+            filename: fileName, // 文件名称
             autoWidth: true, // 单元格是否自适应
         });
         return { ok: true };

package/out/ui-action/provider/front-ui-action-provider.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"front-ui-action-provider.d.ts","sourceRoot":"","sources":["../../../src/ui-action/provider/front-ui-action-provider.ts"],"names":[],"mappings":"AAMA,OAAO,EAAE,cAAc,EAAa,MAAM,kBAAkB,CAAC;AAE7D,OAAO,EAAE,cAAc,EAAE,eAAe,EAAc,MAAM,iBAAiB,CAAC;AAE9E,OAAO,EAAE,oBAAoB,EAAE,MAAM,2BAA2B,CAAC;AAEjE;;;;;;;;GAQG;AACH,qBAAa,qBAAsB,SAAQ,oBAAoB;IACvD,UAAU,CACd,MAAM,EAAE,cAAc,EACtB,IAAI,EAAE,cAAc,GACnB,OAAO,CAAC,eAAe,CAAC;IA+D3B;;;;;;;;OAQG;IAEH,SAAS,CAAC,OAAO,CACf,MAAM,EAAE,cAAc,EACtB,IAAI,EAAE,cAAc,GACnB,eAAe;IAalB;;;;;;OAMG;cACa,YAAY,CAC1B,MAAM,EAAE,cAAc,EACtB,IAAI,EAAE,cAAc,GACnB,OAAO,CAAC,IAAI,CAAC;IA4ChB;;;;;;OAMG;cACa,iBAAiB,CAC/B,MAAM,EAAE,cAAc,EACtB,KAAK,EAAE,cAAc,GACpB,OAAO,CAAC,eAAe,CAAC;IA8B3B;;;;;;OAMG;cACa,iBAAiB,CAC/B,MAAM,EAAE,cAAc,EACtB,IAAI,EAAE,cAAc,GACnB,OAAO,CAAC,IAAI,CAAC;CAoDjB"}
+{"version":3,"file":"front-ui-action-provider.d.ts","sourceRoot":"","sources":["../../../src/ui-action/provider/front-ui-action-provider.ts"],"names":[],"mappings":"AAMA,OAAO,EAAE,cAAc,EAAa,MAAM,kBAAkB,CAAC;AAE7D,OAAO,EAAE,cAAc,EAAE,eAAe,EAAc,MAAM,iBAAiB,CAAC;AAE9E,OAAO,EAAE,oBAAoB,EAAE,MAAM,2BAA2B,CAAC;AAEjE;;;;;;;;GAQG;AACH,qBAAa,qBAAsB,SAAQ,oBAAoB;IACvD,UAAU,CACd,MAAM,EAAE,cAAc,EACtB,IAAI,EAAE,cAAc,GACnB,OAAO,CAAC,eAAe,CAAC;IA+D3B;;;;;;;;OAQG;IAEH,SAAS,CAAC,OAAO,CACf,MAAM,EAAE,cAAc,EACtB,IAAI,EAAE,cAAc,GACnB,eAAe;IAalB;;;;;;OAMG;cACa,YAAY,CAC1B,MAAM,EAAE,cAAc,EACtB,IAAI,EAAE,cAAc,GACnB,OAAO,CAAC,IAAI,CAAC;IAgEhB;;;;;;OAMG;cACa,iBAAiB,CAC/B,MAAM,EAAE,cAAc,EACtB,KAAK,EAAE,cAAc,GACpB,OAAO,CAAC,eAAe,CAAC;IA8B3B;;;;;;OAMG;cACa,iBAAiB,CAC/B,MAAM,EAAE,cAAc,EACtB,IAAI,EAAE,cAAc,GACnB,OAAO,CAAC,IAAI,CAAC;CAoDjB"}

package/out/ui-action/provider/front-ui-action-provider.js

@@ -85,19 +85,19 @@ export class FrontUIActionProvider extends UIActionProviderBase {
      * @return {*}
      */
     async executePrint(action, args) {
-        var _a, _b;
+        var _a, _b, _c;
         // 处理参数
-        const { resultParams } = await this.handleParams(action, args.context, args.data, args.params);
+        const { resultContext, resultParams } = await this.handleParams(action, args.context, args.data, args.params);
         const appDataEntity = await ibiz.hub.getAppDataEntity(action.appDataEntityId);
         const appDEPrint = (_a = appDataEntity.appDEPrints) === null || _a === void 0 ? void 0 : _a.find(print => {
             return print.id === action.appDEPrintId;
         });
         if (appDEPrint) {
             let requestUrl = '';
-            const { context } = args;
-            if (context && context[appDataEntity.codeName.toLowerCase()]) {
+            if (resultContext &&
+                resultContext[appDataEntity.codeName.toLowerCase()]) {
                 // TODO 临时写死printdata， 非标准，后续优化
-                requestUrl += `/${(_b = appDataEntity.codeName2) === null || _b === void 0 ? void 0 : _b.toLowerCase()}/printdata/${context[appDataEntity.codeName.toLowerCase()]}`;
+                requestUrl += `/${(_b = appDataEntity.codeName2) === null || _b === void 0 ? void 0 : _b.toLowerCase()}/printdata/${resultContext[appDataEntity.codeName.toLowerCase()]}`;
             }
             else {
                 throw new RuntimeError('没有找到数据主键');
@@ -108,8 +108,26 @@ export class FrontUIActionProvider extends UIActionProviderBase {
                 params: Object.assign({ srfprinttag: appDEPrint.codeName }, resultParams),
             });
             if (res.ok) {
-                const link = window.URL.createObjectURL(res.data);
-                window.open(link, '_blank');
+                // 存在srfcontenttype参数需响应文件
+                if (resultParams && resultParams.srfcontenttype) {
+                    // 获取文件
+                    const disposition = res.headers['content-disposition'];
+                    const filename = (_c = disposition
+                        .split(';')
+                        .find((str) => str.indexOf('filename=') !== -1)) === null || _c === void 0 ? void 0 : _c.slice(9);
+                    const href = URL.createObjectURL(res.data);
+                    const a = document.createElement('a');
+                    a.href = href;
+                    a.download = filename;
+                    document.body.appendChild(a);
+                    a.click();
+                    document.body.removeChild(a);
+                    URL.revokeObjectURL(href);
+                }
+                else {
+                    const link = window.URL.createObjectURL(res.data);
+                    window.open(link, '_blank');
+                }
             }
             else {
                 throw new RuntimeError('打印失败');

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@ibiz-template/runtime",
-  "version": "0.4.1-dev.0",
+  "version": "0.4.2",
   "description": "控制器包",
   "type": "module",
   "main": "out/index.js",
@@ -46,7 +46,7 @@
     "ramda": "^0.29.1"
   },
   "peerDependencies": {
-    "@ibiz-template/core": "^0.3.0",
+    "@ibiz-template/core": "^0.4.0",
     "@ibiz/model-core": "^0.0.21",
     "async-validator": "^4.2.5",
     "dayjs": "^1.11.7",
@@ -59,5 +59,5 @@
     "qx-util": "^0.4.8",
     "ramda": "^0.29.0"
   },
-  "gitHead": "4097fde2afcc68a383bbd1369f226bee8fb7a510"
+  "gitHead": "67c43e4d05bb716942928870c29d0ab87b2d1561"
 }

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

@@ -10,6 +10,7 @@ import {
 } from '../../../../../interface';
 import { getControlProvider } from '../../../../../register';
 import { FormMDCtrlController } from './form-mdctrl.controller';
+import { FormNotifyState } from '../../../../constant';
 
 /**
  * 表单多数据部件(引用实体多数据部件模型)控制器
@@ -39,6 +40,17 @@ export class FormMDCtrlMDController extends FormMDCtrlController {
    */
   mdController!: IMDControlController;
 
+  /**
+   * 表单项名称
+   *
+   * @author lxm
+   * @date 2022-09-04 18:09:32
+   * @readonly
+   */
+  get name(): string {
+    return this.model.id!;
+  }
+
   protected async onInit(): Promise<void> {
     await super.onInit();
     const { contentControl } = this.model;
@@ -78,6 +90,12 @@ export class FormMDCtrlMDController extends FormMDCtrlController {
     });
   }
 
+  updateFormItem(): Promise<void> {
+    const items = this.mdController.state.items || [];
+    this.data[this.name] = items;
+    return super.updateFormItem();
+  }
+
   /**
    * 删除多数据选中的数据
    * @author lxm
@@ -104,7 +122,22 @@ export class FormMDCtrlMDController extends FormMDCtrlController {
   }
 
   refresh(): void {
-    this.mdController.refresh();
+    if (this.mdController) {
+      this.mdController.refresh();
+    } else {
+      ibiz.log.debug('mdController不存在');
+    }
+  }
+
+  /**
+   * 表单状态变更通知
+   *
+   * @author lxm
+   * @date 2022-09-20 18:09:07
+   */
+  async formStateNotify(state: FormNotifyState): Promise<void> {
+    await super.formStateNotify(state);
+    this.refresh();
   }
 
   async dataChangeNotify(names: string[]): Promise<void> {

package/src/ui-action/provider/front-ui-action-provider.ts

@@ -124,7 +124,7 @@ export class FrontUIActionProvider extends UIActionProviderBase {
     args: IUILogicParams,
   ): Promise<void> {
     // 处理参数
-    const { resultParams } = await this.handleParams(
+    const { resultContext, resultParams } = await this.handleParams(
       action,
       args.context,
       args.data,
@@ -138,11 +138,13 @@ export class FrontUIActionProvider extends UIActionProviderBase {
     });
     if (appDEPrint) {
       let requestUrl: string = '';
-      const { context } = args;
-      if (context && context[appDataEntity.codeName!.toLowerCase()]) {
+      if (
+        resultContext &&
+        resultContext[appDataEntity.codeName!.toLowerCase()]
+      ) {
         // TODO 临时写死printdata， 非标准，后续优化
         requestUrl += `/${appDataEntity.codeName2?.toLowerCase()}/printdata/${
-          context[appDataEntity.codeName!.toLowerCase()]
+          resultContext[appDataEntity.codeName!.toLowerCase()]
         }`;
       } else {
         throw new RuntimeError('没有找到数据主键');
@@ -156,8 +158,26 @@ export class FrontUIActionProvider extends UIActionProviderBase {
         },
       });
       if (res.ok) {
-        const link = window.URL.createObjectURL(res.data as Blob);
-        window.open(link, '_blank');
+        // 存在srfcontenttype参数需响应文件
+        if (resultParams && resultParams.srfcontenttype) {
+          // 获取文件
+          const disposition = res.headers['content-disposition'];
+          const filename = disposition
+            .split(';')
+            .find((str: string) => str.indexOf('filename=') !== -1)
+            ?.slice(9);
+          const href = URL.createObjectURL(res.data as Blob);
+          const a = document.createElement('a');
+          a.href = href;
+          a.download = filename;
+          document.body.appendChild(a);
+          a.click();
+          document.body.removeChild(a);
+          URL.revokeObjectURL(href);
+        } else {
+          const link = window.URL.createObjectURL(res.data as Blob);
+          window.open(link, '_blank');
+        }
       } else {
         throw new RuntimeError('打印失败');
       }