@ibiz-template/runtime 0.6.18 → 0.7.0

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

@@ -1,7 +1,9 @@
-import { ModelError, RuntimeModelError } from '@ibiz-template/core';
-import { isNil } from 'ramda';
+import { IBizContext, ModelError, RuntimeModelError, } from '@ibiz-template/core';
+import { clone, isNil } from 'ramda';
+import { QXEvent, notNilEmpty } from 'qx-util';
 import { convertNavData, ScriptFactory } from '../../../utils';
 import { fieldValueToBoolean } from '../../utils';
+import { calcDeCodeNameById } from '../../../model';
 /**
  * 动态代码表缓存对象
  *
@@ -29,7 +31,56 @@ export class DynamicCodeListCache {
          * @type {boolean}
          */
         this.isPredefined = false;
+        /**
+         * 应用上下文
+         *
+         * @author tony001
+         * @date 2024-04-10 15:04:25
+         * @protected
+         * @type {IContext}
+         */
+        this.context = IBizContext.create();
+        /**
+         * 视图参数
+         *
+         * @author tony001
+         * @date 2024-04-10 15:04:39
+         * @protected
+         * @type {IParams}
+         */
+        this.params = {};
+        /**
+         * 事件对象
+         *
+         * @author tony001
+         * @date 2024-04-10 17:04:00
+         * @protected
+         */
+        this.evt = new QXEvent();
         this.codeList = codeList;
+        // 动态代码表监听数据变化
+        this.codelistChange = this.codelistChange.bind(this);
+        const { appDataEntityId, appDEDataSetId } = this.codeList;
+        if (appDataEntityId && appDEDataSetId) {
+            ibiz.mc.command.change.on(this.codelistChange);
+        }
+    }
+    /**
+     * 设置上下文以及查询参数
+     *
+     * @author tony001
+     * @date 2024-04-10 15:04:04
+     * @protected
+     * @param {IContext} [context]
+     * @param {IParams} [params]
+     */
+    setParams(context, params) {
+        if (context) {
+            this.context = clone(context);
+        }
+        if (params) {
+            this.params = clone(params);
+        }
     }
     /**
      * 初始化
@@ -148,6 +199,7 @@ export class DynamicCodeListCache {
      * @returns {*}  {Promise<CodeListItem[]>}
      */
     async load(context, params = {}) {
+        this.setParams(context, params);
         const app = ibiz.hub.getApp(context.srfappid);
         const { appDataEntityId, appDEDataSetId, minorSortAppDEFieldId, minorSortDir, pvalueAppDEFieldId, customCond, } = this.codeList;
         // *处理查询参数
@@ -283,4 +335,77 @@ export class DynamicCodeListCache {
         delete cacheData.promise;
         return result;
     }
+    /**
+     * 接受代码表实体数据变更，刷新代码表
+     *
+     * @author tony001
+     * @date 2024-04-10 15:04:42
+     * @protected
+     * @param {IPortalMessage} msg
+     */
+    codelistChange(msg) {
+        const data = msg.data;
+        const { appDataEntityId } = this.codeList;
+        if (appDataEntityId) {
+            const codeName = calcDeCodeNameById(appDataEntityId);
+            if (data &&
+                data.srfdecodename &&
+                data.srfdecodename.toLowerCase() === codeName) {
+                this.refresh();
+            }
+        }
+    }
+    /**
+     * 刷新代码表数据
+     *
+     * @author tony001
+     * @date 2024-04-10 17:04:20
+     * @return {*}  {Promise<void>}
+     */
+    async refresh() {
+        // 删除缓存数据
+        const key = JSON.stringify(this.context) + JSON.stringify(this.params);
+        this.cache.delete(key);
+        // 重新加载数据
+        const result = await this.get(this.context, this.params);
+        this.evt.emit('change', result);
+    }
+    /**
+     * 代码表数据变更事件监听
+     *
+     * @author tony001
+     * @date 2024-04-10 17:04:52
+     * @param {(data: CodeListItem[]) => void} fn
+     * @param {boolean} [immediate=true] 当有数据时，立即触发一次回调
+     */
+    onChange(fn, immediate = true) {
+        this.evt.on('change', fn);
+        const key = JSON.stringify(this.context) + JSON.stringify(this.params);
+        const cacheData = this.cache.get(key);
+        if (immediate && notNilEmpty(cacheData)) {
+            fn(cacheData.items);
+        }
+    }
+    /**
+     * 取消代码表数据变更监听
+     *
+     * @author tony001
+     * @date 2024-04-10 17:04:57
+     * @param {(data: CodeListItem[]) => void} fn
+     */
+    offChange(fn) {
+        this.evt.off('change', fn);
+    }
+    /**
+     * 销毁(取消数据变更监听)
+     *
+     * @author tony001
+     * @date 2024-04-10 15:04:11
+     */
+    destroy() {
+        const { appDataEntityId, appDEDataSetId } = this.codeList;
+        if (appDataEntityId && appDEDataSetId) {
+            ibiz.mc.command.change.off(this.codelistChange);
+        }
+    }
 }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@ibiz-template/runtime",
