@ibiz-template/runtime 0.1.38 → 0.2.0

package/out/service/utils/dynamic-code-list/dynamic-code-list.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"dynamic-code-list.d.ts","sourceRoot":"","sources":["../../../../src/service/utils/dynamic-code-list/dynamic-code-list.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,YAAY,EAAE,MAAM,kBAAkB,CAAC;AAGhD,OAAO,EAAE,WAAW,EAAE,MAAM,sBAAsB,CAAC;AACnD,OAAO,EAAE,YAAY,EAAE,MAAM,oBAAoB,CAAC;AAGlD;;;;;;GAMG;AACH,KAAK,SAAS,GAAG;IACf;;;;;;OAMG;IACH,cAAc,EAAE,MAAM,CAAC;IAEvB;;;;;;OAMG;IACH,KAAK,CAAC,EAAE,YAAY,EAAE,CAAC;IAEvB;;;;;;OAMG;IACH,OAAO,CAAC,EAAE,OAAO,CAAC,YAAY,EAAE,CAAC,CAAC;CACnC,CAAC;AAEF;;;;;;;GAOG;AACH,qBAAa,oBAAoB;IAC/B,SAAS,CAAC,GAAG,EAAG,WAAW,CAAC;IAE5B;;;;;;;OAOG;IACH,SAAS,CAAC,QAAQ,EAAE,YAAY,CAAC;IAEjC;;;;;;OAMG;IACH,SAAS,CAAC,KAAK,yBAAgC;IAE/C;;;;;;;OAOG;IACH,SAAS,CAAC,YAAY,EAAE,OAAO,CAAS;IAExC;;;;;;OAMG;IACH,SAAS,CAAC,WAAW,CAAC,EAAE,OAAO,CAAC,IAAI,CAAC,CAAC;gBAE1B,QAAQ,EAAE,YAAY;IAIlC;;;;;;OAMG;IACG,IAAI,IAAI,OAAO,CAAC,IAAI,CAAC;IAqB3B;;;;;;;OAOG;IACH,SAAS,CAAC,WAAW,CAAC,IAAI,EAAE,KAAK,GAAG,YAAY;IAuDhD;;;;;;;;;OASG;cACa,IAAI,CAClB,OAAO,GAAE,OAAY,EACrB,MAAM,GAAE,OAAY,GACnB,OAAO,CAAC,YAAY,EAAE,CAAC;IA2D1B;;;;OAIG;IACH,SAAS,CAAC,eAAe,CACvB,KAAK,EAAE,KAAK,EAAE,EACd,MAAM,CAAC,EAAE,MAAM,GAAG,MAAM,GACvB,YAAY,EAAE,GAAG,SAAS;IAwB7B;;;;;;;;OAQG;IACG,GAAG,CACP,OAAO,GAAE,OAAY,EACrB,MAAM,GAAE,OAAY,GACnB,OAAO,CAAC,YAAY,EAAE,CAAC;CAyC3B"}
+{"version":3,"file":"dynamic-code-list.d.ts","sourceRoot":"","sources":["../../../../src/service/utils/dynamic-code-list/dynamic-code-list.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,YAAY,EAAE,MAAM,kBAAkB,CAAC;AAGhD,OAAO,EAAE,WAAW,EAAE,MAAM,sBAAsB,CAAC;AACnD,OAAO,EAAE,YAAY,EAAE,MAAM,oBAAoB,CAAC;AAGlD;;;;;;GAMG;AACH,KAAK,SAAS,GAAG;IACf;;;;;;OAMG;IACH,cAAc,EAAE,MAAM,CAAC;IAEvB;;;;;;OAMG;IACH,KAAK,CAAC,EAAE,YAAY,EAAE,CAAC;IAEvB;;;;;;OAMG;IACH,OAAO,CAAC,EAAE,OAAO,CAAC,YAAY,EAAE,CAAC,CAAC;CACnC,CAAC;AAEF;;;;;;;GAOG;AACH,qBAAa,oBAAoB;IAC/B,SAAS,CAAC,GAAG,EAAG,WAAW,CAAC;IAE5B;;;;;;;OAOG;IACH,SAAS,CAAC,QAAQ,EAAE,YAAY,CAAC;IAEjC;;;;;;OAMG;IACH,SAAS,CAAC,KAAK,yBAAgC;IAE/C;;;;;;;OAOG;IACH,SAAS,CAAC,YAAY,EAAE,OAAO,CAAS;IAExC;;;;;;OAMG;IACH,SAAS,CAAC,WAAW,CAAC,EAAE,OAAO,CAAC,IAAI,CAAC,CAAC;gBAE1B,QAAQ,EAAE,YAAY;IAIlC;;;;;;OAMG;IACG,IAAI,IAAI,OAAO,CAAC,IAAI,CAAC;IAqB3B;;;;;;;OAOG;IACH,SAAS,CAAC,WAAW,CAAC,IAAI,EAAE,KAAK,GAAG,YAAY;IAuDhD;;;;;;;;;OASG;cACa,IAAI,CAClB,OAAO,GAAE,OAAY,EACrB,MAAM,GAAE,OAAY,GACnB,OAAO,CAAC,YAAY,EAAE,CAAC;IAuE1B;;;;OAIG;IACH,SAAS,CAAC,eAAe,CACvB,KAAK,EAAE,KAAK,EAAE,EACd,MAAM,CAAC,EAAE,MAAM,GAAG,MAAM,GACvB,YAAY,EAAE,GAAG,SAAS;IAwB7B;;;;;;;;OAQG;IACG,GAAG,CACP,OAAO,GAAE,OAAY,EACrB,MAAM,GAAE,OAAY,GACnB,OAAO,CAAC,YAAY,EAAE,CAAC;CAyC3B"}

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

@@ -1,6 +1,6 @@
 import { ModelError, RuntimeModelError } from '@ibiz-template/core';
 import { isNil } from 'ramda';
-import { ScriptFactory } from '../../../utils';
+import { convertNavData, ScriptFactory } from '../../../utils';
 /**
  * 动态代码表缓存对象
  *
@@ -114,20 +114,28 @@ 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 });
-        }
+        const { appDataEntityId, appDEDataSetId, minorSortAppDEFieldId, minorSortDir, pvalueAppDEFieldId, customCond, } = this.codeList;
+        // *处理查询参数
+        const tempParams = Object.assign({}, params);
         // 排序
         if (minorSortAppDEFieldId && minorSortDir) {
-            Object.assign(params, {
+            Object.assign(tempParams, {
                 sort: `${minorSortAppDEFieldId.toLowerCase()},${minorSortDir.toLowerCase()}`,
             });
         }
+        // 自定义查询
+        if (customCond) {
+            const navParams = ScriptFactory.execSingleLine(customCond);
+            const addParams = convertNavData(navParams, tempParams, context);
+            Object.assign(tempParams, addParams);
+        }
+        // 特殊处理，避免预置代码表加载不全
+        if (!tempParams.size) {
+            tempParams.size = 10000;
+        }
+        // *预定义加载
         if (this.isPredefined) {
-            const res = await app.net.get(`/dictionaries/codelist/${this.codeList.codeName}`, params);
+            const res = await app.net.get(`/dictionaries/codelist/${this.codeList.codeName}`, tempParams);
             return Object.freeze(res.data.items);
         }
         // *加载实体服务数据
@@ -137,7 +145,7 @@ export class DynamicCodeListCache {
         if (!appDEDataSetId) {
             throw new RuntimeModelError(this.codeList, '未配置数据集');
         }
-        const res = await app.deService.exec(appDataEntityId, appDEDataSetId, context, {}, params);
+        const res = await app.deService.exec(appDataEntityId, appDEDataSetId, context, undefined, tempParams);
         let resultItems = [];
         if (res.data.length) {
             res.data.forEach((item) => {

package/package.json

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

package/src/service/utils/dynamic-code-list/dynamic-code-list.ts

@@ -3,7 +3,7 @@ import { ModelError, RuntimeModelError } from '@ibiz-template/core';
 import { isNil } from 'ramda';
 import { Application } from '../../../application';
 import { CodeListItem } from '../../../interface';
-import { ScriptFactory } from '../../../utils';
+import { convertNavData, ScriptFactory } from '../../../utils';
 
 /**
  * 实际缓存对象
@@ -206,22 +206,34 @@ export class DynamicCodeListCache {
       minorSortAppDEFieldId,
       minorSortDir,
       pvalueAppDEFieldId,
+      customCond,
     } = this.codeList;
-    // *预定义加载
-    // 特殊处理，避免预置代码表加载不全
-    if (!params.size) {
-      params = { ...params, size: 10000 };
-    }
+
+    // *处理查询参数
+    const tempParams = { ...params };
+
     // 排序
     if (minorSortAppDEFieldId && minorSortDir) {
-      Object.assign(params, {
+      Object.assign(tempParams, {
         sort: `${minorSortAppDEFieldId.toLowerCase()},${minorSortDir.toLowerCase()}`,
       });
     }
+    // 自定义查询
+    if (customCond) {
+      const navParams = ScriptFactory.execSingleLine(customCond) as IData;
+      const addParams = convertNavData(navParams, tempParams, context);
+      Object.assign(tempParams, addParams);
+    }
+    // 特殊处理，避免预置代码表加载不全
+    if (!tempParams.size) {
+      tempParams.size = 10000;
+    }
+
+    // *预定义加载
     if (this.isPredefined) {
       const res = await app.net.get(
         `/dictionaries/codelist/${this.codeList.codeName}`,
-        params,
+        tempParams,
       );
       return Object.freeze(res.data.items);
     }
@@ -238,8 +250,8 @@ export class DynamicCodeListCache {
       appDataEntityId!,
       appDEDataSetId,
       context,
-      {},
-      params,
+      undefined,
+      tempParams,
     );
     let resultItems: CodeListItem[] = [];
     if (res.data.length) {