@ibiz-template/runtime 0.1.37 → 0.2.0

package/out/utils/script/script-factory.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"script-factory.d.ts","sourceRoot":"","sources":["../../../src/utils/script/script-factory.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,mBAAmB,EAAE,MAAM,iBAAiB,CAAC;AACtD,OAAO,EAAE,cAAc,EAAE,MAAM,mBAAmB,CAAC;AAEnD,qBAAa,aAAa;IACxB;;;;;;;;OAQG;IACH,MAAM,CAAC,cAAc,CACnB,OAAO,EAAE,MAAM,EAAE,EACjB,UAAU,EAAE,MAAM,EAClB,OAAO,CAAC,EAAE,mBAAmB,GAC5B,cAAc;IAIjB;;;;;;;;;OASG;IACH,MAAM,CAAC,YAAY,CACjB,IAAI,EAAE,OAAO,EACb,UAAU,EAAE,MAAM,EAClB,OAAO,CAAC,EAAE,mBAAmB,GAC5B,OAAO;CAKX"}
+{"version":3,"file":"script-factory.d.ts","sourceRoot":"","sources":["../../../src/utils/script/script-factory.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,mBAAmB,EAAE,MAAM,iBAAiB,CAAC;AACtD,OAAO,EAAE,cAAc,EAAE,MAAM,mBAAmB,CAAC;AAEnD,qBAAa,aAAa;IACxB;;;;;;;;OAQG;IACH,MAAM,CAAC,cAAc,CACnB,OAAO,EAAE,MAAM,EAAE,EACjB,UAAU,EAAE,MAAM,EAClB,OAAO,CAAC,EAAE,mBAAmB,GAC5B,cAAc;IAIjB;;;;;;;;;OASG;IACH,MAAM,CAAC,YAAY,CACjB,IAAI,EAAE,OAAO,EACb,UAAU,EAAE,MAAM,EAClB,OAAO,CAAC,EAAE,mBAAmB,GAC5B,OAAO;IAMV;;;;;;;;OAQG;IACH,MAAM,CAAC,cAAc,CAAC,UAAU,EAAE,MAAM,EAAE,IAAI,GAAE,OAAY,GAAG,OAAO;CAMvE"}

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

@@ -25,4 +25,19 @@ export class ScriptFactory {
     static execScriptFn(args, scriptCode, options) {
         return this.createScriptFn(Object.keys(args), scriptCode, options).exec(args);
     }
+    /**
+     * 执行单行脚本
+     * @author lxm
+     * @date 2023-10-20 03:20:56
+     * @static
+     * @param {string} scriptCode 脚本字符串
+     * @param {IParams} [args={}] 作用域变量参数对象
+     * @return {*}  {unknown}
+     */
+    static execSingleLine(scriptCode, args = {}) {
+        return this.execScriptFn(args, scriptCode, {
+            singleRowReturn: true,
+            isAsync: false,
+        });
+    }
 }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@ibiz-template/runtime",
-  "version": "0.1.37",
+  "version": "0.2.0",
   "description": "控制器包",
   "type": "module",
   "main": "out/index.js",
@@ -29,7 +29,7 @@
   "author": "chitanda",
   "license": "MIT",
   "devDependencies": {
-    "@ibiz-template/core": "^0.1.36",
+    "@ibiz-template/core": "^0.2.0",
     "@ibiz/model-core": "^0.0.19",
     "@types/path-browserify": "^1.0.0",
     "@types/qs": "^6.9.8",
@@ -39,6 +39,7 @@
     "echarts": "^5.4.3",
     "handlebars": "^4.7.8",
     "lodash-es": "^4.17.21",
+    "mqtt": "2.18.9",
     "path-browserify": "^1.0.1",
     "qs": "^6.11.2",
     "qx-util": "^0.4.8",
@@ -52,10 +53,11 @@
     "echarts": "^5.4.3",
     "handlebars": "^4.7.8",
     "lodash-es": "^4.17.21",
+    "mqtt": "2.18.9",
     "path-browserify": "^1.0.1",
     "qs": "^6.11.0",
     "qx-util": "^0.4.8",
     "ramda": "^0.29.0"
   },
-  "gitHead": "7e595c90e5ef274ccabeb655d023b0f03faf9bf2"
+  "gitHead": "a4f9593ca7ea013a1a34c91f443dd25e1d7de251"
 }