-  "version": "0.6.18",
+  "version": "0.7.0",
   "description": "控制器包",
   "type": "module",
   "main": "out/index.js",
@@ -35,7 +35,7 @@
     "animejs": "^3.2.2"
   },
   "devDependencies": {
-    "@ibiz-template/core": "^0.6.18",
+    "@ibiz-template/core": "^0.7.0",
     "@ibiz/model-core": "^0.1.20",
     "@types/animejs": "^3.1.12",
     "@types/path-browserify": "^1.0.2",

package/out/controller/control/search-bar/use-searchcond.d.ts

@@ -1,33 +0,0 @@
-import { IFilterNode } from '../../../interface';
-/**
- * 获取初始过滤项树节点数据集合
- * @return {*}
- * @author: zhujiamin
- * @Date: 2023-12-21 17:29:47
- */
-export declare function getOriginFilterNodes(): IFilterNode[];
-/**
- * 格式化过滤项 （后续如果修改这里的逻辑记得把下方的反推函数parseFilters也跟着修改！）
- * @author lxm
- * @date 2023-10-16 03:45:41
- * @param {IFilterNode} node
- * @return {*}  {IData}
- */
-export declare function formatFilters(node: IFilterNode): IData;
-/**
- * 根据格式化后的过滤项反推出过滤项树节点数据集合
- * @param {IData} data
- * @return {*}
- * @author: zhujiamin
- * @Date: 2023-12-28 09:47:45
- */
-export declare function parseFilters(data: IData): IFilterNode;
-/**
- * 根据filterNodes计算出SearchConds
- * @param {IData} data
- * @return {*}
- * @author: zhujiamin
- * @Date: 2023-12-28 09:47:45
- */
-export declare function calcSearchConds(filterNodes: IFilterNode[]): IData[] | undefined;
-//# sourceMappingURL=use-searchcond.d.ts.map

package/out/controller/control/search-bar/use-searchcond.d.ts.map

@@ -1 +0,0 @@
-{"version":3,"file":"use-searchcond.d.ts","sourceRoot":"","sources":["../../../../src/controller/control/search-bar/use-searchcond.ts"],"names":[],"mappings":"AAEA,OAAO,EAAmB,WAAW,EAAE,MAAM,oBAAoB,CAAC;AAKlE;;;;;GAKG;AACH,wBAAgB,oBAAoB,IAAI,WAAW,EAAE,CAQpD;AAED;;;;;;GAMG;AACH,wBAAgB,aAAa,CAAC,IAAI,EAAE,WAAW,GAAG,KAAK,CA+BtD;AAED;;;;;;GAMG;AACH,wBAAgB,YAAY,CAAC,IAAI,EAAE,KAAK,GAAG,WAAW,CA+BrD;AAED;;;;;;GAMG;AACH,wBAAgB,eAAe,CAC7B,WAAW,EAAE,WAAW,EAAE,GACzB,KAAK,EAAE,GAAG,SAAS,CAoBrB"}

package/out/controller/control/search-bar/use-searchcond.js

@@ -1,117 +0,0 @@
-import { RuntimeError, recursiveIterate } from '@ibiz-template/core';
-import { isNil } from 'ramda';
-import { ValueOP } from '../../../constant';
-const ExcludeOPs = [ValueOP.IS_NULL, ValueOP.IS_NOT_NULL];
-/**
- * 获取初始过滤项树节点数据集合
- * @return {*}
- * @author: zhujiamin
- * @Date: 2023-12-21 17:29:47
- */
-export function getOriginFilterNodes() {
-    return [
-        {
-            leaf: false,
-            logicType: 'AND',
-            children: [{ leaf: true, field: null, valueOP: null, value: null }],
-        },
-    ];
-}
-/**
- * 格式化过滤项 （后续如果修改这里的逻辑记得把下方的反推函数parseFilters也跟着修改！）
- * @author lxm
- * @date 2023-10-16 03:45:41
- * @param {IFilterNode} node
- * @return {*}  {IData}
- */
-export function formatFilters(node) {
-    if (!node.leaf) {
-        if (node.logicType === 'ITEMS') {
-            return {
-                condtype: 'ITEMS',
-                fieldname: node.field,
-                condop: node.valueOP,
-                searchconds: node.children.map(item => formatFilters(item)),
-            };
-        }
-        return {
-            condtype: 'GROUP',
-            condop: node.logicType,
-            bnotmode: false,
-            searchconds: node.children.map(item => formatFilters(item)),
-        };
-    }
-    const leafNode = node;
-    const temp = {
-        condtype: 'DEFIELD',
-        fieldname: node.field,
-        condop: node.valueOP,
-        value: node.value,
-    };
-    if (leafNode.valueItem) {
-        temp.valueItem = leafNode.valueItem;
-    }
-    return temp;
-}
-/**
- * 根据格式化后的过滤项反推出过滤项树节点数据集合
- * @param {IData} data
- * @return {*}
- * @author: zhujiamin
- * @Date: 2023-12-28 09:47:45
- */
-export function parseFilters(data) {
-    if (data.condtype === 'GROUP') {
-        return {
-            leaf: false,
-            logicType: data.condop === 'AND' ? 'AND' : 'OR',
-            children: (data.searchconds || []).map((item) => parseFilters(item)),
-        };
-    }
-    if (data.condtype === 'ITEMS') {
-        return {
-            leaf: false,
-            logicType: 'ITEMS',
-            field: data.fieldname || null,
-            valueOP: data.condop || null,
-            children: (data.searchconds || []).map((item) => parseFilters(item)),
-        };
-    }
-    if (data.condtype === 'DEFIELD') {
-        return {
-            leaf: true,
-            field: data.fieldname || null,
-            valueOP: data.condop || null,
-            value: data.value || null,
-            valueItem: data.valueItem || undefined,
-        };
-    }
-    throw new RuntimeError(`无效的condtype:${data.condtype}`);
-}
-/**
- * 根据filterNodes计算出SearchConds
- * @param {IData} data
- * @return {*}
- * @author: zhujiamin
- * @Date: 2023-12-28 09:47:45
- */
-export function calcSearchConds(filterNodes) {
-    let hasFilter = false; // 是否有过滤项
-    let hasError = false; // 是否有过滤项格式不正确
-    recursiveIterate(filterNodes[0], (node) => {
-        if (node.leaf) {
-            if ((node.field && node.valueOP && !isNil(node.value)) ||
-                (node.field && node.valueOP && ExcludeOPs.includes(node.valueOP))) {
-                hasFilter = true;
-            }
-            else {
-                // 如果过滤项不给
-                hasError = true;
-            }
-        }
-    });
-    if (hasFilter && !hasError) {
-        const filter = [formatFilters(filterNodes[0])];
-        return filter;
-    }
-}

package/out/interface/controller/state/control/i-search-bar.state.d.ts

@@ -1,224 +0,0 @@
-import { ISearchBarGroup } from '@ibiz/model-core';
-import { IControlState } from './i-control.state';
-import { IColumnState } from './i-grid.state';
-export interface IFilterBranchNode {
-    /**
-     * 是否是叶子节点
-     * @author lxm
-     * @date 2023-10-12 05:14:28
-     * @type {boolean}
-     */
-    leaf: false;
-    /**
-     * 父节点的逻辑类型
-     * @author lxm
-     * @date 2023-10-12 05:21:18
-     * @type {('AND' | 'OR')}
-     */
-    logicType: 'AND' | 'OR' | 'ITEMS';
-    /**
-     * 实体属性名称
-     * @author lxm
-     * @date 2023-10-13 02:35:42
-     * @type {string}
-     */
-    field?: string | null;
-    /**
-     * 过滤项值
-     * @author lxm
-     * @date 2023-10-12 05:16:52
-     * @type {unknown}
-     */
-    value?: unknown;
-    /**
-     * 值操作类型
-     * @author lxm
-     * @date 2023-10-12 05:27:07
-     * @type {string}
-     */
-    valueOP?: string;
-    /**
-     * 子节点数据集合
-     * @author lxm
-     * @date 2023-10-12 05:18:19
-     * @type {IFilterTreeNode[]}
-     */
-    children: IFilterNode[];
-}
-export interface IFilterLeafNode {
-    /**
-     * 是否是叶子节点
-     * @author lxm
-     * @date 2023-10-12 05:14:28
-     * @type {boolean}
-     */
-    leaf: true;
-    /**
-     * 实体属性名称
-     * @author lxm
-     * @date 2023-10-13 02:35:42
-     * @type {string}
-     */
-    field: string | null;
-    /**
-     * 过滤项值
-     * @author lxm
-     * @date 2023-10-12 05:16:52
-     * @type {unknown}
-     */
-    value: unknown | null;
-    /**
-     * 值操作类型
-     * @author lxm
-     * @date 2023-10-12 05:27:07
-     * @type {string}
-     */
-    valueOP: string | null;
-    /**
-     * 禁用，禁止修改
-     * @author lxm
-     * @date 2024-02-01 02:51:40
-     * @type {boolean}
-     */
-    disabled?: boolean;
-    /**
-     * 值项的值
-     * @author lxm
-     * @date 2024-02-04 06:40:17
-     * @type {unknown}
-     */
-    valueItem?: unknown;
-}
-export type IFilterNode = IFilterBranchNode | IFilterLeafNode;
-export interface ISearchBarState extends IControlState {
-    /**
-     * 快速搜索字符串
-     * @return {*}
-     * @author: zhujiamin
-     * @Date: 2023-06-01 17:51:04
-     */
-    query: string;
-    /**
-     * 是否显示
-     * @author lxm
-     * @date 2023-08-25 05:32:59
-     * @type {boolean}
-     */
-    visible: boolean;
-    /**
-     * 选中的分组项
-     * @author lxm
-     * @date 2023-08-25 05:32:59
-     * @type {boolean}
-     */
-    selectedGroupItem: ISearchBarGroup | null;
-    /**
-     * 过滤项树节点数据集合
-     * @author lxm
-     * @date 2023-10-12 05:16:12
-     * @type {IFilterNode[]}
-     */
-    filterNodes: IFilterNode[];
-    /**
-     * 选中的后台分组项
-     * @return {*}
-     * @author: zhujiamin
-     * @Date: 2023-12-21 11:40:29
-     */
-    selectedSearchGroupItem: IBackendSearchBarGroup | null;
-    /**
-     * 搜索栏后台分组项
-     * @return {*}
-     * @author: zhujiamin
-     * @Date: 2023-12-19 14:45:33
-     */
-    searchBarGroups: IBackendSearchBarGroup[];
-}
-/**
- * 搜索分组数据接口
- *
- */
-export interface ISearchGroupData {
-    /**
-     * 表格列状态
-     */
-    columnstates?: Array<IColumnState>;
-    /**
-     * 自定义搜索条件
-     */
-    searchconds?: IData[];
-    /**
-     * 表格排序查询条件
-     */
-    sort?: string;
-}
-/**
- * 后台分组接口
- *
- */
-export interface IBackendSearchBarGroup {
-    /**
-     * 唯一标识
-     * @return {*}
-     * @author: zhujiamin
-     * @Date: 2024-01-17 18:28:45
-     */
-    id?: string;
-    /**
-     * 标题
-     * @return {*}
-     * @author: zhujiamin
-     * @Date: 2023-12-22 14:25:09
-     */
-    caption?: string;
-    /**
-     * 分组项名称（模型的id, 新建的为viewtag___caption）
-     * @return {*}
-     * @author: zhujiamin
-     * @Date: 2023-12-22 14:25:09
-     */
-    name: string;
-    /**
-     * 是否保存过
-     * @return {*}
-     * @author: zhujiamin
-     * @Date: 2023-12-22 14:25:09
-     */
-    saved: boolean;
-    /**
-     * 是否显示
-     * @return {*}
-     * @author: zhujiamin
-     * @Date: 2023-12-21 11:36:54
-     */
-    show: boolean;
-    /**
-     * 分组排序值
-     * @return {*}
-     * @author: zhujiamin
-     * @Date: 2023-12-26 11:21:02
-     */
-    order: number;
-    /**
-     * 搜索分组数据
-     * @return {*}
-     * @author: zhujiamin
-     * @Date: 2023-12-21 11:24:21
-     */
-    searchGroupData: ISearchGroupData;
-    /**
-     * 是否默认选中
-     * @return {*}
-     * @author: zhujiamin
-     * @Date: 2023-12-21 11:24:21
-     */
-    defaultSelect?: boolean;
-    /**
-     * 是否不可编辑
-     * @return {*}
-     * @author: zhujiamin
-     * @Date: 2024-01-17 17:24:28
-     */
-    noEdit?: boolean;
-}
-//# sourceMappingURL=i-search-bar.state.d.ts.map

package/out/interface/controller/state/control/i-search-bar.state.d.ts.map

@@ -1 +0,0 @@
-{"version":3,"file":"i-search-bar.state.d.ts","sourceRoot":"","sources":["../../../../../src/interface/controller/state/control/i-search-bar.state.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,eAAe,EAAE,MAAM,kBAAkB,CAAC;AACnD,OAAO,EAAE,aAAa,EAAE,MAAM,mBAAmB,CAAC;AAClD,OAAO,EAAE,YAAY,EAAE,MAAM,gBAAgB,CAAC;AAE9C,MAAM,WAAW,iBAAiB;IAChC;;;;;OAKG;IACH,IAAI,EAAE,KAAK,CAAC;IAEZ;;;;;OAKG;IACH,SAAS,EAAE,KAAK,GAAG,IAAI,GAAG,OAAO,CAAC;IAElC;;;;;OAKG;IACH,KAAK,CAAC,EAAE,MAAM,GAAG,IAAI,CAAC;IAEtB;;;;;OAKG;IACH,KAAK,CAAC,EAAE,OAAO,CAAC;IAEhB;;;;;OAKG;IACH,OAAO,CAAC,EAAE,MAAM,CAAC;IAEjB;;;;;OAKG;IACH,QAAQ,EAAE,WAAW,EAAE,CAAC;CACzB;AAED,MAAM,WAAW,eAAe;IAC9B;;;;;OAKG;IACH,IAAI,EAAE,IAAI,CAAC;IAEX;;;;;OAKG;IACH,KAAK,EAAE,MAAM,GAAG,IAAI,CAAC;IAErB;;;;;OAKG;IACH,KAAK,EAAE,OAAO,GAAG,IAAI,CAAC;IAEtB;;;;;OAKG;IACH,OAAO,EAAE,MAAM,GAAG,IAAI,CAAC;IAEvB;;;;;OAKG;IACH,QAAQ,CAAC,EAAE,OAAO,CAAC;IAEnB;;;;;OAKG;IACH,SAAS,CAAC,EAAE,OAAO,CAAC;CACrB;AAED,MAAM,MAAM,WAAW,GAAG,iBAAiB,GAAG,eAAe,CAAC;AAE9D,MAAM,WAAW,eAAgB,SAAQ,aAAa;IACpD;;;;;OAKG;IACH,KAAK,EAAE,MAAM,CAAC;IAEd;;;;;OAKG;IACH,OAAO,EAAE,OAAO,CAAC;IAEjB;;;;;OAKG;IACH,iBAAiB,EAAE,eAAe,GAAG,IAAI,CAAC;IAE1C;;;;;OAKG;IACH,WAAW,EAAE,WAAW,EAAE,CAAC;IAE3B;;;;;OAKG;IACH,uBAAuB,EAAE,sBAAsB,GAAG,IAAI,CAAC;IAEvD;;;;;OAKG;IACH,eAAe,EAAE,sBAAsB,EAAE,CAAC;CAC3C;AAED;;;GAGG;AACH,MAAM,WAAW,gBAAgB;IAC/B;;OAEG;IACH,YAAY,CAAC,EAAE,KAAK,CAAC,YAAY,CAAC,CAAC;IAEnC;;OAEG;IACH,WAAW,CAAC,EAAE,KAAK,EAAE,CAAC;IAEtB;;OAEG;IACH,IAAI,CAAC,EAAE,MAAM,CAAC;CACf;AAED;;;GAGG;AACH,MAAM,WAAW,sBAAsB;IACrC;;;;;OAKG;IACH,EAAE,CAAC,EAAE,MAAM,CAAC;IAEZ;;;;;OAKG;IACH,OAAO,CAAC,EAAE,MAAM,CAAC;IAEjB;;;;;OAKG;IACH,IAAI,EAAE,MAAM,CAAC;IAEb;;;;;OAKG;IACH,KAAK,EAAE,OAAO,CAAC;IAEf;;;;;OAKG;IACH,IAAI,EAAE,OAAO,CAAC;IAEd;;;;;OAKG;IACH,KAAK,EAAE,MAAM,CAAC;IAEd;;;;;OAKG;IACH,eAAe,EAAE,gBAAgB,CAAC;IAElC;;;;;OAKG;IACH,aAAa,CAAC,EAAE,OAAO,CAAC;IAExB;;;;;OAKG;IACH,MAAM,CAAC,EAAE,OAAO,CAAC;CAClB"}