@ibiz-template/runtime 0.5.7-alpha.9 → 0.6.0-alpha.0

package/out/controller/control/search-bar/search-bar-filter.controller.d.ts

@@ -1,5 +1,6 @@
 import { IAppDataEntity, ISearchBarFilter } from '@ibiz/model-core';
-import { IEditorContainerController, IEditorController, IEditorProvider } from '../../../interface';
+import { IEditorContainerController, IEditorController, IEditorProvider, IFilterLeafNode } from '../../../interface';
+import { SearchBarController } from './search-bar.controller';
 /** 不需要编辑器的OP */
 export declare const ExcludeOPs: string[];
 /**
@@ -12,11 +13,11 @@ export declare const ExcludeOPs: string[];
  */
 export declare class SearchBarFilterController implements IEditorContainerController {
     model: ISearchBarFilter;
-    appDataEntity: IAppDataEntity;
+    protected searchbar: SearchBarController;
     unitName: string | undefined;
     valueFormat: string | undefined;
-    context: IContext;
-    params: IParams;
+    get context(): IContext;
+    get params(): IParams;
     dataType: number | undefined;
     /**
      * 编辑器控制器
@@ -61,7 +62,16 @@ export declare class SearchBarFilterController implements IEditorContainerContro
      * @type {boolean}
      */
     noEditor: boolean;
-    constructor(model: ISearchBarFilter, appDataEntity: IAppDataEntity, context: IContext, params: IParams);
+    /**
+     * 值项
+     * @author lxm
+     * @date 2024-02-04 06:25:42
+     * @readonly
+     * @type {(string | undefined)}
+     */
+    get valueItem(): string | undefined;
+    get appDataEntity(): IAppDataEntity;
+    constructor(model: ISearchBarFilter, searchbar: SearchBarController);
     /**
      * 初始化
      * @author lxm
@@ -69,5 +79,33 @@ export declare class SearchBarFilterController implements IEditorContainerContro
      * @return {*}  {Promise<void>}
      */
     init(): Promise<void>;
+    /**
+     * 格式化给多数据查询接口的值
+     * @author lxm
+     * @date 2024-02-04 11:31:32
+     * @param {*} value
+     * @return {*}  {*}
+     */
+    formatValue(node: IData): unknown;
+    /**
+     * 计算要递给编辑器的参数
+     * @author lxm
+     * @date 2024-02-04 06:35:28
+     * @param {IFilterLeafNode} node
+     * @return {*}  {{ value: unknown; data: IData }}
+     */
+    calcEditorProps(node: IFilterLeafNode): {
+        value: unknown;
+        data: IData;
+    };
+    /**
+     * 编辑器值变更处理
+     * @author lxm
+     * @date 2024-02-04 06:42:04
+     * @param {IFilterLeafNode} node
+     * @param {unknown} value
+     * @param {string} [name]
+     */
+    onEditorChange(node: IFilterLeafNode, value: unknown, name?: string): void;
 }
 //# sourceMappingURL=search-bar-filter.controller.d.ts.map

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

