@ibiz-template/runtime 0.2.8 → 0.2.9

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';
 
 /**
@@ -918,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[]> => {
@@ -973,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];
@@ -990,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/map/map.controller.ts

@@ -20,7 +20,7 @@ export class MapController
     this.state.size = 1000;
     this.state.pointData = [];
     this.state.areaData = [];
-    this.state.areaCode = 320000;
+    this.calcDefaultOptions();
   }
 
   protected async onCreated(): Promise<void> {
@@ -91,6 +91,43 @@ export class MapController
     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

package/src/controller/control/panel/panel/panel.controller.ts

@@ -16,7 +16,9 @@ import {
   IControlProvider,
   IPanelItemContainerController,
 } from '../../../../interface';
+import { getAllPanelField } from '../../../../model';
 import { getPanelItemProvider } from '../../../../register';
+import { PanelData } from '../../../../service/vo';
 import { ControlController } from '../../../common';
 import { PanelNotifyState } from '../../../constant';
 import { ControllerEvent } from '../../../utils';
@@ -222,27 +224,8 @@ export class PanelController<
    * @memberof PanelController
    */
   convertData(data: IData): IData {
-    // const map: IData = {};
-    // // 绑定数据项和name不一致的映射到map里
-    // this.model.panelFields.forEach(field => {
-    //   if (field.id !== field.dataFieldName) {
-    //     map[field.id] = field.dataFieldName;
-    //   }
-    // });
-
-    // return new Proxy(data, {
-    //   get(target, p, receiver) {
-    //     if (Reflect.ownKeys(map).includes(p)) {
-    //       return Reflect.get(target, map[p], receiver);
-    //     }
-    //     return Reflect.get(target, p, receiver);
-    //   },
-    //   set(target, p, value, receiver) {
-    //     Reflect.set(target, p, value, receiver);
-    //     return true;
-    //   },
-    // });
-    return data;
+    const fields = getAllPanelField(this.model);
+    return new PanelData(fields, data);
   }
 
   /**

package/src/controller/utils/data-file-util/data-file-util.ts

@@ -0,0 +1,156 @@
+import {
+  IPortalAsyncAction,
+  IPortalMessage,
+  RuntimeError,
+} from '@ibiz-template/core';
+import { IAppDataEntity } from '@ibiz/model-core';
+
+// 异步导入URL
+const asyncImportUrl = '/asyncimportdata2';
+
+// 标准导入url
+const importUrl = '/importdata2';
+
+// 导入结果类型
+export type ImportDataResult = {
+  total: number;
+  success: number;
+  message?: string;
+};
+// 导出结果类型
+export type IExportDataResult = {
+  // 是否导出成功
+  ok: boolean;
+  // 导出文件地址 (后期异步导出可能会用到)
+  url?: string;
+};
+
+/**
+ * 监听异步作业
+ *
+ * @author zk
+ * @date 2023-10-31 03:10:31
+ * @param {string} id
+ * @return {*}  {Promise<ImportDataResult>}
+ */
+function listenAsyncAction(id: string): Promise<ImportDataResult> {
+  return new Promise(resolve => {
+    const callBack = (msg: IPortalMessage): void => {
+      // 兼容接口返回类型与实际返回类型不一致
+      const messageid = msg.messageid || (msg.data as IData).asyncacitonid;
+      if (
+        id === messageid &&
+        (msg.data as IPortalAsyncAction).actionstate === 30
+      ) {
+        // 返回结果是字符串， 需解析
+        try {
+          const result = JSON.parse(
+            (msg.data as IPortalAsyncAction).actionresult as string,
+          );
+          resolve(result as ImportDataResult);
+        } catch (error) {
+          throw new RuntimeError('解析数据发生错误');
+        } finally {
+          // 异步作业结束 取消订阅
+          ibiz.mc.command.asyncAction.off(callBack);
+        }
+      } else if ((msg.data as IPortalAsyncAction).actionstate === 40) {
+        resolve({
+          total: 0,
+          success: 0,
+          message: (msg.data as IPortalAsyncAction).actionresult as string,
+        });
+        // 异步作业结束 取消订阅
+        ibiz.mc.command.asyncAction.off(callBack);
+      }
+    };
+    ibiz.mc.command.asyncAction.on(callBack);
+  });
+}
+
+/**
+ * 异步作业导入方法
+ *
+ * @author zk
+ * @date 2023-10-31 02:10:06
+ * @export
+ * @param {File} file
+ * @param {IAppDataEntity} appDataEntity
+ * @return {*}  {Promise<IData>}
+ */
+export async function asyncImportData(
+  file: File,
+  appDataEntity: IAppDataEntity,
+): Promise<ImportDataResult> {
+  const data = new FormData();
+  data.append('file', file);
+  const url = `${appDataEntity.codeName2!.toLowerCase()}/${asyncImportUrl}`;
+  const res = await ibiz.net.request(url, {
+    method: 'post',
+    data,
+    headers: { 'Content-Type': 'multipart/form-data' },
+  });
+  return listenAsyncAction(res.data.asyncacitonid);
+}
+
+/**
+ * 标准导入方法
+ *
+ * @author zk
+ * @date 2023-10-31 02:10:29
+ * @export
+ * @param {File} file
+ * @param {IAppDataEntity} appDataEntity
+ * @return {*}  {Promise<IData>}
+ */
+export async function importData(
+  file: File,
+  appDataEntity: IAppDataEntity,
+): Promise<ImportDataResult> {
+  const data = new FormData();
+  data.append('file', file);
+  const url = `${appDataEntity.codeName2!.toLowerCase()}/${importUrl}`;
+  const res = await ibiz.net.request(url, {
+    method: 'post',
+    data,
+    headers: { 'Content-Type': 'multipart/form-data' },
+  });
+  // 错误情况 服务层会抛出异常
+  return res.data as ImportDataResult;
+}
+
+/**
+ * 标准导出方法
+ *
+ * @author zk
+ * @date 2023-10-31 09:10:13
+ * @export
+ * @param {string[]} header
+ * @param {IData[][]} data
+ * @param {string} fileName
+ * @return {*}  {Promise<IExportDataResult>}
+ */
+export async function exportData(
+  header: string[],
+  data: IData[][],
+  fileName: string,
+): Promise<IExportDataResult> {
+  if (!ibiz.util.getExcelUtil) {
+    throw new RuntimeError('ibiz.util.getExportExcel不存在');
+  }
+  const exportExcel = await ibiz.util.getExcelUtil();
+  if (!exportExcel) {
+    throw new RuntimeError('导出模块加载错误');
+  }
+  try {
+    exportExcel.exportJsonToExcel({
+      header, // 表头内容 数组格式
+      data, // 具体数据 这是个二维数组
+      filename: fileName, // 文件名称
+      autoWidth: true, // 单元格是否自适应
+    });
+    return { ok: true };
+  } catch (error) {
+    return { ok: false };
+  }
+}