package/src/application.ts

@@ -1,4 +1,4 @@
-import { Net } from '@ibiz-template/core';
+import { Net, getToken } from '@ibiz-template/core';
 import {
   IAppDEUIAction,
   IAppFunc,
@@ -11,6 +11,7 @@ import {
   CodeListService,
   ConfigService,
   DEServiceUtil,
+  MqttService,
 } from './service';
 import { IAppService } from './interface';
 
@@ -89,6 +90,15 @@ export class Application implements IAppService {
    */
   readonly authority: AuthorityService;
 
+  /**
+   * mqtt 服务
+   *
+   * @author chitanda
+   * @date 2023-10-23 15:10:18
+   * @type {MqttService}
+   */
+  mqtt?: MqttService;
+
   /**
    * Creates an instance of Application.
    *
@@ -120,6 +130,17 @@ export class Application implements IAppService {
   async init(): Promise<void> {
     await this.authority.init();
     await this.loadAppModelStyle();
+    if (ibiz.env.enableMqtt) {
+      this.mqtt = new MqttService(
+        ibiz.appData!.mqtttopic,
+        getToken()!,
+        this.model.appId!,
+      );
+      this.mqtt.evt.on('message', message => {
+        ibiz.mc.command.asyncAction.next(message);
+      });
+      await this.mqtt.connect();
+    }
   }
 
   /**

package/src/controller/control/exp-bar/chart-exp-bar.controller.ts

@@ -0,0 +1,51 @@
+import { IChartExpBar, IDEChart } from '@ibiz/model-core';
+import {
+  IChartExpBarState,
+  IChartExpBarEvent,
+  IChartExpBarController,
+  INavViewMsg,
+} from '../../../interface';
+import { ExpBarControlController } from './exp-bar.controller';
+
+/**
+ * 图表导航栏控制器
+ *
+ * @export
+ * @class ChartExpBarController
+ * @extends {ExpBarControlController<IChartExpBar, IChartExpBarState, IChartExpBarEvent>}
+ * @implements {IChartExpBarController}
+ */
+export class ChartExpBarController
+  extends ExpBarControlController<
+    IChartExpBar,
+    IChartExpBarState,
+    IChartExpBarEvent
+  >
+  implements IChartExpBarController
+{
+  /**
+   * 获取导航视图
+   *
+   * @author zk
+   * @date 2023-06-29 03:06:41
+   * @param {IDETabViewPanel} tabViewPanel
+   * @return {*}  {Promise<INavViewMsg>}
+   * @memberof TabExpPanelController
+   */
+  public getNavViewMsg(
+    data: IData,
+    context: IContext,
+    params: IParams,
+  ): INavViewMsg {
+    const viewModelId = (this.XDataModel as IDEChart).dechartSerieses?.[0]
+      .navAppViewId;
+    const result = this.prepareParams(this.XDataModel!, data, context, params);
+    return {
+      key: data[this.navKeyName],
+      context: result.context,
+      params: result.params,
+      viewId: viewModelId,
+      isCache: this.isCache,
+    };
+  }
+}

package/src/controller/control/exp-bar/index.ts

@@ -1,3 +1,4 @@
 export * from './calendar-exp-bar.controller';
 export * from './exp-bar.controller';
 export * from './tree-exp-bar.controller';
+export * from './chart-exp-bar.controller';

package/src/controller/control/grid/grid-column/grid-field-column/grid-field-column.controller.ts

@@ -2,6 +2,7 @@
 import { DataTypes, ModelError } from '@ibiz-template/core';
 import { IAppCodeList, IDEGridFieldColumn } from '@ibiz/model-core';
 import dayjs from 'dayjs';
+import { debounce } from 'lodash-es';
 import { clone, isNil } from 'ramda';
 import { OpenAppViewCommand } from '../../../../../command';
 import { CodeListItem, IModalData } from '../../../../../interface';
@@ -59,6 +60,19 @@ export class GridFieldColumnController extends GridColumnController<IDEGridField
     return !!this.model.deuiactionId;
   }
 
+  protected async onInit(): Promise<void> {
+    await super.onInit();
+
+    // 加载代码表防抖
+    this.loadCodeList = debounce(
+      this.loadCodeList,
+      300,
+    ) as typeof this.loadCodeList;
+
+    // 默认加载一次代码表
+    this.loadCodeList();
+  }
+
   /**
    * 行是否可点击（影响列的界面样式）
    *

package/src/controller/control/medit-view-panel/medit-view-panel.controller.ts

@@ -1,6 +1,6 @@
 /* eslint-disable no-shadow */
 import { RuntimeError } from '@ibiz-template/core';
-import { IAppDERS, IAppDEView, IDEMultiEditViewPanel } from '@ibiz/model-core';
+import { IDEMultiEditViewPanel } from '@ibiz/model-core';
 import { createUUID } from 'qx-util';
 import {
   IMEditViewPanelState,
@@ -38,12 +38,6 @@ export class MEditViewPanelController
    */
   showButton: boolean = true;
 
-  /**
-   * 关系实体参数对象
-   *
-   */
-  deResParameters: IData[] = [];
-
   /**
    * 当前应用视图参数对象
    *
@@ -64,49 +58,6 @@ export class MEditViewPanelController
     this.state.size = 1000;
   }
 
-  /**
-   * 格式化视图关系参数
-   *
-   * @param {IContext} context 应用上下文数据
-   * @param {IAppDERS[][]} appDERSPaths 关系路径数据
-   */
-  async formatAppDERSPath(
-    context: IContext,
-    appDERSPaths: IAppDERS[][],
-  ): Promise<IData[]> {
-    if (!appDERSPaths || appDERSPaths.length === 0) {
-      return [];
-    }
-    let counter: number = 0;
-    for (const appDERSPath of appDERSPaths) {
-      const tempData: IData = { isInclude: true, data: [] };
-      for (const singleAppDERSPath of appDERSPath) {
-        // eslint-disable-next-line no-await-in-loop
-        const majorPSAppDataEntity = await ibiz.hub.getAppDataEntity(
-          singleAppDERSPath.majorAppDataEntityId!,
-        );
-        if (majorPSAppDataEntity && majorPSAppDataEntity.codeName) {
-          tempData.isInclude =
-            context[majorPSAppDataEntity.codeName.toLowerCase()] &&
-            tempData.isInclude;
-          tempData.data.push({
-            parameterName: majorPSAppDataEntity.keyAppDEFieldId?.toLowerCase(),
-            pathName: majorPSAppDataEntity.codeName?.toLowerCase(),
-          });
-        }
-      }
-      // eslint-disable-next-line no-plusplus
-      counter++;
-      if (tempData.isInclude) {
-        return tempData.data;
-      }
-      if (counter === appDERSPaths.length) {
-        return [];
-      }
-    }
-    return [];
-  }
-
   /**
    * 初始化嵌入应用视图及实体参数对象
    * @return {*}
@@ -114,9 +65,6 @@ export class MEditViewPanelController
    * @Date: 2023-10-16 13:56:56
    */
   async initParameters(): Promise<void> {
-    if (this.controlParams.SHOWBUTTON) {
-      this.showButton = !Object.is(this.controlParams.SHOWBUTTON, 'false');
-    }
     if (this.model.embeddedAppViewId) {
       const embedView = await ibiz.hub.getAppView(this.model.embeddedAppViewId);
       if (embedView.appDataEntityId) {
@@ -124,10 +72,6 @@ export class MEditViewPanelController
           embedView.appDataEntityId,
         );
         if (embedView && embedViewEntity) {
-          this.deResParameters = await this.formatAppDERSPath(
-            this.context,
-            (embedView as IAppDEView).appDERSPaths,
-          );
           this.parameters = [
             {
               parameterName: embedViewEntity.keyAppDEFieldId?.toLowerCase(),
@@ -135,7 +79,6 @@ export class MEditViewPanelController
             },
           ];
         } else {
-          this.deResParameters = [];
           this.parameters = [];
         }
       }
@@ -180,24 +123,13 @@ export class MEditViewPanelController
     const id: string = arg[parameterName]
       ? arg[parameterName]
       : `mockId:${createUUID()}`;
-    const item = { id, context: {}, params: {}, data: arg, srfmajortext: '' };
-    Object.assign(item.context, this.context);
-    // 关系应用实体参数
-    this.deResParameters.forEach(deResParameter => {
-      const { parameterName, pathName } = deResParameter;
-      if (
-        this.context[parameterName] &&
-        !Object.is(this.context[parameterName], '')
-      ) {
-        Object.assign(item.context, {
-          [pathName]: this.context[parameterName],
-        });
-      } else if (arg[parameterName] && !Object.is(arg[parameterName], '')) {
-        Object.assign(item.context, {
-          [pathName]: arg[parameterName],
-        });
-      }
-    });
+    const item = {
+      id,
+      context: this.context.clone(),
+      params: {},
+      data: arg,
+      srfmajortext: '',
+    };
 
     // 当前视图参数（应用实体视图）
     this.parameters.forEach(parameter => {
@@ -216,8 +148,6 @@ export class MEditViewPanelController
       }
     });
 
-    // 合并视图参数
-    Object.assign(item.params, this.params);
     return item;
   }
 

package/src/controller/control/search-bar/search-bar.controller.ts

@@ -7,6 +7,7 @@ import {
   ISearchBarController,
   IFilterNode,
 } from '../../../interface';
+import { convertNavData, ScriptFactory } from '../../../utils';
 import { ControlController } from '../../common';
 import { SearchBarFilterController } from './search-bar-filter.controller';
 
@@ -144,11 +145,11 @@ export class SearchBarController
     }
     // 快速分组
     if (this.state.selectedGroupItem?.data) {
-      // eslint-disable-next-line no-new-func
-      const func = new Function(
-        `return (${this.state.selectedGroupItem.data});`,
-      );
-      const addParams = func() as IData;
+      const navParams = ScriptFactory.execSingleLine(
+        this.state.selectedGroupItem.data,
+      ) as IData;
+
+      const addParams = convertNavData(navParams, this.params, this.context);
       Object.assign(params, addParams);
     }
 