@@ -1 +1 @@
-{"version":3,"file":"search-bar-filter.controller.d.ts","sourceRoot":"","sources":["../../../../src/controller/control/search-bar/search-bar-filter.controller.ts"],"names":[],"mappings":"AACA,OAAO,EAEL,cAAc,EACd,gBAAgB,EACjB,MAAM,kBAAkB,CAAC;AAC1B,OAAO,EACL,0BAA0B,EAC1B,iBAAiB,EACjB,eAAe,EAChB,MAAM,oBAAoB,CAAC;AAK5B,gBAAgB;AAChB,eAAO,MAAM,UAAU,EAAE,MAAM,EAGrB,CAAC;AAEX;;;;;;;GAOG;AACH,qBAAa,yBAA0B,YAAW,0BAA0B;IA6DjE,KAAK,EAAE,gBAAgB;IACvB,aAAa,EAAE,cAAc;IA7DtC,QAAQ,EAAE,MAAM,GAAG,SAAS,CAAC;IAE7B,WAAW,EAAE,MAAM,GAAG,SAAS,CAAC;IAEhC,OAAO,EAAE,QAAQ,CAAC;IAElB,MAAM,EAAE,OAAO,CAAC;IAEhB,QAAQ,EAAE,MAAM,GAAG,SAAS,CAAC;IAE7B;;;;;;OAMG;IACH,MAAM,CAAC,EAAE,iBAAiB,CAAC;IAE3B;;;;;OAKG;IACH,cAAc,CAAC,EAAE,eAAe,CAAC;IAEjC;;;;;OAKG;IACH,SAAS,EAAE,MAAM,CAAC;IAElB;;;;;OAKG;IACH,KAAK,EAAE,MAAM,CAAC;IAEd;;;;;OAKG;IACH,OAAO,CAAC,EAAE,MAAM,CAAC;IAEjB;;;;;OAKG;IACH,QAAQ,EAAE,OAAO,CAAS;gBAGjB,KAAK,EAAE,gBAAgB,EACvB,aAAa,EAAE,cAAc,EACpC,OAAO,EAAE,QAAQ,EACjB,MAAM,EAAE,OAAO;IAyBjB;;;;;OAKG;IACG,IAAI,IAAI,OAAO,CAAC,IAAI,CAAC;CAe5B"}
+{"version":3,"file":"search-bar-filter.controller.d.ts","sourceRoot":"","sources":["../../../../src/controller/control/search-bar/search-bar-filter.controller.ts"],"names":[],"mappings":"AAEA,OAAO,EAEL,cAAc,EACd,gBAAgB,EACjB,MAAM,kBAAkB,CAAC;AAC1B,OAAO,EACL,0BAA0B,EAC1B,iBAAiB,EACjB,eAAe,EACf,eAAe,EAChB,MAAM,oBAAoB,CAAC;AAI5B,OAAO,EAAE,mBAAmB,EAAE,MAAM,yBAAyB,CAAC;AAG9D,gBAAgB;AAChB,eAAO,MAAM,UAAU,EAAE,MAAM,EAGrB,CAAC;AAIX;;;;;;;GAOG;AACH,qBAAa,yBAA0B,YAAW,0BAA0B;IAgFjE,KAAK,EAAE,gBAAgB;IAC9B,SAAS,CAAC,SAAS,EAAE,mBAAmB;IAhF1C,QAAQ,EAAE,MAAM,GAAG,SAAS,CAAC;IAE7B,WAAW,EAAE,MAAM,GAAG,SAAS,CAAC;IAEhC,IAAI,OAAO,IAAI,QAAQ,CAEtB;IAED,IAAI,MAAM,IAAI,OAAO,CAEpB;IAED,QAAQ,EAAE,MAAM,GAAG,SAAS,CAAC;IAE7B;;;;;;OAMG;IACH,MAAM,CAAC,EAAE,iBAAiB,CAAC;IAE3B;;;;;OAKG;IACH,cAAc,CAAC,EAAE,eAAe,CAAC;IAEjC;;;;;OAKG;IACH,SAAS,EAAE,MAAM,CAAC;IAElB;;;;;OAKG;IACH,KAAK,EAAE,MAAM,CAAC;IAEd;;;;;OAKG;IACH,OAAO,CAAC,EAAE,MAAM,CAAC;IAEjB;;;;;OAKG;IACH,QAAQ,EAAE,OAAO,CAAS;IAE1B;;;;;;OAMG;IACH,IAAI,SAAS,IAAI,MAAM,GAAG,SAAS,CAElC;IAED,IAAI,aAAa,IAAI,cAAc,CAElC;gBAGQ,KAAK,EAAE,gBAAgB,EACpB,SAAS,EAAE,mBAAmB;IAqB1C;;;;;OAKG;IACG,IAAI,IAAI,OAAO,CAAC,IAAI,CAAC;IAgB3B;;;;;;OAMG;IACH,WAAW,CAAC,IAAI,EAAE,KAAK,GAAG,OAAO;IAgBjC;;;;;;OAMG;IACH,eAAe,CAAC,IAAI,EAAE,eAAe,GAAG;QAAE,KAAK,EAAE,OAAO,CAAC;QAAC,IAAI,EAAE,KAAK,CAAA;KAAE;IAevE;;;;;;;OAOG;IACH,cAAc,CAAC,IAAI,EAAE,eAAe,EAAE,KAAK,EAAE,OAAO,EAAE,IAAI,CAAC,EAAE,MAAM,GAAG,IAAI;CAO3E"}

package/out/controller/control/search-bar/search-bar-filter.controller.js

@@ -1,12 +1,15 @@
+/* eslint-disable no-template-curly-in-string */
 import { RuntimeModelError } from '@ibiz-template/core';
 import { findFieldById } from '../../../model';
 import { getEditorProvider } from '../../../register';
 import { ValueOP } from '../../../constant';
+import { ScriptFactory } from '../../../utils';
 /** 不需要编辑器的OP */
 export const ExcludeOPs = [
     ValueOP.IS_NULL,
     ValueOP.IS_NOT_NULL,
 ];
