@ibiz-template/runtime 0.2.7 → 0.2.9

package/out/utils/script/script-function.js

@@ -16,7 +16,13 @@ export class ScriptFunction {
         this.calcArgKeys(argKeys, options);
         const fn = new Function(...this.argKeys, code);
         this.scriptFn = function callBack(...args) {
-            return fn.apply({}, args);
+            try {
+                return fn.apply({}, args);
+            }
+            catch (error) {
+                console.log('报错脚本', code);
+                throw error;
+            }
         };
     }
     /**

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@ibiz-template/runtime",
-  "version": "0.2.7",
+  "version": "0.2.9",
   "description": "控制器包",
   "type": "module",
   "main": "out/index.js",
@@ -30,7 +30,7 @@
   "license": "MIT",
   "devDependencies": {
     "@ibiz-template/core": "^0.2.6",
-    "@ibiz/model-core": "^0.0.19",
+    "@ibiz/model-core": "^0.0.20",
     "@types/path-browserify": "^1.0.0",
     "@types/qs": "^6.9.8",
     "@types/systemjs": "^6.13.3",
@@ -47,7 +47,7 @@
   },
   "peerDependencies": {
     "@ibiz-template/core": "^0.1.0",
-    "@ibiz/model-core": "^0.0.19",
+    "@ibiz/model-core": "^0.0.20",
     "async-validator": "^4.2.5",
     "dayjs": "^1.11.7",
     "echarts": "^5.4.3",
@@ -59,5 +59,5 @@
     "qx-util": "^0.4.8",
     "ramda": "^0.29.0"
   },
-  "gitHead": "2533d04e6de6b0d5b20759a0bb3951491c520ca3"
+  "gitHead": "1502d43393de4cc75f670d0ba22d901e158e0c00"
 }

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

@@ -1,6 +1,7 @@
 /* eslint-disable max-classes-per-file */
 import { isElementSame, RuntimeError } from '@ibiz-template/core';