package/src/de-logic/de-logic-context.ts

@@ -1,3 +1,4 @@
+import { isArray } from 'lodash-es';
 import { DELogicParam } from './de-logic-param/de-logic-param';
 
 /**
@@ -21,9 +22,9 @@ export class DELogicContext {
    * 实体逻辑执行参数
    * @author lxm
    * @date 2023-10-16 02:22:31
-   * @type {{ context: IParams; data: IData; params: IParams }}
+   * @type {{ context: IParams; data: IData[]; params: IParams }}
    */
-  parameters: { context: IParams; data: IData; params: IParams };
+  parameters: { context: IParams; data: IData[]; params: IParams };
 
   /**
    * 上下文
@@ -38,7 +39,7 @@ export class DELogicContext {
   /**
    * 数据
    */
-  get data(): IData {
+  get data(): IData[] {
     return this.parameters.data;
   }
 
@@ -64,10 +65,10 @@ export class DELogicContext {
   constructor(
     private deLogicParams: Map<string, DELogicParam>,
     context: IParams,
-    data: IData,
+    data: IData | IData[],
     params: IParams,
   ) {
-    this.parameters = { context, data, params };
+    this.parameters = { context, data: isArray(data) ? data : [data], params };
   }
 
   /**

package/src/de-logic/de-logic-link/de-logic-link.ts

@@ -68,6 +68,6 @@ export class DELogicLink {
       return true;
     }
     // 常规
-    return this.groupCond.test(ctx, ctx.context, ctx.data || {});
+    return this.groupCond.test(ctx, ctx.context, ctx.data[0] || {});
   }
 }

package/src/de-logic/de-logic-param/de-logic-param.ts

@@ -35,7 +35,12 @@ export class DELogicParam {
     const tag = this.model.id!;
     const m = this.model;
     if (m.default) {
-      ctx.params[tag] = ctx.data || {};
+      // 配置了列表的拿数组数据
+      if (m.entityListParam) {
+        ctx.params[tag] = ctx.data || [];
+      } else {
+        ctx.params[tag] = ctx.data[0] || {};
+      }
     } else if (m.appGlobalParam) {
       // 应用全局变量
       ctx.params[tag] = clone(ibiz.env);

package/src/de-logic/de-logic.ts

@@ -168,7 +168,11 @@ export class DELogic {
    * @param {IParams} [opt]
    * @return {*}  {Promise<IData>}
    */
-  async exec(context: IParams, data: IData, params: IParams): Promise<unknown> {
+  async exec(
+    context: IParams,
+    data: IData | IData[],
+    params: IParams,
+  ): Promise<unknown> {
     if (this.scriptFn) {
       return this.scriptFn.exec({ context, data, params });
     }

package/src/de-logic/index.ts

@@ -1,5 +1,7 @@
 import { HttpError, HttpResponse, RuntimeError } from '@ibiz-template/core';
 import { IAppDataEntity, IAppDELogic } from '@ibiz/model-core';
+import { isArray } from 'lodash-es';
+import { clone } from 'ramda';
 import { filterFieldLogics, findDELogic } from '../model';
 import { DELogic } from './de-logic';
 
@@ -42,12 +44,13 @@ async function findDeLogic(
 export async function execDELogic(
   deDELogic: IAppDELogic,
   context: IParams,
-  data: IData,
-  params: IParams,
+  data: IData | IData[] = {},
+  params: IParams = {},
 ): Promise<unknown> {
   if (!deLogicMap.has(deDELogic)) {
     deLogicMap.set(deDELogic, new DELogic(deDELogic));
   }
+
   const deLogic = deLogicMap.get(deDELogic)!;
   return deLogic.exec(context, data, params);
 }
@@ -97,11 +100,15 @@ export async function execDELogicById(
 export async function execDELogicAction(
   deDELogic: IAppDELogic,
   context: IParams,
-  data: IData,
-  params: IParams,
+  data?: IData | IData[],
+  params?: IParams,
 ): Promise<HttpResponse<IData>> {
+  const _context = clone(context);
+  const _data = data ? clone(data) : data;
+  const _params = params ? clone(params) : params;
+
   try {
-    const result = await execDELogic(deDELogic, context, data, params);
+    const result = await execDELogic(deDELogic, _context, _data, _params);
     return new HttpResponse(result);
   } catch (err) {
     if (err instanceof HttpError) {
@@ -112,9 +119,9 @@ export async function execDELogicAction(
 }
 
 /**
- * 执行属性实体逻辑
+ * 执行属性实体逻辑（单条数据）
  * @author lxm
- * @date 2023-06-14 12:29:56
+ * @date 2023-10-19 04:00:15
  * @export
  * @param {IAppDataEntity} entity
  * @param {('compute' | 'change' | 'default')} type
@@ -123,7 +130,7 @@ export async function execDELogicAction(
  * @param {IParams} params
  * @return {*}  {Promise<void>}
  */
-export async function execFieldLogics(
+async function execSingleFieldLogics(
   entity: IAppDataEntity,
   type: 'compute' | 'change' | 'default',
   context: IParams,
@@ -142,3 +149,37 @@ export async function execFieldLogics(
     });
   }
 }
+
+/**
+ * 执行属性实体逻辑(单条或者多条)
+ * @author lxm
+ * @date 2023-06-14 12:29:56
+ * @export
+ * @param {IAppDataEntity} entity
+ * @param {('compute' | 'change' | 'default')} type
+ * @param {IParams} context
+ * @param {IData | IData[]} data 单条或多条数据
+ * @param {IParams} params
+ * @return {*}  {Promise<void>}
+ */
+export async function execFieldLogics(
+  entity: IAppDataEntity,
+  type: 'compute' | 'change' | 'default',
+  context: IParams,
+  data: IData | IData[],
+  params: IParams = {},
+): Promise<void> {
+  if (!data) {
+    return;
+  }
+
+  if (isArray(data)) {
+    await Promise.all(
+      data.map(item =>
+        execSingleFieldLogics(entity, type, context, item, params),
+      ),
+    );
+    return;
+  }
+  return execSingleFieldLogics(entity, type, context, data, params);
+}

package/src/engine/md-view.engine.ts

@@ -12,6 +12,7 @@ import {
   ISearchBarController,
   MDCtrlLoadParams,
   EventBase,
+  IUIActionResult,
 } from '../interface';
 import { calcDeCodeNameById } from '../model';
 import { ViewEngineBase } from './view-base.engine';
@@ -162,12 +163,10 @@ export class MDViewEngine extends ViewEngineBase {
       return null;
     }
     if (key === SysUIActionTag.EDIT || key === SysUIActionTag.VIEW) {
-      await this.openData(args!);
-      return null;
+      return this.openData(args!);
     }
     if (key === SysUIActionTag.NEW) {
-      await this.newData(args!);
-      return null;
+      return this.newData(args!);
     }
     if (key === SysUIActionTag.REMOVE) {
       await this.remove(args);
@@ -214,7 +213,7 @@ export class MDViewEngine extends ViewEngineBase {
     event?: MouseEvent;
     context?: IContext;
     params?: IParams;
-  }): Promise<void> {
+  }): Promise<IUIActionResult> {
     const { data, event } = args;
 
     // 添加选中数据的主键
@@ -233,10 +232,12 @@ export class MDViewEngine extends ViewEngineBase {
       view: this.view,
     });
 
-    if (result instanceof Object && result.ok) {
-      this.refresh();
-    } else if (result === -1) {
-      ibiz.log.warn(`视图[${this.view.model.codeName}]，未配置编辑打开视图`);
+    if (result === -1) {
+      throw new RuntimeModelError(this.view.model, `缺少newdata的视图逻辑`);
+    } else {
+      return {
+        cancel: !result.ok,
+      };
     }
   }
 
@@ -253,7 +254,7 @@ export class MDViewEngine extends ViewEngineBase {
     data: IData[];
     event?: MouseEvent;
     copyMode?: boolean;
-  }): Promise<void> {
+  }): Promise<IUIActionResult> {
     const { data, event, copyMode } = args;
     const openAppViewLogic =
       this.view.model.viewLayoutPanel?.appViewLogics?.find(
@@ -276,10 +277,12 @@ export class MDViewEngine extends ViewEngineBase {
       view: this.view,
     });
 
-    if (result instanceof Object && result.ok) {
-      this.refresh();
-    } else if (result === -1) {
+    if (result === -1) {
       throw new RuntimeModelError(this.view.model, `缺少newdata的视图逻辑`);
+    } else {
+      return {
+        cancel: !result.ok,
+      };
     }
   }
 

package/src/hub/config/app-view-config-service.ts

@@ -7,7 +7,11 @@ export class AppViewConfigService implements IAppViewConfigService {
    * @author lxm
    * @date 2023-07-03 07:08:33
    */
-  viewConfigs = new Map<string, IViewConfig>();
+  protected viewConfigs = new Map<string, IViewConfig>();
+
+  has(key: string): boolean {
+    return this.viewConfigs.has(key);
+  }
 
   set(id: string, viewConfig: IViewConfig): void {
     this.viewConfigs.set(id, viewConfig);
@@ -33,4 +37,11 @@ export class AppViewConfigService implements IAppViewConfigService {
     }
     return this.viewConfigs.get(key)!;
   }
+
+  getSync(key: string): IViewConfig | null {
+    if (this.viewConfigs.has(key)) {
+      return this.viewConfigs.get(key)!;
+    }
+    return null;
+  }
 }