@ibiz-template/runtime 0.1.34 → 0.1.36

package/out/service/service/entity/method/method.js

@@ -49,13 +49,13 @@ export class Method {
             let res = null;
             switch (requestMethod) {
                 case 'POST':
-                    res = await this.app.net.post(this.mergeRequestPath(path, methodName), notNilEmpty(data) ? data : params);
+                    res = await this.app.net.post(this.mergeRequestPath(path, methodName), notNilEmpty(data) ? data : params || {});
                     break;
                 case 'GET':
                     res = await this.app.net.get(this.mergeRequestPath(path, methodName), data || params);
                     break;
                 case 'PUT': {
-                    res = await this.app.net.put(this.mergeRequestPath(path, methodName), notNilEmpty(data) ? data : params);
+                    res = await this.app.net.put(this.mergeRequestPath(path, methodName), notNilEmpty(data) ? data : params || {});
                     break;
                 }
                 case 'DELETE':

package/out/ui-logic/ui-logic-context.d.ts

@@ -29,17 +29,7 @@ export declare class UILogicContext {
     /**
      * 视图参数
      */
-    get viewParams(): IParams;
-    /**
-     * Creates an instance of DELogicContext.
-     * @author lxm
-     * @date 2023-03-24 09:15:14
-     * @param {Map<string, DELogicParam>} deLogicParams 实体逻辑参数集合
-     * @param {IParams} context 上下文
-     * @param {IData} data 数据对象
-     * @param {IParams} viewParams 视图参数
-     * @param {IParams} [opt] 额外参数
-     */
+    get viewParam(): IParams;
     /**
      * Creates an instance of UILogicContext.
      * @author lxm

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

@@ -1 +1 @@
-{"version":3,"file":"ui-logic-context.d.ts","sourceRoot":"","sources":["../../src/ui-logic/ui-logic-context.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,cAAc,EAAE,MAAM,cAAc,CAAC;AAC9C,OAAO,EAAE,YAAY,EAAE,MAAM,iCAAiC,CAAC;AAE/D;;;;;;;GAOG;AACH,qBAAa,cAAc;IAgDvB,OAAO,CAAC,aAAa;IACd,UAAU,EAAE,cAAc;IAhDnC;;;;;OAKG;IACH,UAAU,EAAE,OAAO,CAAC;IAEpB;;OAEG;IACH,IAAI,OAAO,IAAI,QAAQ,CAEtB;IAED;;OAEG;IACH,IAAI,IAAI,IAAI,KAAK,CAEhB;IAED;;OAEG;IACH,IAAI,UAAU,IAAI,OAAO,CAExB;IAED;;;;;;;;;OASG;IACH;;;;;;OAMG;gBAEO,aAAa,EAAE,GAAG,CAAC,MAAM,EAAE,YAAY,CAAC,EACzC,UAAU,EAAE,cAAc;IAGnC;;;;;;;OAOG;IAEH,MAAM,EAAE,MAAM,CAAC,MAAM,EAAE,GAAG,CAAC,CAAM;IAEjC;;;;;;OAMG;IACH,MAAM,EAAE,OAAO,CAAQ;IAEvB;;;;;;OAMG;IACH,SAAS,EAAE,OAAO,CAAS;IAE3B;;;;;;;OAOG;IACH,gBAAgB,EAAE,MAAM,CAAa;IAErC;;;;;OAKG;IACH,UAAU,CAAC,IAAI,EAAE,MAAM,GAAG,IAAI;IAI9B;;;;;OAKG;IACH,UAAU,CAAC,IAAI,EAAE,MAAM,GAAG,IAAI;IAI9B;;;;;OAKG;IACH,aAAa,CAAC,KAAK,EAAE,OAAO,GAAG,IAAI;IAInC;;;;;OAKG;IACH,mBAAmB,CAAC,GAAG,EAAE,MAAM,GAAG,IAAI;IAQtC;;;;;;OAMG;IACH,aAAa,CAAC,OAAO,EAAE,MAAM,GAAG,OAAO;CAIxC"}
+{"version":3,"file":"ui-logic-context.d.ts","sourceRoot":"","sources":["../../src/ui-logic/ui-logic-context.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,cAAc,EAAE,MAAM,cAAc,CAAC;AAC9C,OAAO,EAAE,YAAY,EAAE,MAAM,iCAAiC,CAAC;AAE/D;;;;;;;GAOG;AACH,qBAAa,cAAc;IA4CvB,OAAO,CAAC,aAAa;IACd,UAAU,EAAE,cAAc;IA5CnC;;;;;OAKG;IACH,UAAU,EAAE,OAAO,CAAC;IAEpB;;OAEG;IACH,IAAI,OAAO,IAAI,QAAQ,CAKtB;IAED;;OAEG;IACH,IAAI,IAAI,IAAI,KAAK,CAEhB;IAED;;OAEG;IACH,IAAI,SAAS,IAAI,OAAO,CAKvB;IAED;;;;;;OAMG;gBAEO,aAAa,EAAE,GAAG,CAAC,MAAM,EAAE,YAAY,CAAC,EACzC,UAAU,EAAE,cAAc;IAGnC;;;;;;;OAOG;IAEH,MAAM,EAAE,MAAM,CAAC,MAAM,EAAE,GAAG,CAAC,CAAM;IAEjC;;;;;;OAMG;IACH,MAAM,EAAE,OAAO,CAAQ;IAEvB;;;;;;OAMG;IACH,SAAS,EAAE,OAAO,CAAS;IAE3B;;;;;;;OAOG;IACH,gBAAgB,EAAE,MAAM,CAAa;IAErC;;;;;OAKG;IACH,UAAU,CAAC,IAAI,EAAE,MAAM,GAAG,IAAI;IAI9B;;;;;OAKG;IACH,UAAU,CAAC,IAAI,EAAE,MAAM,GAAG,IAAI;IAI9B;;;;;OAKG;IACH,aAAa,CAAC,KAAK,EAAE,OAAO,GAAG,IAAI;IAInC;;;;;OAKG;IACH,mBAAmB,CAAC,GAAG,EAAE,MAAM,GAAG,IAAI;IAQtC;;;;;;OAMG;IACH,aAAa,CAAC,OAAO,EAAE,MAAM,GAAG,OAAO;CAIxC"}

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

@@ -11,6 +11,9 @@ export class UILogicContext {
      * 上下文
      */
     get context() {
+        if (Object.prototype.hasOwnProperty.call(this.params, 'context')) {
+            return this.params.context;
+        }
         return this.parameters.context;
     }
     /**
@@ -22,19 +25,12 @@ export class UILogicContext {
     /**
      * 视图参数
      */
-    get viewParams() {
+    get viewParam() {
+        if (Object.prototype.hasOwnProperty.call(this.params, 'viewParam')) {
+            return this.params.viewParam;
+        }
         return this.parameters.params;
     }
-    /**
-     * Creates an instance of DELogicContext.
-     * @author lxm
-     * @date 2023-03-24 09:15:14
-     * @param {Map<string, DELogicParam>} deLogicParams 实体逻辑参数集合
-     * @param {IParams} context 上下文
-     * @param {IData} data 数据对象
-     * @param {IParams} viewParams 视图参数
-     * @param {IParams} [opt] 额外参数
-     */
     /**
      * Creates an instance of UILogicContext.
      * @author lxm

package/out/ui-logic/ui-logic-node/data-set-node/data-set-node.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"data-set-node.d.ts","sourceRoot":"","sources":["../../../../src/ui-logic/ui-logic-node/data-set-node/data-set-node.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,mBAAmB,EAAE,MAAM,kBAAkB,CAAC;AACvD,OAAO,EAAE,cAAc,EAAE,MAAM,wBAAwB,CAAC;AACxD,OAAO,EAAE,WAAW,EAAE,MAAM,kBAAkB,CAAC;AAE/C;;;;;;;;GAQG;AACH,qBAAa,WAAY,SAAQ,WAAW;IAClC,KAAK,EAAE,mBAAmB,CAAC;IAE7B,IAAI,CAAC,GAAG,EAAE,cAAc,GAAG,OAAO,CAAC,IAAI,CAAC;CAoB/C"}
+{"version":3,"file":"data-set-node.d.ts","sourceRoot":"","sources":["../../../../src/ui-logic/ui-logic-node/data-set-node/data-set-node.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,mBAAmB,EAAE,MAAM,kBAAkB,CAAC;AACvD,OAAO,EAAE,cAAc,EAAE,MAAM,wBAAwB,CAAC;AACxD,OAAO,EAAE,WAAW,EAAE,MAAM,kBAAkB,CAAC;AAE/C;;;;;;;;GAQG;AACH,qBAAa,WAAY,SAAQ,WAAW;IAClC,KAAK,EAAE,mBAAmB,CAAC;IAE7B,IAAI,CAAC,GAAG,EAAE,cAAc,GAAG,OAAO,CAAC,IAAI,CAAC;CAsB/C"}

package/out/ui-logic/ui-logic-node/data-set-node/data-set-node.js

@@ -1,3 +1,4 @@
+import { RuntimeModelError } from '@ibiz-template/core';
 import { UILogicNode } from '../ui-logic-node';
 /**
  * 数据集合节点
@@ -11,9 +12,12 @@ import { UILogicNode } from '../ui-logic-node';
 export class DataSetNode extends UILogicNode {
     async exec(ctx) {
         const { dstAppDEDataSetId, dstAppDataEntityId, dstDEUILogicParamId, retDEUILogicParamId, } = this.model;
-        const requestData = ctx.params[dstDEUILogicParamId];
+        if (!dstDEUILogicParamId) {
+            throw new RuntimeModelError(this.model, '缺少配置过滤参数');
+        }
+        const queryParams = ctx.params[dstDEUILogicParamId];
         const app = ibiz.hub.getApp(ctx.context.srfappid);
-        const res = await app.deService.exec(dstAppDataEntityId, dstAppDEDataSetId, ctx.context, requestData, ctx.viewParams);
+        const res = await app.deService.exec(dstAppDataEntityId, dstAppDEDataSetId, ctx.context, queryParams);
         if (res.ok) {
             ctx.params[retDEUILogicParamId] = res.data;
         }

package/out/ui-logic/ui-logic-node/de-action-node/de-action-node.js

@@ -20,7 +20,7 @@ export class DEActionNode extends UILogicNode {
         }
         const requestData = ctx.params[dstDEUILogicParamId];
         const app = ibiz.hub.getApp(ctx.context.srfappid);
-        const res = await app.deService.exec(dstAppDataEntityId, dstAppDEActionId, ctx.context, requestData, ctx.viewParams);
+        const res = await app.deService.exec(dstAppDataEntityId, dstAppDEActionId, ctx.context, requestData, ctx.viewParam);
         if (res.ok) {
             ctx.params[retDEUILogicParamId] = res.data;
         }

package/out/ui-logic/ui-logic-node/de-ui-action-node/de-ui-action-node.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"de-ui-action-node.d.ts","sourceRoot":"","sources":["../../../../src/ui-logic/ui-logic-node/de-ui-action-node/de-ui-action-node.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,gBAAgB,EAAE,MAAM,kBAAkB,CAAC;AAEpD,OAAO,EAAE,cAAc,EAAE,MAAM,wBAAwB,CAAC;AACxD,OAAO,EAAE,WAAW,EAAE,MAAM,kBAAkB,CAAC;AAE/C;;;;;;;;GAQG;AACH,qBAAa,cAAe,SAAQ,WAAW;IACrC,KAAK,EAAE,gBAAgB,CAAC;IAE1B,IAAI,CAAC,GAAG,EAAE,cAAc,GAAG,OAAO,CAAC,IAAI,CAAC;CAqB/C"}
+{"version":3,"file":"de-ui-action-node.d.ts","sourceRoot":"","sources":["../../../../src/ui-logic/ui-logic-node/de-ui-action-node/de-ui-action-node.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,gBAAgB,EAAE,MAAM,kBAAkB,CAAC;AAEpD,OAAO,EAAE,cAAc,EAAE,MAAM,wBAAwB,CAAC;AACxD,OAAO,EAAE,WAAW,EAAE,MAAM,kBAAkB,CAAC;AAE/C;;;;;;;;GAQG;AACH,qBAAa,cAAe,SAAQ,WAAW;IACrC,KAAK,EAAE,gBAAgB,CAAC;IAE1B,IAAI,CAAC,GAAG,EAAE,cAAc,GAAG,OAAO,CAAC,IAAI,CAAC;CAuB/C"}

package/out/ui-logic/ui-logic-node/de-ui-action-node/de-ui-action-node.js

@@ -27,6 +27,6 @@ export class DEUIActionNode extends UILogicNode {
                 actionData = [param];
             }
         }
-        await UIActionUtil.execAndResolved(dstAppDEUIActionId, Object.assign(Object.assign({}, parameters), { data: actionData }));
+        await UIActionUtil.execAndResolved(dstAppDEUIActionId, Object.assign(Object.assign({}, parameters), { context: ctx.context, params: ctx.viewParam, data: actionData }));
     }
 }

package/out/ui-logic/ui-logic-node/execute-de-logic-node/execute-de-logic-node.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"execute-de-logic-node.d.ts","sourceRoot":"","sources":["../../../../src/ui-logic/ui-logic-node/execute-de-logic-node/execute-de-logic-node.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,iBAAiB,EAAE,MAAM,kBAAkB,CAAC;AAErD,OAAO,EAAE,cAAc,EAAE,MAAM,wBAAwB,CAAC;AACxD,OAAO,EAAE,WAAW,EAAE,MAAM,kBAAkB,CAAC;AAE/C;;;;;;;;GAQG;AACH,qBAAa,kBAAmB,SAAQ,WAAW;IACzC,KAAK,EAAE,iBAAiB,CAAC;IAE3B,IAAI,CAAC,GAAG,EAAE,cAAc,GAAG,OAAO,CAAC,IAAI,CAAC;CAsC/C"}
+{"version":3,"file":"execute-de-logic-node.d.ts","sourceRoot":"","sources":["../../../../src/ui-logic/ui-logic-node/execute-de-logic-node/execute-de-logic-node.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,iBAAiB,EAAE,MAAM,kBAAkB,CAAC;AAErD,OAAO,EAAE,cAAc,EAAE,MAAM,wBAAwB,CAAC;AACxD,OAAO,EAAE,WAAW,EAAE,MAAM,kBAAkB,CAAC;AAE/C;;;;;;;;GAQG;AACH,qBAAa,kBAAmB,SAAQ,WAAW;IACzC,KAAK,EAAE,iBAAiB,CAAC;IAE3B,IAAI,CAAC,GAAG,EAAE,cAAc,GAAG,OAAO,CAAC,IAAI,CAAC;CAqC/C"}

package/out/ui-logic/ui-logic-node/execute-de-logic-node/execute-de-logic-node.js

@@ -27,8 +27,7 @@ export class ExecuteDELogicNode extends UILogicNode {
         if (!dstParam) {
             throw new RuntimeError(`没有找到传入参数${dstDEUILogicParamId}`);
         }
-        // todo 需要传入参数格式约束
-        const result = await execDELogicById(dstAppDELogicId, dstAppDataEntityId, dstParam.context, dstParam.data, dstParam.params);
+        const result = await execDELogicById(dstAppDELogicId, dstAppDataEntityId, ctx.context, dstParam, ctx.params);
         // 如果有返回值参数返回值填入。
         if (retDEUILogicParamId) {
             ctx.params[retDEUILogicParamId] = result;

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;IAqE/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;IAsE/B;;;;;OAKG;IACH,KAAK,CAAC,GAAG,EAAE,cAAc,GAAG,IAAI;CAWjC"}

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

@@ -28,7 +28,8 @@ export class UILogicParam {
     calc(ctx) {
         const tag = this.model.id;
         const m = this.model;
-        const { context, viewParams, data, parameters } = ctx;
+        const { parameters } = ctx;
+        const { context, params, data } = parameters;
         const app = ibiz.hub.getApp(context.srfappid);
         // 特殊变量的特殊处理
         if (m.codeName === 'layoutPanel') {
@@ -103,7 +104,7 @@ export class UILogicParam {
         }
         else if (m.viewNavDataParam) {
             // 视图导航数据
-            ctx.params[tag] = viewParams;
+            ctx.params[tag] = params;
         }
         else if (m.viewSessionParam) {
             throw new ModelError(m, `未支持的逻辑参数类型: 当前视图会话`);

package/out/ui-logic/utils/handle-src-val.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"handle-src-val.d.ts","sourceRoot":"","sources":["../../../src/ui-logic/utils/handle-src-val.ts"],"names":[],"mappings":"AAGA,OAAO,EAAE,cAAc,EAAE,MAAM,qBAAqB,CAAC;AAErD,KAAK,YAAY,GAAG;IAClB;;OAEG;IACH,YAAY,CAAC,EAAE,MAAM,CAAC;IACtB;;OAEG;IACH,YAAY,CAAC,EAAE,MAAM,CAAC;IACtB;;OAEG;IACH,QAAQ,CAAC,EAAE,MAAM,CAAC;IAClB;;OAEG;IACH,mBAAmB,CAAC,EAAE,MAAM,CAAC;CAC9B,CAAC;AAEF;;;;;;;;GAQG;AACH,wBAAgB,YAAY,CAC1B,GAAG,EAAE,cAAc,EACnB,YAAY,EAAE,YAAY,GACzB,OAAO,CA6DT"}
+{"version":3,"file":"handle-src-val.d.ts","sourceRoot":"","sources":["../../../src/ui-logic/utils/handle-src-val.ts"],"names":[],"mappings":"AAGA,OAAO,EAAE,cAAc,EAAE,MAAM,qBAAqB,CAAC;AAErD,KAAK,YAAY,GAAG;IAClB;;OAEG;IACH,YAAY,CAAC,EAAE,MAAM,CAAC;IACtB;;OAEG;IACH,YAAY,CAAC,EAAE,MAAM,CAAC;IACtB;;OAEG;IACH,QAAQ,CAAC,EAAE,MAAM,CAAC;IAClB;;OAEG;IACH,mBAAmB,CAAC,EAAE,MAAM,CAAC;CAC9B,CAAC;AAEF;;;;;;;;GAQG;AACH,wBAAgB,YAAY,CAC1B,GAAG,EAAE,cAAc,EACnB,YAAY,EAAE,YAAY,GACzB,OAAO,CAyDT"}

package/out/ui-logic/utils/handle-src-val.js

@@ -15,16 +15,12 @@ export function handleSrcVal(ctx, srcValParams) {
     // 没有源值类型就是逻辑参数
     const srcValueType = srcValParams.srcValueType || 'SRCDLPARAM';
     // 取属性值
-    let srcField = srcFieldName;
+    const srcField = srcFieldName;
     let value;
     switch (srcValueType) {
         // 源逻辑参数
         case 'SRCDLPARAM':
             value = ctx.params[srcDEUILogicParamId];
-            // 如果是实体参数对象则转换成小写。
-            if (ctx.isEntityParam(srcDEUILogicParamId)) {
-                srcField = srcField === null || srcField === void 0 ? void 0 : srcField.toLowerCase();
-            }
             break;
         // 空值类型
         case 'NULLVALUE':
@@ -37,13 +33,13 @@ export function handleSrcVal(ctx, srcValParams) {
             return ibiz.util.rawValue.format(srcValue);
         case 'WEBCONTEXT': // 网页请求上下文
         case 'VIEWPARAM': // 视图参数
-            value = ctx.viewParams;
+            value = ctx.parameters.params;
             break;
         case 'APPLICATION': // 系统全局对象
         case 'SESSION': // 用户全局对象
         case 'APPDATA': // 应用上下文
         case 'DATACONTEXT': // 数据上下文
-            value = ctx.context;
+            value = ctx.parameters.context;
             break;
         // 当前环境参数
         case 'ENVPARAM':

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@ibiz-template/runtime",
-  "version": "0.1.34",
+  "version": "0.1.36",
   "description": "控制器包",
   "type": "module",
   "main": "out/index.js",
@@ -29,7 +29,7 @@
   "author": "chitanda",
   "license": "MIT",
   "devDependencies": {
-    "@ibiz-template/core": "^0.1.34",
+    "@ibiz-template/core": "^0.1.36",
     "@ibiz/model-core": "^0.0.19",
     "@types/path-browserify": "^1.0.0",
     "@types/qs": "^6.9.8",
@@ -57,5 +57,5 @@
     "qx-util": "^0.4.8",
     "ramda": "^0.29.0"
   },
-  "gitHead": "6b6ab37103623fbc1994241b511829a2013a72c0"
+  "gitHead": "d19f35594e34c2e934ae10d094c47c92faa25a8f"
 }

package/src/constant/index.ts

@@ -3,4 +3,5 @@ export { ViewType } from './view-type';
 export { ViewMode } from './view-mode';
 export { SysUIActionTag } from './sys-uiaction-tag';
 export { ViewCallTag } from './view-call-tag';
+export { ValueOP } from './value-op';
 export * from './studio-event';

package/src/constant/value-op.ts

@@ -0,0 +1,82 @@
+/* eslint-disable no-shadow */
+/**
+ * 值操作
+ * @author lxm
+ * @date 2023-10-13 11:37:48
+ * @export
+ * @enum {number}
+ */
+export enum ValueOP {
+  /**
+   * 等于
+   */
+  'EQ' = 'EQ',
+  /**
+   * 不等于
+   */
+  'NOT_EQ' = 'NOTEQ',
+  /**
+   * 大于
+   */
+  'GT' = 'GT',
+  /**
+   * 大于等于
+   */
+  'GT_AND_EQ' = 'GTANDEQ',
+  /**
+   * 小于
+   */
+  'LT' = 'LT',
+  /**
+   * 小于等于
+   */
+  'LT_AND_EQ' = 'LTANDEQ',
+  /**
+   * 值为空
+   */
+  'IS_NULL' = 'ISNULL',
+  /**
+   * 值不为空
+   */
+  'IS_NOT_NULL' = 'ISNOTNULL',
+  /**
+   * 值在范围中
+   */
+  'IN' = 'IN',
+  /**
+   * 值不在范围中
+   */
+  'NOT_IN' = 'NOTIN',
+  /**
+   * 文本包含
+   */
+  'LIKE' = 'LIKE',
+  /**
+   * 文本左包含
+   */
+  'LIFT_LIKE' = 'LIFTLIKE',
+  /**
+   * 文本右包含
+   */
+  'RIGHT_LIKE' = 'RIGHT_LIKE',
+  /**
+   * 子数据（递归）
+   */
+  'CHILD_OF' = 'CHILDOF',
+  /**
+   * 自定义文本包含
+   */
+  'USER_LIKE' = 'USERLIKE',
+  /**
+   * 位与操作（BitAnd）(仅限整数形）
+   */
+  'BIT_AND' = 'BITAND',
+  /**
+   * 存在引用数据
+   */
+  'EXISTS' = 'EXISTS',
+  /**
+   * 不存在引用数据
+   */
+  'NOT_EXISTS' = 'NOTEXISTS',
+}

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

@@ -82,14 +82,22 @@ export class SearchFormController
   }
 
   /**
-   * 获取搜索表单的视图过滤参数
+   * 获取搜索表单的过滤参数
    *
    * @author lxm
    * @date 2022-09-22 17:09:21
    * @returns {*}  {IParams}
    */
-  getParams(): IParams {
-    return { ...this.data.getOrigin() };
+  getFilterParams(): IParams {
+    const filterParams: IParams = {};
+    Object.keys(this.state.data).forEach(key => {
+      const value = this.state.data[key];
+      // 排除空值
+      if (value !== null && value !== undefined && value !== '') {
+        filterParams[key] = value;
+      }
+    });
+    return filterParams;
   }
 
   /**

package/src/controller/control/md-ctrl/md-ctrl.controller.ts

@@ -3,12 +3,16 @@ import {
   IUIActionGroup,
   IUIActionGroupDetail,
 } from '@ibiz/model-core';
+import { RuntimeModelError } from '@ibiz-template/core';
+import { isNil } from 'ramda';
 import {
   IMobMDCtrlEvent,
   IMobMDCtrlController,
   IMobMdCtrlState,
   IMobMDCtrlRowState,
   MDCtrlLoadParams,
+  IMDControlGroupState,
+  CodeListItem,
 } from '../../../interface';
 import { MDCtrlService } from './md-ctrl.service';
 import { MobMDCtrlRowState } from './md-ctrl-row.state';
@@ -31,6 +35,16 @@ export class MDCtrlController
     this.state.mdctrlActiveMode = 1;
   }
 
+  /**
+   * 分组代码表项集合
+   *
+   * @author zk
+   * @date 2023-10-11 04:10:06
+   * @type {readonly}
+   * @memberof MDCtrlController
+   */
+  groupCodeListItems?: readonly CodeListItem[];
+
   protected async onCreated(): Promise<void> {
     await super.onCreated();
     this.service = new MDCtrlService(this.model);
@@ -86,7 +100,10 @@ export class MDCtrlController
     await this.load({ isInitialLoad: true });
   }
 
-  afterLoad(args: MDCtrlLoadParams, items: ControlVO[]): Promise<IData[]> {
+  async afterLoad(
+    args: MDCtrlLoadParams,
+    items: ControlVO[],
+  ): Promise<IData[]> {
     if (args.isInitialLoad) {
       this.state.rows = [];
     }
@@ -99,6 +116,8 @@ export class MDCtrlController
         }),
       );
     }
+    await this.initGroupCodeListItems();
+    await this.handleDataGroup();
     return super.afterLoad(args, items);
   }
 
@@ -108,7 +127,7 @@ export class MDCtrlController
    * @author zk
    * @date 2023-05-26 02:05:46
    * @param {IData[]} items
-   * @memberof ListController
+   * @memberof MDCtrlController
    */
   setData(items: IData[]): void {
     const rows = items.map(item => {
@@ -124,7 +143,7 @@ export class MDCtrlController
    * @author zk
    * @date 2023-05-26 02:05:35
    * @return {*}  {IData[]}
-   * @memberof ListController
+   * @memberof MDCtrlController
    */
   getAllData(): IData[] {
     return this.state.rows.map(row => row.data);
@@ -196,4 +215,118 @@ export class MDCtrlController
     containerState.update(row.data.getOrigin());
     row.uaColStates[group.id!] = containerState;
   }
+
+  /**
+   * 处理数据分组
+   *
+   * @memberof MDCtrlController
+   */
+  protected async handleDataGroup(): Promise<void> {
+    const { enableGroup, groupMode, groupAppDEFieldId } = this.model;
+    if (enableGroup && groupMode) {
+      if (!groupAppDEFieldId) {
+        throw new RuntimeModelError(this.model, '分组属性没有配置');
+      }
+      if (groupMode === 'AUTO') {
+        this.handleAutoGroup();
+      } else if (groupMode === 'CODELIST') {
+        await this.handleCodeListGroup();
+      }
+    }
+  }
+
+  /**
+   * 处理自动分组
+   *
+   * @memberof MDCtrlController
+   */
+  protected handleAutoGroup(): void {
+    const { groupAppDEFieldId } = this.model;
+    if (groupAppDEFieldId) {
+      const { items } = this.state;
+      const groupMap: Map<string, MobMDCtrlRowState[]> = new Map();
+      items.forEach((item: IData) => {
+        const groupVal = item[groupAppDEFieldId];
+        if (isNil(groupVal)) {
+          // 分组无值的不显示
+          return;
+        }
+
+        if (!groupMap.has(groupVal)) {
+          groupMap.set(groupVal, []);
+        }
+        groupMap
+          .get(groupVal)!
+          .push(new MobMDCtrlRowState(item as ControlVO, this));
+      });
+      const groups: IMDControlGroupState[] = [];
+      groupMap.forEach((value: IData[], key: string) => {
+        groups.push({
+          caption: key,
+          key,
+          children: [...value],
+        });
+      });
+      this.state.groups = groups;
+    }
+  }
+
+  /**
+   * 加载并初始化分组代码表项集合
+   * @author lxm
+   * @date 2023-08-29 05:11:39
+   * @protected
+   * @return {*}  {Promise<void>}
+   */
+  protected async initGroupCodeListItems(): Promise<void> {
+    const { groupCodeListId } = this.model;
+    if (!groupCodeListId) {
+      return;
+    }
+    const app = ibiz.hub.getApp(this.context.srfappid);
+    this.groupCodeListItems = await app.codeList.get(
+      groupCodeListId,
+      this.context,
+      this.params,
+    );
+  }
+
+  /**
+   * 处理代码表分组
+   *
+   * @memberof MDCtrlController
+   */
+  protected async handleCodeListGroup(): Promise<void> {
+    const { groupAppDEFieldId, groupCodeListId } = this.model;
+    if (!groupCodeListId) {
+      throw new RuntimeModelError(this.model, '分组代码表没有配置');
+    }
+    const { items } = this.state;
+    const groupMap: Map<string | number, MobMDCtrlRowState[]> = new Map();
+    this.groupCodeListItems!.forEach(item => {
+      groupMap.set(item.value, []);
+    });
+    items.forEach((item: IData) => {
+      const groupVal = item[groupAppDEFieldId!];
+      const groupArr = groupMap.get(groupVal);
+      if (groupArr) {
+        groupArr.push(new MobMDCtrlRowState(item as ControlVO, this));
+      }
+      // 不在代码表里数据忽略
+    });
+
+    const groups: IMDControlGroupState[] = [];
+    groupMap.forEach((arr, key) => {
+      // 标题
+      const codeListItem = this.groupCodeListItems!.find(
+        item => item.value === key,
+      )!;
+      groups.push({
+        caption: codeListItem.text,
+        key: codeListItem.value,
+        children: arr,
+      });
+    });
+    this.state.groups = groups;
+  }
 }

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

@@ -0,0 +1,112 @@
+import { RuntimeModelError } from '@ibiz-template/core';
+import { IAppDEField, ISearchBarFilter } from '@ibiz/model-core';
+import {
+  IEditorContainerController,
+  IEditorController,
+  IEditorProvider,
+} from '../../../interface';
+import { findFieldById } from '../../../model';
+import { getEditorProvider } from '../../../register';
+import { SearchBarController } from './search-bar.controller';
+
+/**
+ * 搜索栏过滤项控制器
+ * @author lxm
+ * @date 2023-10-12 05:49:19
+ * @export
+ * @class SearchBarFilterController
+ * @implements {IEditorContainerController}
+ */
+export class SearchBarFilterController implements IEditorContainerController {
+  unitName: string | undefined;
+
+  valueFormat: string | undefined;
+
+  get context(): IContext {
+    return this.searchBar.context;
+  }
+
+  get params(): IParams {
+    return this.searchBar.params;
+  }
+
+  dataType: number | undefined;
+
+  /**
+   * 编辑器控制器
+   *
+   * @author lxm
+   * @date 2022-08-24 20:08:42
+   * @type {IEditorController}
+   */
+  editor?: IEditorController;
+
+  /**
+   * 编辑器适配器
+   *
+   * @author lxm
+   * @date 2022-08-24 20:08:42
+   */
+  editorProvider?: IEditorProvider;
+
+  /**
+   * 过滤的属性名称(有实体属性的是属性codeName小写，没有就是项名称)
+   * @author lxm
+   * @date 2023-10-13 02:51:39
+   * @type {string}
+   */
+  fieldName: string;
+
+  /**
+   * 属性显示的标题
+   * @author lxm
+   * @date 2023-10-13 03:02:42
+   * @type {string}
+   */
+  label: string;
+
+  /**
+   * 配置的属性搜索模式对应的值操作
+   * @author lxm
+   * @date 2023-10-13 03:22:10
+   * @type {string}
+   */
+  valueOP?: string;
+
+  constructor(
+    public model: ISearchBarFilter,
+    public searchBar: SearchBarController,
+  ) {
+    // 实体属性
+    let field: IAppDEField | undefined;
+    if (model.appDEFieldId) {
+      field = findFieldById(searchBar.appDataEntity, model.appDEFieldId)!;
+    }
+    this.fieldName = field ? field.codeName!.toLowerCase() : model.id!;
+
+    // 属性标题
+    this.label = model.caption || field?.logicName || model.id!;
+
+    this.valueOP = model.defsearchMode?.valueOP;
+  }
+
+  /**
+   * 初始化
+   * @author lxm
+   * @date 2023-10-12 05:47:19
+   * @return {*}  {Promise<void>}
+   */
+  async init(): Promise<void> {
+    if (!this.model.editor) {
+      throw new RuntimeModelError(this.model, '缺少编辑器模型');
+    }
+
+    this.editorProvider = await getEditorProvider(this.model.editor);
+    if (this.editorProvider) {
+      this.editor = await this.editorProvider.createController(
+        this.model.editor,
+        this,
+      );
+    }
+  }
+}