package/src/controller/utils/index.ts

@@ -6,3 +6,4 @@ export * from './util/util';
 export * from './value-rule/value-rule';
 export * from './value-ex/value-ex';
 export * from './value-default/value-default';
+export * from './data-file-util/data-file-util';

package/src/global/global-util/global-util.ts

@@ -1,4 +1,4 @@
-import { IExportExcelUtil } from '../../interface';
+import { IExcelUtil } from '../../interface';
 import {
   TextUtil,
   LayoutPanelUtil,
@@ -67,7 +67,7 @@ export class GlobalUtil {
    * @author lxm
    * @date 2023-08-24 10:47:06
    */
-  getExportExcel?: () => Promise<IExportExcelUtil>;
+  getExcelUtil?: () => Promise<IExcelUtil>;
 
   /**
    * 显示应用级别的加载提示

package/src/interface/controller/controller/control/panel-item/i-panel-data-container.controller.ts

@@ -25,5 +25,5 @@ export interface IPanelDataContainerController
    * @param {string} name 要设置的数据的属性名称
    * @param {unknown} value 要设置的值
    */
-  setDataValue?(name: string, value: unknown): Promise<void>;
+  setDataValue(name: string, value: unknown): Promise<void>;
 }

package/src/interface/controller/state/control/i-map.state.ts

@@ -27,6 +27,22 @@ export interface IMapState extends IMDControlState {
    */
   areaData: IMapData[];
 
+  /**
+   * 区域编码是否是字符串
+   * @author lxm
+   * @date 2023-11-01 03:30:09
+   * @type {boolean}
+   */
+  strAreaCode: boolean;
+
+  /**
+   * 默认显示的区域代码
+   * @author lxm
+   * @date 2023-10-31 09:03:23
+   * @type {string}
+   */
+  defaultAreaCode: string | number;
+
   /**
    * 当前区域代码
    * @author lxm
@@ -34,6 +50,14 @@ export interface IMapState extends IMDControlState {
    * @type {string}
    */
   areaCode: string | number;
+
+  /**
+   * 地图json数据基础路径
+   * @author lxm
+   * @date 2023-11-01 03:37:19
+   * @type {string}
+   */
+  jsonBaseUrl?: string;
 }
 
 /**

package/src/interface/index.ts

@@ -1,5 +1,4 @@
 export * from './common';
-export * from './util';
 export * from './provider';
 export * from './register';
 export * from './controller';
@@ -8,3 +7,5 @@ export * from './engine';
 export * from './logic-scheduler';
 export * from './model';
 export * from './studio';
+export * from './ui-login';
+export * from './util';

package/src/interface/provider/i-ui-login-node.provider.ts

@@ -0,0 +1,23 @@
+import { IDEUIPFPluginLogic } from '@ibiz/model-core';
+import { IUILogicContext } from '../ui-login';
+
+/**
+ * 界面逻辑前端节点适配器
+ *
+ * @author chitanda
+ * @date 2023-11-01 17:11:16
+ * @export
+ * @interface IUILogicNodeProvider
+ */
+export interface IUILogicNodeProvider {
+  /**
+   * 执行界面逻辑 节点
+   *
+   * @author chitanda
+   * @date 2023-11-01 18:11:17
+   * @param {IDEUIPFPluginLogic} model
+   * @param {IUILogicContext} ctx
+   * @return {*}  {Promise<unknown>}
+   */
+  exec(model: IDEUIPFPluginLogic, ctx: IUILogicContext): Promise<unknown>;
+}

package/src/interface/provider/index.ts

@@ -9,3 +9,4 @@ export * from './i-form-detail.provider';
 export * from './i-editor.provider';
 export * from './i-portlet.provider';
 export { IAppCounterProvider } from './i-app-counter.provider';
+export type { IUILogicNodeProvider } from './i-ui-login-node.provider';

package/src/interface/ui-login/i-ui-logic-context.ts

@@ -0,0 +1,95 @@
+export interface IUILogicContext {
+  /**
+   * 上一次返回值
+   */
+  lastReturn: unknown;
+
+  /**
+   * 上下文
+   */
+  readonly context: IContext;
+
+  /**
+   * 数据
+   */
+  readonly data: IData;
+
+  /**
+   * 视图参数
+   */
+  readonly viewParam: IParams;
+
+  /**
+   * 界面逻辑参数
+   *
+   * @author chitanda
+   * @date 2023-11-01 17:11:52
+   * @type {Record<string, unknown>}
+   */
+  readonly params: Record<string, unknown>;
+
+  /**
+   * UI 逻辑执行返回值
+   *
+   * @author chitanda
+   * @date 2023-11-01 17:11:29
+   * @type {unknown}
+   */
+  result: unknown;
+
+  /**
+   * 是否存在结束节点
+   *
+   * @author chitanda
+   * @date 2023-11-01 17:11:57
+   * @type {boolean}
+   */
+  isEndNode: boolean;
+
+  /**
+   * 默认参数节点名称
+   *
+   * @default 'Default'
+   * @author chitanda
+   * @date 2023-11-01 17:11:31
+   * @type {string}
+   */
+  defaultParamName: string;
+
+  /**
+   * 重置实体逻辑参数
+   *
+   * @author chitanda
+   * @date 2023-11-01 17:11:18
+   * @param {string} name
+   */
+  resetParam(name: string): void;
+
+  /**
+   * 设置上一次返回值
+   *
+   * @author chitanda
+   * @date 2023-11-01 17:11:31
+   * @param {string} name
+   */
+  renewParam(name: string): void;
+
+  /**
+   * 设置上一次返回值
+   *
+   * @author chitanda
+   * @date 2023-11-01 17:11:48
+   * @param {unknown} value
+   */
+  setLastReturn(value: unknown): void;
+
+  /**
+   * 是否是实体参数变量（即后台数据对象）
+   *
+   * @author chitanda
+   * @date 2023-11-01 17:11:01
+   * @param {string} paramId
+   * @return {*}  {boolean}
+   */
+  isEntityParam(paramId: string): boolean;
+}

package/src/interface/ui-login/index.ts

@@ -0,0 +1 @@
+export type { IUILogicContext } from './i-ui-logic-context';

package/src/interface/util/{i-export-excel/i-export-excel.ts → i-excel-util/i-excel-util.ts}

@@ -1,11 +1,11 @@
 /**
- * 导出excel文件工具
+ * excel文件工具
  * @author lxm
  * @date 2023-08-24 10:45:32
  * @export
- * @interface IExportExcelUtil
+ * @interface IExcelUtil
  */
-export interface IExportExcelUtil {
+export interface IExcelUtil {
   /**
    * 导出成Excel文件
    * @author lxm

package/src/interface/util/index.ts

@@ -12,4 +12,4 @@ export { IOverlayController } from './i-overlay-controller/i-overlay-controller'
 export { IOverlayPopoverContainer } from './i-overlay-popover-container/i-overlay-popover-container';
 
 export { IScriptFunctionOpts } from './script/i-script-function';
-export { IExportExcelUtil } from './i-export-excel/i-export-excel';
+export { IExcelUtil } from './i-excel-util/i-excel-util';

package/src/model/panel/index.ts

@@ -1 +1,2 @@
 export * from './data-container';
+export * from './panel-field';