+const ScriptValueRegex = /\$\{[^}]*\}/; // 匹配${xxx}格式字符串
 /**
  * 搜索栏过滤项控制器
  * @author lxm
@@ -16,10 +19,29 @@ export const ExcludeOPs = [
  * @implements {IEditorContainerController}
  */
 export class SearchBarFilterController {
-    constructor(model, appDataEntity, context, params) {
+    get context() {
+        return this.searchbar.context;
+    }
+    get params() {
+        return this.searchbar.params;
+    }
+    /**
+     * 值项
+     * @author lxm
+     * @date 2024-02-04 06:25:42
+     * @readonly
+     * @type {(string | undefined)}
+     */
+    get valueItem() {
+        return this.editor ? this.editor.valueItem : undefined;
+    }
+    get appDataEntity() {
+        return this.searchbar.appDataEntity;
+    }
+    constructor(model, searchbar) {
         var _a;
         this.model = model;
-        this.appDataEntity = appDataEntity;
+        this.searchbar = searchbar;
         /**
          * 不需要编辑器
          * @author lxm
@@ -27,13 +49,10 @@ export class SearchBarFilterController {
          * @type {boolean}
          */
         this.noEditor = false;
-        // 上下文、参数
-        this.context = context;
-        this.params = params;
         // 实体属性
         let field;
         if (model.appDEFieldId) {
-            field = findFieldById(appDataEntity, model.appDEFieldId);
+            field = findFieldById(this.appDataEntity, model.appDEFieldId);
         }
         this.fieldName = field ? field.codeName.toLowerCase() : model.id;
         // 属性标题
@@ -62,4 +81,58 @@ export class SearchBarFilterController {
             }
         }
     }
+    /**
+     * 格式化给多数据查询接口的值
+     * @author lxm
+     * @date 2024-02-04 11:31:32
+     * @param {*} value
+     * @return {*}  {*}
+     */
+    formatValue(node) {
+        const { value, valueItem } = node;
+        if (this.valueItem && valueItem) {
+            delete node.valueItem;
+            return valueItem;
+        }
+        // 脚本转换
+        if (ScriptValueRegex.test(value)) {
+            return ScriptFactory.execSingleLine(`\`${value}\``, Object.assign({}, this.searchbar.getEventArgs()));
+        }
+        return value;
+    }
+    /**
+     * 计算要递给编辑器的参数
+     * @author lxm
+     * @date 2024-02-04 06:35:28
+     * @param {IFilterLeafNode} node
+     * @return {*}  {{ value: unknown; data: IData }}
+     */
+    calcEditorProps(node) {
+        const tempData = {};
+        let editorValue = node.value;
+        if (node.disabled && ScriptValueRegex.test(editorValue)) {
+            editorValue = editorValue.replace('${context.srfpersonid}', '当前用户');
+            editorValue = editorValue.replace('${context.srforgid}', '当前组织');
+        }
+        if (this.valueItem) {
+            tempData[this.valueItem] = node.valueItem;
+        }
+        return { value: editorValue, data: tempData };
+    }
+    /**
+     * 编辑器值变更处理
+     * @author lxm
+     * @date 2024-02-04 06:42:04
+     * @param {IFilterLeafNode} node
+     * @param {unknown} value
+     * @param {string} [name]
+     */
+    onEditorChange(node, value, name) {
+        if (this.valueItem && name === this.valueItem) {
+            node.valueItem = value;
+        }
+        else {
+            node.value = value;
+        }
+    }
 }

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

@@ -121,6 +121,15 @@ export declare class SearchBarController extends ControlController<ISearchBar, I
      * @Date: 2023-06-01 18:08:18
      */
     onSearch(): void;
+    /**
+     * 找到过滤项控制器
+     * @author lxm
+     * @date 2024-02-04 11:29:31
+     * @param {(string | null)} fieldName
+     * @param {(string | null)} valueOP
+     * @return {*}  {(SearchBarFilterController | undefined)}
+     */
+    findFilterController(fieldName: string | null, valueOP: string | null): SearchBarFilterController | undefined;
     /**
      * 获取搜索栏的过滤参数（包括快速搜索，快速分组和过滤器的参数）
      * @author lxm
@@ -148,7 +157,7 @@ export declare class SearchBarController extends ControlController<ISearchBar, I
      * @date 2023-10-13 05:53:35
      * @return {*}  {IData}
      */
