@ibiz-template/runtime 0.1.36 → 0.1.38

package/out/service/utils/dynamic-code-list/dynamic-code-list.js

@@ -1,5 +1,6 @@
 import { ModelError, RuntimeModelError } from '@ibiz-template/core';
 import { isNil } from 'ramda';
+import { ScriptFactory } from '../../../utils';
 /**
  * 动态代码表缓存对象
  *
@@ -61,16 +62,45 @@ export class DynamicCodeListCache {
      * @returns {*}
      */
     convertData(data) {
-        // todo 根据模型转换
         const result = {};
+        const { valueAppDEFieldId, textAppDEFieldId, iconClsAppDEFieldId, iconClsXAppDEFieldId, iconPathAppDEFieldId, iconPathXAppDEFieldId, disableAppDEFieldId, dataAppDEFieldId, } = this.codeList;
         // 值属性
-        const { valueAppDEFieldId, textAppDEFieldId } = this.codeList;
         const value = valueAppDEFieldId ? data[valueAppDEFieldId] : data.srfkey;
         result.id = value;
         result.value = value;
         // 文本属性
         result.text = textAppDEFieldId ? data[textAppDEFieldId] : data.srfmajortext;
-        return Object.freeze(result);
+        if (iconClsAppDEFieldId ||
+            iconClsXAppDEFieldId ||
+            iconPathAppDEFieldId ||
+            iconPathXAppDEFieldId) {
+            result.sysImage = {};
+            // 图标样式属性
+            if (iconClsAppDEFieldId) {
+                result.sysImage.cssClass = data[iconClsAppDEFieldId];
+            }
+            // 图标样式(倍数)属性
+            if (iconClsXAppDEFieldId) {
+                result.sysImage.cssClassX = data[iconClsXAppDEFieldId];
+            }
+            // 图标路径属性
+            if (iconPathAppDEFieldId) {
+                result.sysImage.imagePath = data[iconPathAppDEFieldId];
+            }
+            // 图标路径(倍数)属性
+            if (iconPathXAppDEFieldId) {
+                result.sysImage.imagePathX = data[iconPathXAppDEFieldId];
+            }
+        }
+        // 禁止选择属性
+        if (disableAppDEFieldId) {
+            result.disableSelect = data[disableAppDEFieldId];
+        }
+        // 数据属性
+        if (dataAppDEFieldId && data[dataAppDEFieldId]) {
+            result.data = ScriptFactory.execSingleLine(data[dataAppDEFieldId]);
+        }
+        return result;
     }
     /**
      * 加载服务获取数据，返回代码项
@@ -84,17 +114,23 @@ export class DynamicCodeListCache {
      */
     async load(context = {}, params = {}) {
         const app = ibiz.hub.getApp(context.srfappid);
+        const { appDataEntityId, appDEDataSetId, minorSortAppDEFieldId, minorSortDir, pvalueAppDEFieldId, } = this.codeList;
         // *预定义加载
         // 特殊处理，避免预置代码表加载不全
         if (!params.size) {
             params = Object.assign(Object.assign({}, params), { size: 10000 });
         }
+        // 排序
+        if (minorSortAppDEFieldId && minorSortDir) {
+            Object.assign(params, {
+                sort: `${minorSortAppDEFieldId.toLowerCase()},${minorSortDir.toLowerCase()}`,
+            });
+        }
         if (this.isPredefined) {
             const res = await app.net.get(`/dictionaries/codelist/${this.codeList.codeName}`, params);
             return Object.freeze(res.data.items);
         }
         // *加载实体服务数据
-        const { appDataEntityId, appDEDataSetId } = this.codeList;
         if (!appDataEntityId) {
             throw new RuntimeModelError(this.codeList, '未配置应用实体');
         }
@@ -104,12 +140,44 @@ export class DynamicCodeListCache {
         const res = await app.deService.exec(appDataEntityId, appDEDataSetId, context, {}, params);
         let resultItems = [];
         if (res.data.length) {
-            resultItems = res.data.map((item) => {
-                return this.convertData(item);
+            res.data.forEach((item) => {
+                if (pvalueAppDEFieldId) {
+                    const tempItems = this.prepareTreeData(res.data);
+                    if (tempItems) {
+                        resultItems = tempItems;
+                    }
+                }
+                else {
+                    resultItems.push(this.convertData(item));
+                }
             });
-            // todo 动态树形代码表
         }
-        return resultItems;
+        return Object.freeze(resultItems);
+    }
+    /**
+     * 组装树形代码表数据
+     *
+     * @return {codeListItem[] | undefined}
+     */
+    prepareTreeData(items, pValue) {
+        const { pvalueAppDEFieldId } = this.codeList;
+        let filteredData = [];
+        filteredData = items.filter(item => {
+            if (pValue) {
+                // 有传父value去后台数据里找出来子项pValue等于父value的
+                return item[pvalueAppDEFieldId] === pValue;
+            }
+            // 没有传父value，只需要找出来没有父值属性的
+            return !item[pvalueAppDEFieldId];
+        });
+        if (filteredData.length === 0) {
+            return;
+        }
+        return filteredData.map(data => {
+            const tempCodeListItem = this.convertData(data);
+            tempCodeListItem.children = this.prepareTreeData(items, tempCodeListItem.value);
+            return tempCodeListItem;
+        });
     }
     /**
      * 获取动态的代码项

package/out/ui-action/uiaction-util.js

@@ -54,13 +54,13 @@ export class UIActionUtil {
         else if (result.refresh) {
             switch (result.refreshMode) {
                 case 1:
-                    await params.view.callUIAction(SysUIActionTag.REFRESH);
+                    params.view.callUIAction(SysUIActionTag.REFRESH);
                     break;
                 case 2:
-                    await ((_a = params.view.parentView) === null || _a === void 0 ? void 0 : _a.callUIAction(SysUIActionTag.REFRESH));
+                    (_a = params.view.parentView) === null || _a === void 0 ? void 0 : _a.callUIAction(SysUIActionTag.REFRESH);
                     break;
                 case 3:
-                    await ((_b = params.view.getTopView()) === null || _b === void 0 ? void 0 : _b.callUIAction(SysUIActionTag.REFRESH));
+                    (_b = params.view.getTopView()) === null || _b === void 0 ? void 0 : _b.callUIAction(SysUIActionTag.REFRESH);
                     break;
                 default:
             }

package/out/ui-logic/ui-logic-param/ui-logic-param.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"ui-logic-param.d.ts","sourceRoot":"","sources":["../../../src/ui-logic/ui-logic-param/ui-logic-param.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,eAAe,EAAE,MAAM,kBAAkB,CAAC;AACnD,OAAO,EAAE,cAAc,EAAE,MAAM,qBAAqB,CAAC;AAErD;;;;;;;GAOG;AACH,qBAAa,YAAY;IAQJ,KAAK,EAAE,eAAe;IAPzC;;;;;;OAMG;gBACgB,KAAK,EAAE,eAAe;IAEzC;;;;;;OAMG;IACH,IAAI,CAAC,GAAG,EAAE,cAAc,GAAG,IAAI;IAsE/B;;;;;OAKG;IACH,KAAK,CAAC,GAAG,EAAE,cAAc,GAAG,IAAI;CAWjC"}
+{"version":3,"file":"ui-logic-param.d.ts","sourceRoot":"","sources":["../../../src/ui-logic/ui-logic-param/ui-logic-param.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,eAAe,EAAE,MAAM,kBAAkB,CAAC;AACnD,OAAO,EAAE,cAAc,EAAE,MAAM,qBAAqB,CAAC;AAErD;;;;;;;GAOG;AACH,qBAAa,YAAY;IAQJ,KAAK,EAAE,eAAe;IAPzC;;;;;;OAMG;gBACgB,KAAK,EAAE,eAAe;IAEzC;;;;;;OAMG;IACH,IAAI,CAAC,GAAG,EAAE,cAAc,GAAG,IAAI;IA2E/B;;;;;OAKG;IACH,KAAK,CAAC,GAAG,EAAE,cAAc,GAAG,IAAI;CAWjC"}

package/out/ui-logic/ui-logic-param/ui-logic-param.js

@@ -37,7 +37,13 @@ export class UILogicParam {
             return;
         }
         if (m.default) {
-            ctx.params[tag] = data && data.length > 0 ? data[0] : {};
+            // 配置了数据对象列表的，default给数组格式的数据
+            if (m.entityListParam) {
+                ctx.params[tag] = data || [];
+            }
+            else {
+                ctx.params[tag] = data && data.length > 0 ? data[0] : {};
+            }
         }
         else if (m.activeContainerParam) {
             ctx.params[tag] = parameters.ctrl || parameters.view;

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

@@ -22,5 +22,15 @@ export declare class ScriptFactory {
      * @return {*}
      */
     static execScriptFn(args: IParams, scriptCode: string, options?: IScriptFunctionOpts): unknown;
+    /**
+     * 执行单行脚本
+     * @author lxm
+     * @date 2023-10-20 03:20:56
+     * @static
+     * @param {string} scriptCode 脚本字符串
+     * @param {IParams} [args={}] 作用域变量参数对象
+     * @return {*}  {unknown}
+     */
+    static execSingleLine(scriptCode: string, args?: IParams): unknown;
 }
 //# sourceMappingURL=script-factory.d.ts.map

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.36",
+  "version": "0.1.38",
   "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.1.38",
     "@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": "d19f35594e34c2e934ae10d094c47c92faa25a8f"
+  "gitHead": "34f9f520b9b49b6666e6098d2fd4c3b35654fdb7"
 }

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/constant/view-call-tag.ts

@@ -23,4 +23,8 @@ export enum ViewCallTag {
    * 校验数据（编辑视图才用）
    */
   'VALIDATE' = 'Validate',
+  /**
+   * 切换折叠（首页视图才用）
+   */
+  'TOGGLE_COLLAPSE' = 'ToggleCollapse',
 }

package/src/controller/control/dashboard/portlet/portlet-part/portlet-part.controller.ts

@@ -117,6 +117,8 @@ export class PortletPartController<T extends IDBPortletPart = IDBPortletPart>
   }
 
   protected async onInit(): Promise<void> {
+    this.onDataChange = this.onDataChange.bind(this);
+
     // 初始化布局参数
     const { layoutPos, sysCss } = this.model;
 

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/form/form-detail/form-item/form-item.controller.ts

@@ -16,7 +16,11 @@ import { getEditorProvider } from '../../../../../register';
 import { Srfuf } from '../../../../../service';
 import { filterValueRules } from '../../../../../utils';
 import { FormNotifyState } from '../../../../constant';
-import { generateRules, getDefaultValue } from '../../../../utils';
+import {
+  generateEditorRules,
+  generateRules,
+  getDefaultValue,
+} from '../../../../utils';
 
 export class FormItemController
   extends FormDetailController<IDEFormItem>
@@ -77,10 +81,10 @@ export class FormItemController
    * 值规则
    *
    * @author lxm
-   * @date 2022-09-01 22:09:49
-   * @type {IData}
+   * @date 2023-10-18 03:39:23
+   * @type {IData[]}
    */
-  rules: IData = [];
+  rules: IData[] = [];
 
   /**
    * 表单项名称
@@ -206,16 +210,25 @@ export class FormItemController
    * @returns {*}
    */
   protected async initRules(): Promise<void> {
+    this.rules = [];
     const formItemsVRs = filterValueRules(
       this.form.model.deformItemVRs || [],
       this.name,
     );
-    if (!formItemsVRs) {
-      return;
+    if (formItemsVRs) {
+      this.rules.push(
+        ...generateRules(formItemsVRs, this.name, this.valueItemName),
+      );
+    }
+
+    if (this.model.editor) {
+      this.rules.push(...generateEditorRules(this.model.editor));
+    }
+
+    if (this.rules.length > 0) {
+      // 初始化async-validator实例
+      this.validator = new Schema({ [this.name]: this.rules });
     }
-    this.rules = generateRules(formItemsVRs, this.name, this.valueItemName);
-    // 初始化async-validator实例
-    this.validator = new Schema({ [this.name]: this.rules });
   }
 
   /**

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/grid/grid-column/grid-field-edit-column/grid-field-edit-column.controller.ts

@@ -13,7 +13,7 @@ import { getEditorProvider } from '../../../../../register';
 import { Srfuf } from '../../../../../service';
 import { filterValueRules } from '../../../../../utils';
 import { GridNotifyState } from '../../../../constant';
-import { generateRules } from '../../../../utils';
+import { generateEditorRules, generateRules } from '../../../../utils';
 import { GridRowState } from '../../grid/grid-row.state';
 import { GridFieldColumnController } from '../grid-field-column';
 
@@ -58,10 +58,10 @@ export class GridFieldEditColumnController
    * 值规则
    *
    * @author lxm
-   * @date 2022-09-01 22:09:49
-   * @type {IData}
+   * @date 2023-10-18 03:39:40
+   * @type {IData[]}
    */
-  rules: IData = [];
+  rules: IData[] = [];
 
   /**
    * 表格编辑项校验器实例
@@ -159,20 +159,25 @@ export class GridFieldEditColumnController
    * @returns {*}
    */
   protected async initRules(): Promise<void> {
+    this.rules = [];
     const editItemsVRs = filterValueRules(
       this.grid.model.degridEditItemVRs || [],
       this.fieldName,
     );
-    if (!editItemsVRs) {
-      return;
+    if (editItemsVRs) {
+      this.rules.push(
+        ...generateRules(editItemsVRs, this.fieldName, this.valueItemName),
+      );
+    }
+
+    if (this.editItem.editor) {
+      this.rules.push(...generateEditorRules(this.editItem.editor));
+    }
+
+    if (this.rules.length > 0) {
+      // 初始化async-validator实例
+      this.validator = new Schema({ [this.fieldName]: this.rules });
     }
-    this.rules = generateRules(
-      editItemsVRs,
-      this.fieldName,
-      this.valueItemName,
-    );
-    // 初始化async-validator实例
-    this.validator = new Schema({ [this.fieldName]: this.rules });
   }
 
   /**

package/src/controller/control/index.ts

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

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

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