-import { IAppDataEntity, IMDControl } from '@ibiz/model-core';
+import { IAppDataEntity, IAppDEDataImport, IMDControl } from '@ibiz/model-core';
+import { debounce } from 'lodash-es';
 import {
   IMDControlController,
   IMDControlEvent,
@@ -89,7 +90,12 @@ export class MDControlController<
     this.dataEntity.appDEFields?.forEach(field => {
       this.fieldIdNameMap.set(field.id!, field.name!);
     });
-    this.onDataChange = this.onDataChange.bind(this);
+
+    const fn = this.onDataChange.bind(this);
+    this.onDataChange = debounce(msg => {
+      fn(msg);
+    }, 300);
+
     ibiz.mc.command.change.on(this.onDataChange);
 
     // 设置默认排序
@@ -422,27 +428,27 @@ export class MDControlController<
    * @returns {*}  {Promise<void>}
    */
   async importData(): Promise<void> {
-    // const { appEntity, dataImport } = this.model;
-    // let templateUrl = `${appEntity.deNamePlural}/importtemplate`;
-    // let importUrl = `${appEntity.deNamePlural}/importdata2`;
-    // if (dataImport) {
-    //   templateUrl += `?srfimporttag=${dataImport.codeName}`;
-    //   importUrl += `?srfimporttag=${dataImport.codeName}`;
-    // }
-    // const modal = ibiz.overlay.createModal(
-    //   'DataImport',
-    //   {
-    //     dismiss: () => modal.dismiss(),
-    //     templateUrl,
-    //     importUrl,
-    //   },
-    //   {
-    //     width: 'auto',
-    //     placement: 'center',
-    //   },
-    // );
-    // modal.present();
-    // await modal.onWillDismiss();
+    const { appDataEntityId, dedataImportId } = this.model;
+    const appDataEntity = await ibiz.hub.getAppDataEntity(appDataEntityId!);
+    const dataImport = appDataEntity.appDEDataImports?.find(
+      (importItem: IAppDEDataImport) => importItem.id === dedataImportId,
+    );
+    if (!dataImport) {
+      throw new RuntimeError('无导入模型！');
+    }
+    const modal = ibiz.overlay.createModal(
+      'DataImport',
+      {
+        dismiss: () => modal.dismiss(),
+        appDataEntity,
+      },
+      {
+        width: 'auto',
+        placement: 'center',
+      },
+    );
+    modal.present();
+    await modal.onWillDismiss();
   }
 
   /**

package/src/controller/control/form/edit-form/edit-form.controller.ts

@@ -428,6 +428,9 @@ export class EditFormController
     const { context, params } = this.handlerAbilityParams(args);
     try {
       await this.service.wfStart(context, params, this.data);
+      if (this.view.modal.mode === 'ROUTE') {
+        ibiz.mc.command.send(this.data.$origin, 'OBJECTUPDATED');
+      }
     } catch (error) {
       this.actionNotification('WFSTARTERROR', {
         error: error as Error,
@@ -457,6 +460,9 @@ export class EditFormController
     const { context, params } = this.handlerAbilityParams(args);
     try {
       await this.service.wfSubmit(context, params, this.data);
+      if (this.view.modal.mode === 'ROUTE') {
+        ibiz.mc.command.send(this.data.$origin, 'OBJECTUPDATED');
+      }
     } catch (error) {
       this.actionNotification('WFSUBMITERROR', {
         error: error as Error,

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

@@ -82,6 +82,22 @@ export class FormDetailController<T extends IDEFormDetail = IDEFormDetail>
     return [...this.state.class.label, ...this.state.class.labelDyna];
   }
 
+  /**
+   * 动态逻辑结果
+   * @author lxm
+   * @date 2023-09-21 03:36:37
+   * @protected
+   */
+  protected dynaLogicResult: {
+    visible?: boolean;
+    disabled?: boolean;
+    required?: boolean;
+  } = {
+    visible: undefined,
+    disabled: undefined,
+    required: undefined,
+  };
+
   /**
    * Creates an instance of FormDetailController.
    * @author lxm
@@ -267,20 +283,22 @@ export class FormDetailController<T extends IDEFormDetail = IDEFormDetail>
    * @param {IData} data
    */
   calcDetailDisabled(data: IData): void {
-    let enable = !this.dynaLogicResult.disabled;
+    let { disabled } = this.dynaLogicResult;
 
     // 上层计算为启用时计算预定义项启用逻辑
-    if (enable && this.form.scheduler) {
+    if (disabled !== true && this.form.scheduler) {
       const itemEnable = this.form.scheduler.triggerItemEnable(this.model.id!, {
         data: [data],
       });
       if (itemEnable !== undefined) {
-        enable = itemEnable;
+        disabled = !itemEnable;
       }
     }
 
-    // 修改state
-    this.state.disabled = !enable;
+    // 有值的时候才会去修改state
+    if (disabled !== undefined) {
+      this.state.disabled = disabled;
+    }
   }
 
   /**
@@ -292,7 +310,7 @@ export class FormDetailController<T extends IDEFormDetail = IDEFormDetail>
     let { visible } = this.dynaLogicResult;
 
     // 上层计算为显示时计算预定义项显示逻辑
-    if (visible && this.form.scheduler) {
+    if (visible !== false && this.form.scheduler) {
       const itemVIsible = this.form.scheduler.triggerItemVisible(
         this.model.id!,
         {
@@ -304,8 +322,10 @@ export class FormDetailController<T extends IDEFormDetail = IDEFormDetail>
       }
     }
 
-    // 修改state
-    this.state.visible = visible;
+    // 有值的时候才会去修改state
+    if (visible !== undefined) {
+      this.state.visible = visible;
+    }
   }
 
   /**
@@ -314,10 +334,10 @@ export class FormDetailController<T extends IDEFormDetail = IDEFormDetail>
    * @param {IData} data
    */
   calcDetailRequired(data: IData): void {
-    let allowEmpty = !this.dynaLogicResult.required;
+    let { required } = this.dynaLogicResult;
 
     // 上层计算为启用时计算预定义项空输入逻辑
-    if (allowEmpty && this.form.scheduler) {
+    if (required !== true && this.form.scheduler) {
       const itemAllowEmpty = this.form.scheduler.triggerItemBlank(
         this.model.id!,
         {
@@ -325,23 +345,13 @@ export class FormDetailController<T extends IDEFormDetail = IDEFormDetail>
         },
       );
       if (itemAllowEmpty !== undefined) {
-        allowEmpty = itemAllowEmpty;
+        required = !itemAllowEmpty;
       }
     }
 
-    // 修改state
-    this.state.required = !allowEmpty;
+    // 有值的时候才会去修改state
+    if (required !== undefined) {
+      this.state.required = required;
+    }
   }
-
-  /**
-   * 动态逻辑结果
-   * @author lxm
-   * @date 2023-09-21 03:36:37
-   * @protected
-   */
-  protected dynaLogicResult = {
-    visible: true,
-    disabled: false,
-    required: false,
-  };
 }

package/src/controller/control/form/form-detail/form-group-panel/form-group-panel.controller.ts

@@ -57,8 +57,8 @@ export class FormGroupPanelController<
     await this.initActionStates();
   }
 
-  async formStateNotify(_state: FormNotifyState): Promise<void> {
-    super.calcDynamicLogic([], true);
+  async formStateNotify(state: FormNotifyState): Promise<void> {
+    super.formStateNotify(state);
     // 只在加载后台数据之后，更新界面行为组状态
     if (this.state.actionGroupState) {
       this.state.actionGroupState.update(this.form.data.getOrigin());

package/src/controller/control/form/form-detail/form-mdctrl/form-mdctrl-content-type.controller.ts

@@ -86,7 +86,7 @@ export class FormMDCtrlContentTypeController {
     if (index < 0) {
       return;
     }
-    this.parent.state.contentCtrlData.splice(index, 1);
+    this.parent.state.contentCtrlData?.splice(index, 1);
     this.parent.setFormDataValue();
   }
 
@@ -99,7 +99,7 @@ export class FormMDCtrlContentTypeController {
    * @memberof FormMDCtrlContentTypeController
    */
   onDataInsert(data?: IData): void {
-    this.parent.state.contentCtrlData.push(data || {});
+    this.parent.state.contentCtrlData?.push(data || {});
     this.parent.setFormDataValue();
   }
 

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

@@ -1,4 +1,5 @@
 import { IDEFormMDCtrl } from '@ibiz/model-core';
+import { clone } from 'ramda';
 import { FormDetailController } from '../form-detail';
 import { FormMDCtrlContentTypeController } from './form-mdctrl-content-type.controller';
 import { FormMDCtrlDataViewController } from './form-mdctrl-data-view/form-mdctrl-data-view.controller';
@@ -33,6 +34,30 @@ export class FormMDCtrlController extends FormDetailController<IDEFormMDCtrl> {
 
   declare form: EditFormController;
 
+  /**
+   * 是否显示添加按钮
+   *
+   * @memberof FormMDCtrlController
+   */
+  get isCreate(): boolean {
+    if (this.model.buildInActions) {
+      return [1, 3, 5, 7].includes(this.model.buildInActions);
+    }
+    return false;
+  }
+
+  /**
+   * 是否显示删除按钮
+   *
+   * @memberof FormMDCtrlController
+   */
+  get isDelete(): boolean {
+    if (this.model.buildInActions) {
+      return [4, 5, 6, 7].includes(this.model.buildInActions);
+    }
+    return false;
+  }
+
   /**
    * Creates an instance of FormMDCtrlController.
    *
@@ -126,7 +151,7 @@ export class FormMDCtrlController extends FormDetailController<IDEFormMDCtrl> {
     const name =
       this.model.appDEFieldId || this.model.fieldName || this.model.id;
     if (name) {
-      this.form.setDataValue(name, this.state.contentCtrlData);
+      this.form.setDataValue(name, clone(this.state.contentCtrlData));
     }
   }
 
@@ -151,4 +176,44 @@ export class FormMDCtrlController extends FormDetailController<IDEFormMDCtrl> {
   setDefaultValue(): void {
     // todo 设置默认值
   }
+
+  /**
+   * 表单数据变更通知
+   *
+   * @author lxm
+   * @date 2022-09-20 18:09:56
+   * @param {string[]} names
+   */
+  async dataChangeNotify(names: string[]): Promise<void> {
+    await super.dataChangeNotify(names);
+    const { resetItemNames } = this.model;
+    const mdctrlName =
+      this.model.appDEFieldId || this.model.fieldName || this.model.id!;
+
+    // 重置项，变更时自己的值置空
+    let isReset = false;
+    if (resetItemNames && resetItemNames.length > 0) {
+      resetItemNames.forEach((resetItemName: string) => {
+        if (names.includes(resetItemName)) {
+          isReset = true;
+        }
+      });
+    }
+    if (isReset) {
+      this.state.contentCtrlData = null;
+      this.setFormDataValue();
+    }
+
+    // 刚加载初始化时的值不校验,只校验自身值变更
+    if (names.includes(mdctrlName)) {
+      this.validate();
+    }
+
+    // 有表单项更新，且是自身变更时，触发表单项更新
+    if (names.includes(mdctrlName) && this.model.deformItemUpdateId) {
+      await (this.form as EditFormController).updateFormItem(
+        this.model.deformItemUpdateId,
+      );
+    }
+  }
 }

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

@@ -12,5 +12,5 @@ export class FormMDCtrlState extends FormDetailState {
    *
    * @type {Array<IData>}
    */
-  contentCtrlData: Array<IData> | IData = [];
+  contentCtrlData: Array<IData> | IData | null = [];
 }

package/src/controller/control/grid/grid/grid.controller.ts

@@ -32,7 +32,7 @@ import { getGridColumnProvider } from '../../../../register';
 import { ControlVO, Srfuf } from '../../../../service';
 import { MDControlController } from '../../../common';
 import { GridNotifyState } from '../../../constant';
-import { getDefaultValue, isValueChange } from '../../../utils';
+import { exportData, getDefaultValue, isValueChange } from '../../../utils';
 import { handleAllSettled, ScriptFactory } from '../../../../utils';
 
 /**
@@ -525,10 +525,6 @@ export class GridController
     rowState.data = res.data;
     rowState.modified = false;
 
-    this.actionNotification(`${isCreate ? 'CREATE' : 'UPDATE'}SUCCESS`, {
-      default: `${res.data.srfmajortext || ''}保存成功`,
-      data: res.data,
-    });
     this.gridStateNotify(rowState, GridNotifyState.SAVE);
     await this.evt.emit('onSaveSuccess', undefined);
   }
@@ -922,28 +918,28 @@ export class GridController
       this.fieldColumns;
     // 数据格式化
     const formatExcelData = (data: IData[]): IData[] => {
-      const codeListMap: Map<string, readonly CodeListItem[]> = new Map();
-      Object.keys(items).forEach((key: string) => {
-        if (items[key].codeList) {
-          codeListMap.set(key, items[key].codeListItems!);
-        }
-      });
+      // const codeListMap: Map<string, readonly CodeListItem[]> = new Map();
+      // Object.keys(items).forEach((key: string) => {
+      //   if (items[key].codeList) {
+      //     codeListMap.set(key, items[key].codeListItems!);
+      //   }
+      // });
       const cloneData = clone(
         data.map(item => {
           return item.getOrigin();
         }),
       );
-      cloneData.forEach(item => {
-        const fields = Object.keys(item);
-        fields.forEach((key: string) => {
-          if (codeListMap.get(key)) {
-            item[key] =
-              codeListMap.get(key)!.find(_item => {
-                return _item.value === item[key];
-              })?.text || item[key];
-          }
-        });
-      });
+      // cloneData.forEach(item => {
+      //   const fields = Object.keys(item);
+      //   fields.forEach((key: string) => {
+      //     if (codeListMap.get(key)) {
+      //       item[key] =
+      //         codeListMap.get(key)!.find(_item => {
+      //           return _item.value === item[key];
+      //         })?.text || item[key];
+      //     }
+      //   });
+      // });
       return cloneData;
     };
     const getExportData = async (): Promise<IData[]> => {
@@ -977,7 +973,7 @@ export class GridController
     const formatArrayData = (
       filterVal: string[],
       tableData: IData[],
-    ): IData[] => {
+    ): IData[][] => {
       return tableData.map(v => {
         return filterVal.map(j => {
           return v[j];
@@ -994,19 +990,7 @@ export class GridController
     );
     // 二维数组
     const data = formatArrayData(filterVal, await getExportData());
-    if (!ibiz.util.getExportExcel) {
-      throw new RuntimeError('ibiz.util.getExportExcel不存在');
-    }
-    const exportExcel = await ibiz.util.getExportExcel();
-    if (!exportExcel) {
-      throw new RuntimeError('导出模块加载错误');
-    }
-    exportExcel.exportJsonToExcel({
-      header, // 表头内容 数组格式
-      data, // 具体数据 这是个二维数组
-      filename: this.model.logicName!, // 文件名称
-      autoWidth: true, // 单元格是否自适应
-    });
+    await exportData(header, data, this.model.logicName!);
   }
 
   /**

package/src/controller/control/index.ts

@@ -22,3 +22,4 @@ export * from './kanban/index';
 export * from './tree-grid-ex/index';
 export * from './tree-grid/index';
 export * from './medit-view-panel/index';
+export * from './map/index';

package/src/controller/control/map/index.ts

@@ -0,0 +1,2 @@
+export * from './map.controller';
+export * from './map.service';

package/src/controller/control/map/map.controller.ts

@@ -0,0 +1,163 @@
+import { ISysMap } from '@ibiz/model-core';
+import { MapService } from './map.service';
+import {
+  IMapController,
+  IMapData,
+  IMapEvent,
+  IMapState,
+  MDCtrlLoadParams,
+} from '../../../interface';
+import { MDControlController } from '../../common';
+
+export class MapController
+  extends MDControlController<ISysMap, IMapState, IMapEvent>
+  implements IMapController
+{
+  declare service: MapService;
+
+  protected initState(): void {
+    super.initState();
+    this.state.size = 1000;
+    this.state.pointData = [];
+    this.state.areaData = [];
+    this.calcDefaultOptions();
+  }
+
+  protected async onCreated(): Promise<void> {
+    await super.onCreated();
+    this.service = new MapService(this.model);
+    await this.service.init(this.context);
+  }
+
+  /**
+   * 部件加载数据行为
+   *
+   * @author lxm
+   * @date 2022-08-19 14:08:50
+   */
+  async load(args: MDCtrlLoadParams = {}): Promise<IData[]> {
+    if (this.state.isSimple) {
+      return [];
+    }
+    await this.startLoading();
+    try {
+      // *初始加载需要重置分页
+      const isInitialLoad = args.isInitialLoad === true;
+
+      // *查询参数处理
+      const { context } = this.handlerAbilityParams(args);
+      const params = await this.getFetchParams(args?.viewParam);
+      context.srfareacode = this.state.areaCode;
+
+      const res = await this.service.fetchAll(context, params);
+
+      this.state.items = res.data;
+
+      await this.afterLoad(args, res.data);
+
+      this.state.isLoaded = true;
+      await this._evt.emit('onLoadSuccess', {
+        isInitialLoad,
+      });
+    } catch (error) {
+      await this._evt.emit('onLoadError', undefined);
+      this.actionNotification('FETCHERROR', {
+        error: error as Error,
+      });
+      throw error;
+    } finally {
+      await this.endLoading();
+    }
+
+    this.actionNotification('FETCHSUCCESS');
+    return this.state.items;
+  }
+
+  async afterLoad(args: MDCtrlLoadParams, items: IData[]): Promise<IData[]> {
+    const result = (await super.afterLoad(args, items)) as IMapData[];
+
+    const tempareaData: IMapData[] = [];
+    const temppointData: IMapData[] = [];
+    result.forEach(item => {
+      if (item._type === 'area') {
+        tempareaData.push(item);
+      } else if (item._type === 'point') {
+        temppointData.push(item);
+      }
+    });
+    this.state.pointData = temppointData;
+    this.state.areaData = tempareaData;
+
+    return result;
+  }
+
+  /**
+   * 计算默认选项
+   * @author lxm
+   * @date 2023-11-01 03:23:33
+   */
+  calcDefaultOptions(): void {
+    this.state.strAreaCode = false;
+    this.state.defaultAreaCode = 100000;
+
+    if (this.model.controlParam?.ctrlParams) {
+      const { ctrlParams } = this.model.controlParam;
+      Object.keys(ctrlParams).forEach(key => {
+        const value = ctrlParams[key];
+        switch (key.toLowerCase()) {
+          case 'defaultareacode':
+            this.state.defaultAreaCode = value;
+            break;
+          case 'strareacode':
+            this.state.strAreaCode = value === 'true';
+            break;
+          case 'jsonbaseurl':
+            this.state.jsonBaseUrl = value;
+            break;
+          default:
+            break;
+        }
+      });
+    }
+
+    // 根据strAreaCode格式化默认区域代码的数值还是字符串
+    this.state.defaultAreaCode = this.state.strAreaCode
+      ? `${this.state.defaultAreaCode}`
+      : Number(this.state.defaultAreaCode);
+
+    this.state.areaCode = this.state.defaultAreaCode;
+  }
+
+  /**
+   * 地图变更事件处理
+   * @author lxm
+   * @date 2023-10-31 05:28:36
+   * @param {(string | number)} areaCode
+   */
+  onMapChange(areaCode: string | number): void {
+    // 修改预置视图参数，然后加载
+    this.state.areaCode = areaCode;
+    this.load({});
+    this.evt.emit('onMapChange', { areaCode });
+  }
+
+  /**
+   * 地图区域点击事件处理
+   * @author lxm
+   * @date 2023-10-31 05:30:54
+   * @param {IMapData} mapData
+   */
+  onAreaClick(mapData: IMapData): void {
+    this.evt.emit('onAreaClick', { data: [mapData] });
+  }
+
+  /**
+   * 地图散点点击事件处理
+   * @author lxm
+   * @date 2023-10-31 05:30:58
+   * @param {IMapData} mapData
+   */
+  onPointClick(mapData: IMapData): void {
+    this.evt.emit('onPointClick', { data: [mapData] });
+  }
+}