-    calcFilters(): IData[] | undefined;
+    calcFilters(valueFormat?: boolean): IData[] | undefined;
     /**
      * 初始化搜索栏分组项(获取后台分组清单并合并模型)
      * @return {*}

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

@@ -1 +1 @@
-{"version":3,"file":"search-bar.controller.d.ts","sourceRoot":"","sources":["../../../../src/controller/control/search-bar/search-bar.controller.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,cAAc,EAAE,UAAU,EAAE,gBAAgB,EAAE,MAAM,kBAAkB,CAAC;AAGhF,OAAO,EACL,eAAe,EACf,eAAe,EACf,oBAAoB,EACpB,sBAAsB,EACtB,eAAe,EAEhB,MAAM,oBAAoB,CAAC;AAE5B,OAAO,EAAE,iBAAiB,EAAE,MAAM,cAAc,CAAC;AACjD,OAAO,EAAE,yBAAyB,EAAE,MAAM,gCAAgC,CAAC;AAC3E,OAAO,EAAE,gBAAgB,EAAE,MAAM,sBAAsB,CAAC;AAWxD;;;;;;;;GAQG;AACH,qBAAa,mBACX,SAAQ,iBAAiB,CAAC,UAAU,EAAE,eAAe,EAAE,eAAe,CACtE,YAAW,oBAAoB;IAE/B;;;;;OAKG;IACH,WAAW,SAAM;IAEjB;;;;;OAKG;IACH,iBAAiB,EAAE,yBAAyB,EAAE,CAAM;IAEpD;;;;;OAKG;IACH,OAAO,EAAG,gBAAgB,CAAC;IAE3B;;;;;OAKG;IACH,gBAAgB,EAAE,sBAAsB,GAAG,IAAI,CAAQ;IAEvD;;;;;OAKG;IACH,oBAAoB,UAA8C;IAElE;;;;;OAKG;IACH,gBAAgB,UAAS;IAEzB;;;;;OAKG;IACH,IAAI,YAAY,IAAI,OAAO,CAE1B;IAED;;;;;OAKG;IACH,IAAI,gBAAgB,IAAI,gBAAgB,EAAE,CAEzC;IAED;;;;OAIG;IACH,gBAAgB,UAAS;IAEzB;;;;;OAKG;IACH,IAAI,IAAI,IAAI,eAAe,GAAG,SAAS,CAGtC;IAED;;;;;OAKG;IACH,aAAa,EAAG,cAAc,CAAC;IAE/B,SAAS,CAAC,SAAS,IAAI,IAAI;cAcX,SAAS,IAAI,OAAO,CAAC,IAAI,CAAC;IA2B1C;;;;;OAKG;IACG,kBAAkB,IAAI,OAAO,CAAC,IAAI,CAAC;IAwCzC;;;;;;OAMG;IACH,SAAS,CAAC,0BAA0B,IAAI,IAAI;IA2B5C;;;;;;OAMG;IACH,WAAW,CAAC,GAAG,EAAE,MAAM,GAAG,IAAI;IAI9B;;;;;OAKG;IACH,QAAQ,IAAI,IAAI;IAIhB;;;;;OAKG;IACH,eAAe,IAAI,OAAO;IA4B1B;;;;OAIG;IACH,WAAW,IAAI,IAAI;IAKnB;;;;;;OAMG;cACa,oBAAoB,IAAI,OAAO,CAAC,IAAI,CAAC;IAiBrD;;;;;OAKG;IACH,WAAW,IAAI,KAAK,EAAE,GAAG,SAAS;IA6BlC;;;;;OAKG;IACG,iBAAiB,CAAC,SAAS,GAAE,OAAe,GAAG,OAAO,CAAC,IAAI,CAAC;IAoGlE;;;;;OAKG;IACH,gBAAgB,IAAI,IAAI;IAWxB;;;;;OAKG;IACG,UAAU,IAAI,OAAO,CAAC,IAAI,CAAC;IAmCjC;;;;;OAKG;IACG,gBAAgB,CAAC,SAAS,EAAE,sBAAsB,GAAG,OAAO,CAAC,IAAI,CAAC;CA2CzE"}
+{"version":3,"file":"search-bar.controller.d.ts","sourceRoot":"","sources":["../../../../src/controller/control/search-bar/search-bar.controller.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,cAAc,EAAE,UAAU,EAAE,gBAAgB,EAAE,MAAM,kBAAkB,CAAC;AAGhF,OAAO,EACL,eAAe,EACf,eAAe,EACf,oBAAoB,EACpB,sBAAsB,EACtB,eAAe,EAEhB,MAAM,oBAAoB,CAAC;AAE5B,OAAO,EAAE,iBAAiB,EAAE,MAAM,cAAc,CAAC;AACjD,OAAO,EAAE,yBAAyB,EAAE,MAAM,gCAAgC,CAAC;AAC3E,OAAO,EAAE,gBAAgB,EAAE,MAAM,sBAAsB,CAAC;AAWxD;;;;;;;;GAQG;AACH,qBAAa,mBACX,SAAQ,iBAAiB,CAAC,UAAU,EAAE,eAAe,EAAE,eAAe,CACtE,YAAW,oBAAoB;IAE/B;;;;;OAKG;IACH,WAAW,SAAM;IAEjB;;;;;OAKG;IACH,iBAAiB,EAAE,yBAAyB,EAAE,CAAM;IAEpD;;;;;OAKG;IACH,OAAO,EAAG,gBAAgB,CAAC;IAE3B;;;;;OAKG;IACH,gBAAgB,EAAE,sBAAsB,GAAG,IAAI,CAAQ;IAEvD;;;;;OAKG;IACH,oBAAoB,UAA8C;IAElE;;;;;OAKG;IACH,gBAAgB,UAAS;IAEzB;;;;;OAKG;IACH,IAAI,YAAY,IAAI,OAAO,CAE1B;IAED;;;;;OAKG;IACH,IAAI,gBAAgB,IAAI,gBAAgB,EAAE,CAEzC;IAED;;;;OAIG;IACH,gBAAgB,UAAS;IAEzB;;;;;OAKG;IACH,IAAI,IAAI,IAAI,eAAe,GAAG,SAAS,CAGtC;IAED;;;;;OAKG;IACH,aAAa,EAAG,cAAc,CAAC;IAE/B,SAAS,CAAC,SAAS,IAAI,IAAI;cAcX,SAAS,IAAI,OAAO,CAAC,IAAI,CAAC;IA2B1C;;;;;OAKG;IACG,kBAAkB,IAAI,OAAO,CAAC,IAAI,CAAC;IAwCzC;;;;;;OAMG;IACH,SAAS,CAAC,0BAA0B,IAAI,IAAI;IA2B5C;;;;;;OAMG;IACH,WAAW,CAAC,GAAG,EAAE,MAAM,GAAG,IAAI;IAI9B;;;;;OAKG;IACH,QAAQ,IAAI,IAAI;IAIhB;;;;;;;OAOG;IACH,oBAAoB,CAClB,SAAS,EAAE,MAAM,GAAG,IAAI,EACxB,OAAO,EAAE,MAAM,GAAG,IAAI,GACrB,yBAAyB,GAAG,SAAS;IAUxC;;;;;OAKG;IACH,eAAe,IAAI,OAAO;IA4B1B;;;;OAIG;IACH,WAAW,IAAI,IAAI;IAKnB;;;;;;OAMG;cACa,oBAAoB,IAAI,OAAO,CAAC,IAAI,CAAC;IAYrD;;;;;OAKG;IACH,WAAW,CAAC,WAAW,UAAO,GAAG,KAAK,EAAE,GAAG,SAAS;IA4BpD;;;;;OAKG;IACG,iBAAiB,CAAC,SAAS,GAAE,OAAe,GAAG,OAAO,CAAC,IAAI,CAAC;IAoGlE;;;;;OAKG;IACH,gBAAgB,IAAI,IAAI;IAWxB;;;;;OAKG;IACG,UAAU,IAAI,OAAO,CAAC,IAAI,CAAC;IAmCjC;;;;;OAKG;IACG,gBAAgB,CAAC,SAAS,EAAE,sBAAsB,GAAG,OAAO,CAAC,IAAI,CAAC;CA2CzE"}

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

@@ -203,6 +203,23 @@ export class SearchBarController extends ControlController {
     onSearch() {
         this.evt.emit('onSearch', undefined);
     }
+    /**
+     * 找到过滤项控制器
+     * @author lxm
+     * @date 2024-02-04 11:29:31
+     * @param {(string | null)} fieldName
+     * @param {(string | null)} valueOP
+     * @return {*}  {(SearchBarFilterController | undefined)}
+     */
+    findFilterController(fieldName, valueOP) {
+        return this.filterControllers.find(item => {
+            if (item.fieldName === fieldName) {
+                // 有配属性搜索模式的匹配才是，没配的都是指向没配的哪个过滤项
+                return item.valueOP ? item.valueOP === valueOP : true;
+            }
+            return false;
+        });
+    }
     /**
      * 获取搜索栏的过滤参数（包括快速搜索，快速分组和过滤器的参数）
      * @author lxm
@@ -251,7 +268,7 @@ export class SearchBarController extends ControlController {
         var _a;
         if ((_a = this.searchBarFilters) === null || _a === void 0 ? void 0 : _a.length) {
             this.searchBarFilters.forEach(item => {
-                const filterController = new SearchBarFilterController(item, this.appDataEntity, this.context, this.params);
+                const filterController = new SearchBarFilterController(item, this);
                 this.filterControllers.push(filterController);
             });
             await Promise.all(this.filterControllers.map(controller => controller.init()));
@@ -263,18 +280,19 @@ export class SearchBarController extends ControlController {
      * @date 2023-10-13 05:53:35
      * @return {*}  {IData}
      */
-    calcFilters() {
+    calcFilters(valueFormat = true) {
         if (!this.enableFilter) {
             return;
         }
         const searchconds = calcSearchConds(this.state.filterNodes);
-        if (searchconds) {
+        if (valueFormat && searchconds) {
             // 给多数据加载之前进行脚本值转换
             recursiveIterate(searchconds[0], (node) => {
-                if (node.condtype === 'DEFIELD' &&
-                    !isNil(node.value) &&
-                    ScriptValueRegex.test(node.value)) {
-                    node.value = ScriptFactory.execSingleLine(`\`${node.value}\``, Object.assign({}, this.getEventArgs()));
+                if (node.condtype === 'DEFIELD' && !isNil(node.value)) {
+                    const controller = this.findFilterController(node.fieldname, node.condop);
+                    if (controller) {
+                        node.value = controller.formatValue(node);
+                    }
                 }
             }, { childrenFields: ['searchconds'] });
         }
@@ -394,7 +412,7 @@ export class SearchBarController extends ControlController {
      */
     async handleSave() {
         if (this.grid && this.state.selectedSearchGroupItem) {
-            const filters = this.calcFilters();
+            const filters = this.calcFilters(false);
             const saveParams = {
                 searchconds: filters,
                 sort: this.grid.state.sortQuery,

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

@@ -1 +1 @@
-{"version":3,"file":"use-searchcond.d.ts","sourceRoot":"","sources":["../../../../src/controller/control/search-bar/use-searchcond.ts"],"names":[],"mappings":"AAEA,OAAO,EAAE,WAAW,EAAE,MAAM,oBAAoB,CAAC;AAEjD;;;;;GAKG;AACH,wBAAgB,oBAAoB,IAAI,WAAW,EAAE,CAQpD;AAED;;;;;;GAMG;AACH,wBAAgB,aAAa,CAAC,IAAI,EAAE,WAAW,GAAG,KAAK,CAgBtD;AAED;;;;;;GAMG;AACH,wBAAgB,YAAY,CAAC,IAAI,EAAE,KAAK,GAAG,WAAW,CAmBrD;AAED;;;;;;GAMG;AACH,wBAAgB,eAAe,CAC7B,WAAW,EAAE,WAAW,EAAE,GACzB,KAAK,EAAE,GAAG,SAAS,CAiBrB"}
+{"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;AAElE;;;;;GAKG;AACH,wBAAgB,oBAAoB,IAAI,WAAW,EAAE,CAQpD;AAED;;;;;;GAMG;AACH,wBAAgB,aAAa,CAAC,IAAI,EAAE,WAAW,GAAG,KAAK,CAsBtD;AAED;;;;;;GAMG;AACH,wBAAgB,YAAY,CAAC,IAAI,EAAE,KAAK,GAAG,WAAW,CAoBrD;AAED;;;;;;GAMG;AACH,wBAAgB,eAAe,CAC7B,WAAW,EAAE,WAAW,EAAE,GACzB,KAAK,EAAE,GAAG,SAAS,CAiBrB"}

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

@@ -31,12 +31,17 @@ export function formatFilters(node) {
             searchconds: node.children.map(item => formatFilters(item)),
         };
     }
-    return {
+    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;
 }
 /**
  * 根据格式化后的过滤项反推出过滤项树节点数据集合
@@ -59,6 +64,7 @@ export function parseFilters(data) {
             field: data.fieldname || null,
             valueOP: data.condop || null,
             value: data.value || null,
+            valueItem: data.valueItem || undefined,
         };
     }
     throw new RuntimeError(`无效的condtype:${data.condtype}`);

package/out/controller/notification/internal-message.controller.d.ts

@@ -1,10 +1,11 @@
 import { IInternalMessage } from '@ibiz-template/core';
 import { QXEvent } from 'qx-util';
-import { IInternalMessageController, InternalMessageEvent } from '../../interface';
+import { IInternalMessageController, IInternalMessageEvent } from '../../interface';
 import { InternalMessageService } from '../../service';
 export declare class InternalMessageController implements IInternalMessageController {
-    readonly evt: QXEvent<InternalMessageEvent>;
+    readonly evt: QXEvent<IInternalMessageEvent>;
     total: number;
+    unreadCount: number;
     /**
      * 当前分页
      * @author lxm
@@ -14,10 +15,19 @@ export declare class InternalMessageController implements IInternalMessageContro
     page: number;
     size: number;
     messages: IInternalMessage[];
+    unreadOnly: boolean;
     protected service: InternalMessageService;
     init(): Promise<void>;
     load(): Promise<void>;
     loadMore(): Promise<void>;
+    refreshUnreadCount(): Promise<void>;
+    /**
+     * 切换是否只读
+     * @author lxm
+     * @date 2024-02-04 10:21:22
+     * @param {val} [boolean] 是否只读
+     */
+    toggleUnReadOnly(val?: boolean): void;
     protected fetch(loadMore?: boolean): Promise<void>;
     /**
      * 监听mqtt消息
@@ -26,5 +36,14 @@ export declare class InternalMessageController implements IInternalMessageContro
      * @protected
      */
     protected listenMqtt(): void;
+    markRead(message: IInternalMessage): Promise<void>;
+    /**
+     * 获取完整信息
+     * @author lxm
+     * @date 2024-01-30 05:03:25
+     * @param {string} id
+     * @return {*}  {Promise<IInternalMessage>}
+     */
+    get(id: string): Promise<IInternalMessage>;
 }
 //# sourceMappingURL=internal-message.controller.d.ts.map

package/out/controller/notification/internal-message.controller.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"internal-message.controller.d.ts","sourceRoot":"","sources":["../../../src/controller/notification/internal-message.controller.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,gBAAgB,EAAkB,MAAM,qBAAqB,CAAC;AACvE,OAAO,EAAE,OAAO,EAAE,MAAM,SAAS,CAAC;AAClC,OAAO,EACL,0BAA0B,EAC1B,oBAAoB,EACrB,MAAM,iBAAiB,CAAC;AACzB,OAAO,EAAE,sBAAsB,EAAE,MAAM,eAAe,CAAC;AAEvD,qBAAa,yBAA0B,YAAW,0BAA0B;IAC1E,QAAQ,CAAC,GAAG,EAAE,OAAO,CAAC,oBAAoB,CAAC,CAAiB;IAE5D,KAAK,EAAE,MAAM,CAAK;IAElB;;;;;OAKG;IACH,IAAI,EAAE,MAAM,CAAK;IAEjB,IAAI,EAAE,MAAM,CAAM;IAElB,QAAQ,EAAE,gBAAgB,EAAE,CAAM;IAElC,SAAS,CAAC,OAAO,yBAAgC;IAE3C,IAAI,IAAI,OAAO,CAAC,IAAI,CAAC;IAKrB,IAAI,IAAI,OAAO,CAAC,IAAI,CAAC;IAIrB,QAAQ,IAAI,OAAO,CAAC,IAAI,CAAC;cAIf,KAAK,CAAC,QAAQ,GAAE,OAAe,GAAG,OAAO,CAAC,IAAI,CAAC;IAyB/D;;;;;OAKG;IACH,SAAS,CAAC,UAAU,IAAI,IAAI;CAW7B"}
+{"version":3,"file":"internal-message.controller.d.ts","sourceRoot":"","sources":["../../../src/controller/notification/internal-message.controller.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,gBAAgB,EAAkB,MAAM,qBAAqB,CAAC;AACvE,OAAO,EAAE,OAAO,EAAE,MAAM,SAAS,CAAC;AAClC,OAAO,EACL,0BAA0B,EAC1B,qBAAqB,EACtB,MAAM,iBAAiB,CAAC;AACzB,OAAO,EAAE,sBAAsB,EAAE,MAAM,eAAe,CAAC;AAQvD,qBAAa,yBAA0B,YAAW,0BAA0B;IAC1E,QAAQ,CAAC,GAAG,EAAE,OAAO,CAAC,qBAAqB,CAAC,CAAiB;IAE7D,KAAK,EAAE,MAAM,CAAK;IAElB,WAAW,EAAE,MAAM,CAAK;IAExB;;;;;OAKG;IACH,IAAI,EAAE,MAAM,CAAK;IAEjB,IAAI,EAAE,MAAM,CAAM;IAElB,QAAQ,EAAE,gBAAgB,EAAE,CAAM;IAElC,UAAU,UAAS;IAEnB,SAAS,CAAC,OAAO,yBAAgC;IAE3C,IAAI,IAAI,OAAO,CAAC,IAAI,CAAC;IAMrB,IAAI,IAAI,OAAO,CAAC,IAAI,CAAC;IAQrB,QAAQ,IAAI,OAAO,CAAC,IAAI,CAAC;IAIzB,kBAAkB,IAAI,OAAO,CAAC,IAAI,CAAC;IASzC;;;;;OAKG;IACH,gBAAgB,CAAC,GAAG,CAAC,EAAE,OAAO,GAAG,IAAI;cAUrB,KAAK,CAAC,QAAQ,GAAE,OAAe,GAAG,OAAO,CAAC,IAAI,CAAC;IA6C/D;;;;;OAKG;IACH,SAAS,CAAC,UAAU,IAAI,IAAI;IAkBtB,QAAQ,CAAC,OAAO,EAAE,gBAAgB,GAAG,OAAO,CAAC,IAAI,CAAC;IAkBxD;;;;;;OAMG;IACG,GAAG,CAAC,EAAE,EAAE,MAAM,GAAG,OAAO,CAAC,gBAAgB,CAAC;CAIjD"}

package/out/controller/notification/internal-message.controller.js

@@ -1,9 +1,16 @@
 import { QXEvent } from 'qx-util';
 import { InternalMessageService } from '../../service';
+function isHTML(str) {
+    if (str === '')
+        return false;
+    const doc = new DOMParser().parseFromString(str, 'text/html');
+    return Array.from(doc.body.childNodes).some(node => node.nodeType === 1);
+}
 export class InternalMessageController {
     constructor() {
         this.evt = new QXEvent();
         this.total = 0;
+        this.unreadCount = 0;
         /**
          * 当前分页
          * @author lxm
@@ -13,18 +20,49 @@ export class InternalMessageController {
         this.page = 0;
         this.size = 20;
         this.messages = [];
+        this.unreadOnly = false;
         this.service = new InternalMessageService();
     }
     async init() {
-        this.load();
+        await this.load();
         this.listenMqtt();
+        await this.refreshUnreadCount();
     }
     async load() {
-        await this.fetch(false);
+        try {
+            await this.fetch(false);
+        }
+        catch (error) {
+            ibiz.log.error(error);
+        }
     }
     async loadMore() {
         await this.fetch(true);
     }
+    async refreshUnreadCount() {
+        try {
+            this.unreadCount = await this.service.getUnreadNum();
+            this.evt.emit('unreadCountChange', this.unreadCount);
+        }
+        catch (error) {
+            ibiz.log.error(error);
+        }
+    }
+    /**
+     * 切换是否只读
+     * @author lxm
+     * @date 2024-02-04 10:21:22
+     * @param {val} [boolean] 是否只读
+     */
+    toggleUnReadOnly(val) {
+        const nextVal = val === undefined ? !this.unreadOnly : val;
+        if (this.unreadOnly === nextVal) {
+            return;
+        }
+        this.unreadOnly = nextVal;
+        this.evt.emit('unreadOnlyChange', this.unreadOnly);
+        this.load();
+    }
     async fetch(loadMore = false) {
         // *计算查询参数
         if (loadMore === false) {
@@ -38,6 +76,24 @@ export class InternalMessageController {
             size: this.size,
             sort: 'update_time,desc',
         };
+        // 是否只搜索未读
+        if (this.unreadOnly) {
+            fetchParams.searchconds = [
+                {
+                    condtype: 'GROUP',
+                    condop: 'AND',
+                    bnotmode: false,
+                    searchconds: [
+                        {
+                            condop: 'EQ',
+                            condtype: 'DEFIELD',
+                            fieldname: 'status',
+                            value: 'RECEIVED',
+                        },
+                    ],
+                },
+            ];
+        }
         const res = await this.service.fetch(fetchParams);
         this.total = res.total;
         if (loadMore) {
@@ -61,7 +117,39 @@ export class InternalMessageController {
                 return;
             }
             // todo 目前会有一种情况，不带data，弹右下角消息提示
-            ibiz.notification.info({ desc: msg.content, position: 'bottom-right' });
+            if (msg.content) {
+                ibiz.notification.info({
+                    isHtmlDesc: isHTML(msg.content),
+                    desc: msg.content,
+                    position: 'bottom-right',
+                });
+            }
         });
     }
+    async markRead(message) {
+        if (message.status !== 'RECEIVED') {
+            return;
+        }
+        const find = this.messages.find(msg => msg.id === message.id);
+        if (!find) {
+            return;
+        }
+        // todo 后台接口适配
+        await this.service.markRead(message.id);
+        // find.status = 'READ';
+        // this.unreadCount -= 1;
+        this.evt.emit('unreadCountChange', this.unreadCount);
+        this.evt.emit('dataChange');
+    }
+    /**
+     * 获取完整信息
+     * @author lxm
+     * @date 2024-01-30 05:03:25
+     * @param {string} id
+     * @return {*}  {Promise<IInternalMessage>}
+     */
+    async get(id) {
+        const res = await this.service.get(id);
+        return res.data;
+    }
 }

package/out/controller/notification/notice.controller.d.ts

@@ -1,7 +1,9 @@
-import { INoticeController } from '../../interface';
+import { QXEvent } from 'qx-util';
+import { INoticeController, INoticeEvent } from '../../interface';
 import { AsyncActionController } from './async-action.controller';
 import { InternalMessageController } from './internal-message.controller';
 export declare class NoticeController implements INoticeController {
+    readonly evt: QXEvent<INoticeEvent>;
     total: number;
     asyncAction: AsyncActionController;
     internalMessage: InternalMessageController;

package/out/controller/notification/notice.controller.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"notice.controller.d.ts","sourceRoot":"","sources":["../../../src/controller/notification/notice.controller.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,iBAAiB,EAAE,MAAM,iBAAiB,CAAC;AACpD,OAAO,EAAE,qBAAqB,EAAE,MAAM,2BAA2B,CAAC;AAClE,OAAO,EAAE,yBAAyB,EAAE,MAAM,+BAA+B,CAAC;AAE1E,qBAAa,gBAAiB,YAAW,iBAAiB;IACxD,KAAK,SAAK;IAEV,WAAW,wBAA+B;IAE1C,eAAe,4BAAmC;IAE5C,IAAI,IAAI,OAAO,CAAC,IAAI,CAAC;CAI5B"}
+{"version":3,"file":"notice.controller.d.ts","sourceRoot":"","sources":["../../../src/controller/notification/notice.controller.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,OAAO,EAAE,MAAM,SAAS,CAAC;AAClC,OAAO,EAAE,iBAAiB,EAAE,YAAY,EAAE,MAAM,iBAAiB,CAAC;AAClE,OAAO,EAAE,qBAAqB,EAAE,MAAM,2BAA2B,CAAC;AAClE,OAAO,EAAE,yBAAyB,EAAE,MAAM,+BAA+B,CAAC;AAE1E,qBAAa,gBAAiB,YAAW,iBAAiB;IACxD,QAAQ,CAAC,GAAG,EAAE,OAAO,CAAC,YAAY,CAAC,CAAiB;IAEpD,KAAK,SAAK;IAEV,WAAW,wBAA+B;IAE1C,eAAe,4BAAmC;IAE5C,IAAI,IAAI,OAAO,CAAC,IAAI,CAAC;CAS5B"}

package/out/controller/notification/notice.controller.js

@@ -1,7 +1,9 @@
+import { QXEvent } from 'qx-util';
 import { AsyncActionController } from './async-action.controller';
 import { InternalMessageController } from './internal-message.controller';
 export class NoticeController {
     constructor() {
+        this.evt = new QXEvent();
         this.total = 0;
         this.asyncAction = new AsyncActionController();
         this.internalMessage = new InternalMessageController();
@@ -9,5 +11,9 @@ export class NoticeController {
     async init() {
         await this.internalMessage.init();
         await this.asyncAction.init();
+        this.internalMessage.evt.on('unreadCountChange', () => {
+            this.total = this.internalMessage.unreadCount;
+            this.evt.emit('totalChange', this.total);
+        });
     }
 }

package/out/interface/controller/controller/notice/i-internal-message.controller.d.ts

@@ -6,13 +6,25 @@ import { QXEvent } from 'qx-util';
  * @date 2024-01-26 10:47:41
  * @interface InternalMessageEvent
  */
-export interface InternalMessageEvent {
+export interface IInternalMessageEvent {
     /**
      * 所有数据的变更，新增，删除，更新都算
      * @author lxm
      * @date 2024-01-26 10:56:50
      */
     dataChange: () => void;
+    /**
+     * 未读数量变更
+     * @author lxm
+     * @date 2024-01-30 02:46:55
+     */
+    unreadCountChange: (num: number) => void;
+    /**
+     * 是否只显示未读变更
+     * @author lxm
+     * @date 2024-01-30 02:46:55
+     */
+    unreadOnlyChange: (val: boolean) => void;
 }
 /**
  * 站内信逻辑控制器
@@ -26,9 +38,9 @@ export interface IInternalMessageController {
      * 事件
      * @author lxm
      * @date 2024-01-26 10:48:53
-     * @type {QXEvent<InternalMessageEvent>}
+     * @type {QXEvent<IInternalMessageEvent>}
      */
-    readonly evt: QXEvent<InternalMessageEvent>;
+    readonly evt: QXEvent<IInternalMessageEvent>;
     /**
      * 总条数
      * @author lxm
@@ -50,6 +62,20 @@ export interface IInternalMessageController {
      * @type {IInternalMessage[]}
      */
     readonly messages: IInternalMessage[];
+    /**
+     * 未读消息个数
+     * @author lxm
+     * @date 2024-01-30 02:39:54
+     * @type {number}
+     */
+    readonly unreadCount: number;
+    /**
+     * 是否只查询未读的消息
+     * @author lxm
+     * @date 2024-02-04 10:26:00
+     * @type {boolean}
+     */
+    unreadOnly: boolean;
     /**
      * 加载（会重置数据）
      * @author lxm
@@ -64,5 +90,35 @@ export interface IInternalMessageController {
      * @return {*}  {Promise<void>}
      */
     loadMore(): Promise<void>;
+    /**
+     * 刷新未读数据条数
+     * @author lxm
+     * @date 2024-02-04 09:37:58
+     * @return {*}  {Promise<void>}
+     */
+    refreshUnreadCount(): Promise<void>;
+    /**
+     * 把某条消息记录标记为已读
+     * @author lxm
+     * @date 2024-01-30 02:31:17
+     * @param {IInternalMessage} message
+     * @return {*}  {Promise<void>}
+     */
+    markRead(message: IInternalMessage): Promise<void>;
+    /**
+     * 获取完整消息
+     * @author lxm
+     * @date 2024-01-30 05:03:51
+     * @param {string} id
+     * @return {*}  {Promise<IInternalMessage>}
+     */
+    get(id: string): Promise<IInternalMessage>;
+    /**
+     * 切换是否只读
+     * @author lxm
+     * @date 2024-02-04 10:21:22
+     * @param {val} [boolean] 是否只读
+     */
+    toggleUnReadOnly(val?: boolean): void;
 }
 //# sourceMappingURL=i-internal-message.controller.d.ts.map