@ibiz-template/runtime 0.7.30 → 0.7.31-alpha.1

package/dist/index.esm.js

@@ -5904,6 +5904,35 @@ async function calcDynaSysParams(appDataEntityId, context, opts = {}) {
 
 // src/service/service/code-list/code-list.service.ts
 import { RuntimeError as RuntimeError16 } from "@ibiz-template/core";
+import { isNumber } from "lodash-es";
+
+// src/controller/utils/code-list/code-list.ts
+function calcThresholdRange(codelist, value) {
+  return codelist.find((item) => {
+    if (!item.beginValue && !item.endValue) {
+      return item.value == value;
+    }
+    let beginCond = true;
+    if (item.beginValue) {
+      if (item.includeBeginValue) {
+        beginCond = value >= item.beginValue;
+      } else {
+        beginCond = value > item.beginValue;
+      }
+    }
+    let endCond = true;
+    if (item.endValue) {
+      if (item.includeEndValue) {
+        endCond = value <= item.endValue;
+      } else {
+        endCond = value < item.endValue;
+      }
+    }
+    return beginCond && endCond;
+  });
+}
+
+// src/service/service/code-list/code-list.service.ts
 var CodeListService = class {
   constructor(appModel) {
     this.appModel = appModel;
@@ -6067,6 +6096,58 @@ var CodeListService = class {
     }
     return [];
   }
+  /**
+   * 递归查找代码表项
+   *
+   * @param {IAppCodeList} codeList 代码表模型
+   * @param {readonly CodeListItem[] | undefined} dataItems 代码表数据
+   * @param {string | number} value 代码项值
+   * @returns 代码表项|CodeListItem | undefined
+   */
+  findCodeListItem(codeList, dataItems, value) {
+    if (dataItems) {
+      const { thresholdGroup } = codeList;
+      if (thresholdGroup && isNumber(Number(value))) {
+        const findItem2 = calcThresholdRange(dataItems, Number(value));
+        if (findItem2) {
+          return findItem2;
+        }
+      }
+      const findItem = dataItems.find((item) => item.value === value);
+      if (findItem) {
+        return findItem;
+      }
+      for (let i = 0; i < dataItems.length; i++) {
+        const childrenItem = this.findCodeListItem(
+          codeList,
+          dataItems[i].children,
+          value
+        );
+        if (childrenItem) {
+          return childrenItem;
+        }
+      }
+    }
+  }
+  /**
+   * 获取代码表项
+   *
+   * @param {string} tag 代码表标识
+   * @param {string | number} value 代码表值
+   * @param {IContext} context 上下文
+   * @param {IParams} params 视图参数
+   * @returns 代码表项|Promise<CodeListItem | undefined>
+   */
+  async getItem(tag, value, context, params) {
+    const codeList = this.allCodeLists.get(tag);
+    if (!codeList) {
+      throw new RuntimeError16(
+        ibiz.i18n.t("runtime.service.noFindCodeList", { tag })
+      );
+    }
+    const dataItems = await this.get(tag, context, params);
+    return this.findCodeListItem(codeList, dataItems, value);
+  }
   /**
    * 获取代码表实例对象(动态代码表返回具体实例，静态代码表返回undefined)
    *
@@ -10195,6 +10276,17 @@ var DEActionMethod = class extends Method {
         }
       }
       const methodTag = this.method.actionTag ? this.method.actionTag.toUpperCase() : this.method.codeName.toUpperCase();
+      if (this.method.beforeCode) {
+        await ScriptFactory.asyncExecScriptFn(
+          {
+            context,
+            data,
+            viewParam: params,
+            activeData: header
+          },
+          this.method.beforeCode
+        );
+      }
       switch (methodTag) {
         case "CREATE":
           result = await this.create(context, data, params || {}, header);
@@ -10249,6 +10341,17 @@ var DEActionMethod = class extends Method {
         }
       }
     }
+    if (this.method.afterCode) {
+      await ScriptFactory.asyncExecScriptFn(
+        {
+          context,
+          data: result.data,
+          viewParam: params,
+          activeData: header
+        },
+        this.method.afterCode
+      );
+    }
     if (result.data) {
       await execFieldLogics(
         this.entity,
@@ -12160,6 +12263,14 @@ var _DEServiceUtil = class _DEServiceUtil {
    * @return {*}  {Promise<IAppDEService>}
    */
   async getService(context, id) {
+    const { targetApp, targetAppDataEntityId } = await this.computeAppDEMappingParam(context, id);
+    if (targetApp && targetAppDataEntityId) {
+      const targetService = await targetApp.deService.getService(
+        context,
+        targetAppDataEntityId
+      );
+      return targetService;
+    }
     const sandboxId = context.srfsessionid || "applocation";
     if (!this.cache.has(sandboxId)) {
       this.cache.set(sandboxId, /* @__PURE__ */ new Map());
@@ -12269,6 +12380,18 @@ var _DEServiceUtil = class _DEServiceUtil {
    * @return {*}  {Promise<IHttpResponse<IData>>}
    */
   async exec(appDataEntityId, methodName, context, params, params2, header) {
+    const { targetApp, targetAppDataEntityId } = await this.computeAppDEMappingParam(context, appDataEntityId);
+    if (targetApp && targetAppDataEntityId) {
+      const result = await targetApp.deService.exec(
+        targetAppDataEntityId,
+        methodName,
+        context,
+        params,
+        params2,
+        header
+      );
+      return result;
+    }
     const service = await this.getService(context, appDataEntityId);
     try {
       const result = await service.exec(
@@ -12286,6 +12409,46 @@ var _DEServiceUtil = class _DEServiceUtil {
       throw error;
     }
   }
+  /**
+   * 计算应用实体服务映射参数
+   * srfappdemapping：是否开启应用实体服务映射
+   * srfappmappingmap：应用映射表,与srfappdemapping搭配使用，原应用标识：目标应用标识，以冒号分割，多个应用以逗号隔开
+   * 如:logicdesign__logicdesign:ibizplm__plmweb
+   *
+   * @author tony001
+   * @date 2024-07-19 15:07:31
+   * @param {IContext} context
+   * @param {string} appDataEntityId
+   * @return {*}  {Promise<IData>}
+   */
+  async computeAppDEMappingParam(context, appDataEntityId) {
+    const result = {};
+    if (context.srfappdemapping && context.srfappdemapping === "true" && context.srfappmappingmap) {
+      const { srfappmappingmap } = context;
+      const appMap = /* @__PURE__ */ new Map();
+      const appMappings = (srfappmappingmap == null ? void 0 : srfappmappingmap.split(",")) || [];
+      for (const appMpping of appMappings) {
+        const [sourceAppId, targetAppId] = appMpping.split(":");
+        appMap.set(sourceAppId, targetAppId);
+      }
+      if (appMap.has(this.appModel.appId)) {
+        const targetApp = ibiz.hub.getApp(appMap.get(this.appModel.appId));
+        if (targetApp) {
+          Object.assign(result, { targetApp });
+          if (appDataEntityId.indexOf(".") !== -1) {
+            Object.assign(result, {
+              targetAppDataEntityId: "".concat(targetApp.model.id, ".").concat(appDataEntityId.split(".").pop())
+            });
+          } else {
+            Object.assign(result, {
+              targetAppDataEntityId: appDataEntityId
+            });
+          }
+        }
+      }
+    }
+    return result;
+  }
 };
 /**
  * 实体服务构造方法缓存
@@ -13113,8 +13276,8 @@ var baseStyle = {
   position: "fixed",
   zIndex: "10000"
 };
-function cloneElement(clone42, teleport = document.body, isRemoveChild = true) {
-  const element = getAnimationElement(clone42);
+function cloneElement(clone41, teleport = document.body, isRemoveChild = true) {
+  const element = getAnimationElement(clone41);
   if (element == null) {
     throw new Error(ibiz.i18n.t("runtime.utils.anime.noClone"));
   }
@@ -13533,11 +13696,11 @@ function arrayContains(arr, val) {
   });
 }
 function cloneObject(o) {
-  var clone42 = {};
+  var clone41 = {};
   for (var p in o) {
-    clone42[p] = o[p];
+    clone41[p] = o[p];
   }
-  return clone42;
+  return clone41;
 }
 function replaceObjectProps(o1, o2) {
   var o = cloneObject(o1);
@@ -15857,10 +16020,7 @@ var _OpenAppViewCommand = class _OpenAppViewCommand {
       case "POPUPMODAL":
         return this.openModal(appView, context, params);
       case "POPUPAPP":
-        throw new ModelError15(
-          appView,
-          ibiz.i18n.t("runtime.command.app.unsupportedPopupapp")
-        );
+        return this.openPopupApp(appView, context, params);
       case "POPOVER":
         return this.openPopover(appView, context, params, opts);
       case "DRAWER_LEFT":
@@ -15963,6 +16123,20 @@ var _OpenAppViewCommand = class _OpenAppViewCommand {
   async openUserCustom(appView, context, params = {}) {
     return ibiz.openView.custom(appView.id, context, params);
   }
+  /**
+   * 独立程序弹出
+   *
+   * @author zzq
+   * @date 2024-07-19 20:07:55
+   * @protected
+   * @param {IViewConfig} appView
+   * @param {IContext} [context]
+   * @param {IParams} [params={}]
+   * @return {*}  {Promise<void>}
+   */
+  async openPopupApp(appView, context, params = {}) {
+    return ibiz.openView.popupApp(appView.id, context, params);
+  }
 };
 _OpenAppViewCommand.TAG = "ibiz.app-view.open";
 var OpenAppViewCommand = _OpenAppViewCommand;
@@ -17197,7 +17371,7 @@ function getOriginData(data) {
 
 // src/controller/utils/value-rule/value-rule.ts
 import { RuntimeError as RuntimeError31 } from "@ibiz-template/core";
-import { isNilOrEmpty as isNilOrEmpty6, isNumber } from "qx-util";
+import { isNilOrEmpty as isNilOrEmpty6, isNumber as isNumber2 } from "qx-util";
 import { isNil as isNil18 } from "ramda";
 function generateRules(itemVRs, name, valueItemName) {
   const rules = [];
@@ -17296,7 +17470,7 @@ function generateEditorRules(editor) {
   if (!isNil18(maxValue)) {
     rules.push({
       validator: (rule, value, callback) => {
-        if (!isNil18(value) && isNumber(value) && value > maxValue) {
+        if (!isNil18(value) && isNumber2(value) && value > maxValue) {
           callback(new Error("\u503C\u5FC5\u987B\u5C0F\u4E8E\u7B49\u4E8E".concat(maxValue)));
         } else {
           return true;
@@ -17307,7 +17481,7 @@ function generateEditorRules(editor) {
   if (!isNil18(minValue)) {
     rules.push({
       validator: (rule, value, callback) => {
-        if (!isNil18(value) && isNumber(value) && value < minValue) {
+        if (!isNil18(value) && isNumber2(value) && value < minValue) {
           callback(new Error("\u503C\u5FC5\u987B\u5927\u4E8E\u7B49\u4E8E".concat(minValue)));
         } else {
           return true;
@@ -18137,32 +18311,6 @@ var ViewMsgController = class _ViewMsgController {
   }
 };
 
-// src/controller/utils/code-list/code-list.ts
-function calcThresholdRange(codelist, value) {
-  return codelist.find((item) => {
-    if (!item.beginValue && !item.endValue) {
-      return item.value == value;
-    }
-    let beginCond = true;
-    if (item.beginValue) {
-      if (item.includeBeginValue) {
-        beginCond = value >= item.beginValue;
-      } else {
-        beginCond = value > item.beginValue;
-      }
-    }
-    let endCond = true;
-    if (item.endValue) {
-      if (item.includeEndValue) {
-        endCond = value <= item.endValue;
-      } else {
-        endCond = value < item.endValue;
-      }
-    }
-    return beginCond && endCond;
-  });
-}
-
 // src/controller/common/base.controller.ts
 var SELF_KEY = "__self";
 var BaseController = class {
@@ -21196,7 +21344,6 @@ var CalendarController = class extends MDControlController {
 
 // src/controller/control/chart/chart.controller.ts
 import { RuntimeError as RuntimeError44 } from "@ibiz-template/core";
-import { clone as clone25 } from "ramda";
 
 // src/controller/control/chart/generator/chart-options-generator.ts
 import { clone as clone24, mergeDeepRight as mergeDeepRight3 } from "ramda";
@@ -21470,6 +21617,7 @@ var BaseSeriesGenerator = class {
     const groupData = this.groupData;
     const { seriesCodeListId, catalogCodeListId } = this.model;
     data.forEach((item) => {
+      var _a, _b;
       let group = DEFAULT_GROUP;
       if (this.groupField) {
         const groupVal = this.translateVal(
@@ -21493,9 +21641,16 @@ var BaseSeriesGenerator = class {
               tempCodeLists.push({ codename, codelist: clone22(codeListItems) });
             } else if (mode === "field") {
               const tempdata = data.map((_data) => {
+                var _a2, _b2;
+                let tempValue;
+                if ((_a2 = _data.$origin) == null ? void 0 : _a2.$origin) {
+                  tempValue = _data.$origin.$origin[codename];
+                } else {
+                  tempValue = (_b2 = _data.$origin) == null ? void 0 : _b2[codename];
+                }
                 return {
                   text: _data[codename],
-                  value: _data[codename]
+                  value: tempValue
                 };
               });
               tempCodeLists.push({ codename, codelist: tempdata });
@@ -21523,6 +21678,7 @@ var BaseSeriesGenerator = class {
           const codeListItems = this.chartGenerator.codeListMap.get(catalogCodeListId);
           codeListItems.forEach((x) => {
             groupData[group].set(x.text, { value: 0 });
+            this.catalogMap.set(x.text, { [this.catalogField]: x.value });
             this.prepareChartData(
               groupData,
               {
@@ -21563,6 +21719,17 @@ var BaseSeriesGenerator = class {
       if (!catalog) {
         return;
       }
+      if (!catalogCodeListId) {
+        let tempValue;
+        if ((_a = item.$origin) == null ? void 0 : _a.$origin) {
+          tempValue = item.$origin.$origin[this.catalogField];
+        } else {
+          tempValue = (_b = item.$origin) == null ? void 0 : _b[this.catalogField];
+        }
+        this.catalogMap.set(item[this.catalogField], {
+          [this.catalogField]: tempValue
+        });
+      }
       if (!groupData[group].get(catalog)) {
         groupData[group].set(catalog, { value: 0 });
       }
@@ -21594,7 +21761,7 @@ var BaseSeriesGenerator = class {
    * @return {*}  {SeriesOption[]}
    */
   calcGroupSeries(groupData) {
-    return Object.keys(groupData).map((group) => {
+    const tempSeries = Object.keys(groupData).map((group) => {
       const catalogData = groupData[group];
       const data = this.calcSeriesData(catalogData);
       let options = { ...this.staticOptions, data };
@@ -21610,6 +21777,23 @@ var BaseSeriesGenerator = class {
       }
       return options;
     });
+    if (this.model.seriesCodeListId) {
+      const codelist = this.chartGenerator.codeListMap.get(
+        this.model.seriesCodeListId
+      );
+      if (codelist) {
+        tempSeries.sort((a, b) => {
+          const aIndex = codelist.findIndex((_code) => {
+            return _code.text === a.name;
+          });
+          const bIndex = codelist.findIndex((_code) => {
+            return _code.text === b.name;
+          });
+          return aIndex - bIndex;
+        });
+      }
+    }
+    return tempSeries;
   }
   /**
    * 生成每条序列的data,由于不同图表类型格式不同所以为any
@@ -22432,10 +22616,10 @@ var ChartOptionsGenerator2 = class {
     if (controlParam && ((_a = controlParam.ctrlParams) == null ? void 0 : _a.ZONE)) {
       const length = (_b = this.model.dechartSerieses) == null ? void 0 : _b.length;
       if (length) {
-        const height = 90 / length;
+        const height = 85 / length;
         const items = [];
         for (let i = 0; i < length; i++) {
-          const top = i * height + 5;
+          const top = i * height + 10;
           const bottom = 100 - (height + top);
           items.push({
             top: "".concat(top, "%"),
@@ -22499,7 +22683,7 @@ var ChartOptionsGenerator2 = class {
                   if (((_a2 = controlParam.ctrlParams) == null ? void 0 : _a2.MODE) === "ROW") {
                     const yAxisData = this.handleAxisLayout(
                       codeListItems,
-                      40,
+                      60,
                       tempCatalogFields.length,
                       index
                     );
@@ -22563,7 +22747,7 @@ var ChartOptionsGenerator2 = class {
                 });
               } else {
                 Object.assign(this.chartUserParam.grid, {
-                  left: (catalogLength + 1) * 40
+                  left: (catalogLength + 1) * 60
                 });
               }
               const tempyAxis = this.chartUserParam.yAxis;
@@ -22584,7 +22768,7 @@ var ChartOptionsGenerator2 = class {
                   {
                     value: mergeName.split("").join("\n"),
                     textStyle: {
-                      padding: [0, catalogLength * 40, 0, 0],
+                      padding: [0, catalogLength * 50, 0, 0],
                       ...nameTextStyle
                     }
                   }
@@ -22896,13 +23080,27 @@ var ChartController = class extends MDControlController {
    * @memberof ChartController
    */
   changeTooltipState(tag = true) {
-    if (this.options && this.options.tooltip) {
+    if (this.chart && this.options && this.options.tooltip) {
       if (tag) {
-        Object.assign(this.options.tooltip, { show: this.tooltipState });
+        this.chart.setOption(
+          {
+            tooltip: {
+              show: this.tooltipState
+            }
+          },
+          { notMerge: false }
+        );
       } else {
-        Object.assign(this.options.tooltip, { show: false });
+        this.chart.setOption(
+          {
+            tooltip: {
+              show: false
+            }
+          },
+          { notMerge: false }
+        );
       }
-      this.updateChart();
+      this.resizeChart();
     }
   }
   /**
@@ -22915,10 +23113,19 @@ var ChartController = class extends MDControlController {
     var _a;
     const { data, seriesType } = arg;
     let tempConfig = {};
-    if (seriesType === "pie") {
+    if (seriesType === "pie" || seriesType === "gauge") {
       if (data && data.value && Array.isArray(data.value)) {
         tempConfig = data.value.at(1);
       }
+    } else if (seriesType === "radar") {
+      const { componentIndex, componentSubType, componentType, event } = arg;
+      const index = event.topTarget.__dimIdx;
+      if (componentType === "series" && (index || index === 0)) {
+        const serieid2 = "".concat(componentSubType, "_").concat(componentIndex);
+        tempConfig = {
+          _seriesModelId: serieid2
+        };
+      }
     } else if (data && Array.isArray(data)) {
       tempConfig = data.at(2);
     }
@@ -22929,36 +23136,39 @@ var ChartController = class extends MDControlController {
     return targetSerie;
   }
   /**
-   * 处理查看明细参数
+   * 计算查看明细参数
    *
    * @param {IData} arg
    * @return {*}
    * @memberof ChartController
    */
   computedDrillDetailParam(arg) {
-    var _a;
-    const { seriesType, data } = arg;
+    var _a, _b;
+    const { seriesType } = arg;
     const targetSerie = this.computedClickSerieModel(arg);
     let measureId = "";
     const dimension = [];
     if (targetSerie) {
       measureId = targetSerie.valueField;
-      if (seriesType === "pie") {
-        if (data && data.value && Array.isArray(data.value)) {
-          const value = data.value.at(1);
-          const tempData = clone25(value.$origin);
-          Object.keys(tempData).forEach((key) => {
-            if (key !== targetSerie.valueField && key !== "$origin") {
+      if (seriesType === "radar") {
+        const { event } = arg;
+        const index = event.topTarget.__dimIdx;
+        const cataData = this.generator.radarMap.get(targetSerie.catalogField);
+        if (cataData && cataData.indicatorKeys) {
+          const cataValue = cataData.indicatorKeys[index];
+          const tempDimension = (_a = this.generator.seriesGenerators) == null ? void 0 : _a[0].catalogMap.get(cataValue);
+          if (tempDimension) {
+            Object.keys(tempDimension).forEach((key) => {
               dimension.push({
                 name: key,
-                value: tempData[key]
+                value: tempDimension[key]
               });
-            }
-          });
+            });
+          }
         }
-      } else {
+      } else if (seriesType !== "gauge") {
         const value = arg.name;
-        const tempDimension = (_a = this.generator.seriesGenerators) == null ? void 0 : _a[0].catalogMap.get(value);
+        const tempDimension = (_b = this.generator.seriesGenerators) == null ? void 0 : _b[0].catalogMap.get(value);
         if (tempDimension) {
           Object.keys(tempDimension).forEach((key) => {
             dimension.push({
@@ -22973,7 +23183,7 @@ var ChartController = class extends MDControlController {
       measure: {
         name: measureId
       },
-      dimension
+      dimension: dimension.length > 0 ? dimension : void 0
     };
   }
   /**
@@ -23411,7 +23621,7 @@ import { ModelError as ModelError19, RuntimeModelError as RuntimeModelError34 }
 
 // src/ui-logic/utils/handle-src-val.ts
 import { ModelError as ModelError18 } from "@ibiz-template/core";
-import { clone as clone26 } from "ramda";
+import { clone as clone25 } from "ramda";
 function handleSrcVal2(ctx, srcValParams) {
   const { srcDEUILogicParamId, srcFieldName, srcValue } = srcValParams;
   const srcValueType = srcValParams.srcValueType || "SRCDLPARAM";
@@ -23438,7 +23648,7 @@ function handleSrcVal2(ctx, srcValParams) {
       value = ctx.parameters.context;
       break;
     case "ENVPARAM":
-      value = clone26(ibiz.env);
+      value = clone25(ibiz.env);
       break;
     default:
       throw new ModelError18(
@@ -23895,7 +24105,7 @@ var EndNode2 = class extends UILogicNode {
 
 // src/ui-logic/ui-logic-node/prepare-js-param-node/prepare-js-param-node.ts
 import { ModelError as ModelError22, RuntimeError as RuntimeError45 } from "@ibiz-template/core";
-import { clone as clone27 } from "ramda";
+import { clone as clone26 } from "ramda";
 var PrepareJSParamNode = class extends UILogicNode {
   async exec(ctx) {
     const nodeParams = this.model.deuilogicNodeParams;
@@ -23905,7 +24115,7 @@ var PrepareJSParamNode = class extends UILogicNode {
     for (const nodeParam of nodeParams) {
       let originValue;
       if (nodeParam.dstDEUILogicParamId && ibiz.env.logLevel === "DEBUG") {
-        originValue = clone27(ctx.params[nodeParam.dstDEUILogicParamId]);
+        originValue = clone26(ctx.params[nodeParam.dstDEUILogicParamId]);
       }
       switch (nodeParam.paramAction) {
         case "SETPARAMVALUE":
@@ -24000,7 +24210,7 @@ var PrepareJSParamNode = class extends UILogicNode {
   copyParam(nodeParam, ctx) {
     const { dstDEUILogicParamId } = nodeParam;
     const srcVal = handleSrcVal2(ctx, nodeParam);
-    ctx.params[dstDEUILogicParamId] = clone27(srcVal);
+    ctx.params[dstDEUILogicParamId] = clone26(srcVal);
   }
   /**
    * 绑定参数
@@ -24307,7 +24517,7 @@ var ResetParamNode2 = class extends UILogicNode {
 
 // src/ui-logic/ui-logic-node/copy-param-node/copy-param-node.ts
 import { RuntimeModelError as RuntimeModelError43 } from "@ibiz-template/core";
-import { clone as clone28 } from "ramda";
+import { clone as clone27 } from "ramda";
 var CopyParamNode2 = class extends UILogicNode {
   async exec(ctx) {
     const { dstDEUILogicParamId, srcDEUILogicParamId } = this.model;
@@ -24318,7 +24528,7 @@ var CopyParamNode2 = class extends UILogicNode {
       );
     }
     const srcVal = handleSrcVal2(ctx, this.model);
-    ctx.params[dstDEUILogicParamId] = clone28(srcVal);
+    ctx.params[dstDEUILogicParamId] = clone27(srcVal);
     ctx.setLastReturn(ctx.params[dstDEUILogicParamId]);
     ibiz.log.debug(
       ibiz.i18n.t("runtime.uiLogic.copyParameter", {
@@ -26191,7 +26401,7 @@ var ContextMenuController = class extends ToolbarController {
 };
 
 // src/controller/control/dashboard/dashboard.controller.ts
-import { clone as clone29 } from "ramda";
+import { clone as clone28 } from "ramda";
 var DashboardController = class extends ControlController {
   constructor() {
     super(...arguments);
@@ -26374,7 +26584,7 @@ var DashboardController = class extends ControlController {
    */
   async loadDynaPortletById(id) {
     const app = ibiz.hub.getApp(ibiz.env.appId);
-    const tempContext = clone29(this.context);
+    const tempContext = clone28(this.context);
     Object.assign(tempContext, { psappportlet: id });
     const res = await app.deService.exec(
       "psappportlet",
@@ -26645,7 +26855,7 @@ var CustomDashboardController = class {
 
 // src/controller/control/dashboard/portlet/portlet-part/portlet-part.controller.ts
 import { merge } from "lodash-es";
-import { IBizContext as IBizContext5, IBizParams as IBizParams2 } from "@ibiz-template/core";
+import { IBizContext as IBizContext5, IBizParams as IBizParams2, Namespace as Namespace2 } from "@ibiz-template/core";
 
 // src/controller/control/dashboard/portlet/portlet-part/portlet-part.state.ts
 var PortletPartState = class {
@@ -26732,6 +26942,22 @@ var PortletPartController = class {
       return this.dashboard.getController(contentControlId);
     }
   }
+  /**
+   * @description 内容元素
+   * @readonly
+   * @type {(HTMLDivElement | null)}
+   * @memberof PortletPartController
+   */
+  get contentElement() {
+    if (this.contentController) {
+      const { codeName = "" } = this.contentController.model;
+      if (codeName) {
+        const ns = new Namespace2("control", ibiz.env.namespace);
+        return document.querySelector(".".concat(ns.m(codeName)));
+      }
+    }
+    return null;
+  }
   /**
    * 子类不可覆盖或重写此方法，在 init 时需要重写的使用 onInit 方法。
    *
@@ -26946,6 +27172,7 @@ var ContainerPortletController = class extends PortletPartController {
 };
 
 // src/controller/control/dashboard/portlet/view-portlet/view-portlet.controller.ts
+import { Namespace as Namespace3 } from "@ibiz-template/core";
 var ViewPortletController = class extends PortletPartController {
   /**
    * 内容控制器
@@ -26961,6 +27188,22 @@ var ViewPortletController = class extends PortletPartController {
       return this.dashboard.getController(portletAppView.name);
     }
   }
+  /**
+   * @description 内容元素
+   * @readonly
+   * @type {(HTMLDivElement | null)}
+   * @memberof PortletPartController
+   */
+  get contentElement() {
+    if (this.contentController) {
+      const { codeName = "" } = this.contentController.model;
+      if (codeName) {
+        const ns = new Namespace3("view", ibiz.env.namespace);
+        return document.querySelector(".".concat(ns.m(codeName)));
+      }
+    }
+    return null;
+  }
   /**
    * 刷新门户部件
    *
@@ -27024,6 +27267,21 @@ var RawItemPortletController = class extends PortletPartController {
 
 // src/controller/control/dashboard/portlet/report-portlet/report-portlet.controller.ts
 var ReportPortletController = class extends PortletPartController {
+  /**
+   * 内容控制器
+   *
+   * @author tony001
+   * @date 2024-05-07 14:05:02
+   * @readonly
+   * @type {(IController | undefined)}
+   */
+  get contentController() {
+    const { controls = [] } = this.model;
+    const reportPanel = controls.find((x) => x.controlType === "REPORTPANEL");
+    if (reportPanel && reportPanel.codeName) {
+      return this.dashboard.getController(reportPanel.codeName);
+    }
+  }
   /**
    * 刷新报表部件
    *
@@ -30707,7 +30965,7 @@ var FormMDCtrlFormController = class extends FormMDCtrlController {
 
 // src/controller/control/form/form-detail/form-mdctrl/form-mdctrl-repeater.controller.ts
 import { ModelError as ModelError28 } from "@ibiz-template/core";
-import { clone as clone30 } from "ramda";
+import { clone as clone29 } from "ramda";
 var FormMDCtrlRepeaterController = class extends FormMDCtrlController {
   constructor() {
     super(...arguments);
@@ -30799,7 +31057,7 @@ var FormMDCtrlRepeaterController = class extends FormMDCtrlController {
     copyFields.forEach((key) => {
       tempForm[key] = this.form.model[key];
     });
-    this.repeatedForm = clone30(tempForm);
+    this.repeatedForm = clone29(tempForm);
   }
   /**
    * 设置重复器控制器
@@ -31007,7 +31265,7 @@ import {
 } from "@ibiz-template/core";
 import { debounce } from "lodash-es";
 import { createUUID as createUUID12 } from "qx-util";
-import { clone as clone31, isNil as isNil27 } from "ramda";
+import { clone as clone30, isNil as isNil27 } from "ramda";
 
 // src/controller/control/form/edit-form/edit-form.service.ts
 import {
@@ -31376,8 +31634,8 @@ var EditFormController = class extends FormController {
    * @return {*}  {Promise<IData>}
    */
   async copy() {
-    const context = clone31(this.context);
-    const queryParams = clone31(this.params);
+    const context = clone30(this.context);
+    const queryParams = clone30(this.params);
     const appDataEntity = await ibiz.hub.getAppDataEntity(
       this.model.appDataEntityId,
       this.model.appId
@@ -31434,7 +31692,7 @@ var EditFormController = class extends FormController {
       return this.loadDraft();
     }
     const { context, params } = this.handlerAbilityParams(args);
-    const queryParams = clone31(params);
+    const queryParams = clone30(params);
     let res;
     try {
       await this.startLoading();
@@ -32131,7 +32389,7 @@ import {
   RuntimeError as RuntimeError59,
   RuntimeModelError as RuntimeModelError63
 } from "@ibiz-template/core";
-import { clone as clone32, isNil as isNil28 } from "ramda";
+import { clone as clone31, isNil as isNil28 } from "ramda";
 import dayjs5 from "dayjs";
 
 // src/controller/control/grid/grid/grid.service.ts
@@ -32275,6 +32533,9 @@ async function calcColumnModelBySchema(json, c) {
   });
   const addColumns = [];
   const addDataItems = [];
+  addFields.sort((a, b) => {
+    return (a.description || "").localeCompare(b.description || "");
+  });
   addFields.forEach((item) => {
     addColumns.push({
       appId: c.model.appId,
@@ -32564,7 +32825,7 @@ var GridController = class extends MDControlController {
     if (!this.addSchemaColumn) {
       return;
     }
-    const tempParams = clone32(this.jsonSchemaParams);
+    const tempParams = clone31(this.jsonSchemaParams);
     Object.assign(tempParams, this.params);
     const json = await getEntitySchema(
       this.model.appDataEntityId,
@@ -32577,7 +32838,7 @@ var GridController = class extends MDControlController {
     const result = await calcColumnModelBySchema(json, this);
     if (result && result.degridColumns.length > 0) {
       const { degridColumns, degridDataItems } = result;
-      this.model = clone32(this.model);
+      this.model = clone31(this.model);
       this.model.degridColumns = [
         ...this.model.degridColumns || [],
         ...degridColumns
@@ -33289,7 +33550,7 @@ var GridController = class extends MDControlController {
         );
       }
       if (row.data.srfuf === 1 /* UPDATE */) {
-        row.cacheData = clone32(row.data);
+        row.cacheData = clone31(row.data);
         const defaultVal = this.calcDefaultValue(row.data, false);
         Object.assign(row.data, defaultVal);
       }
@@ -33432,7 +33693,7 @@ var GridController = class extends MDControlController {
    */
   formatExcelData(data) {
     const { fields = [] } = this.dataExportParam;
-    const cloneData = clone32(
+    const cloneData = clone31(
       data.map((item) => {
         return fields.reduce((obj, key) => {
           obj[key] = item[key];
@@ -33790,7 +34051,7 @@ import {
 } from "@ibiz-template/core";
 import dayjs6 from "dayjs";
 import { debounce as debounce2 } from "lodash-es";
-import { clone as clone33, isNil as isNil29 } from "ramda";
+import { clone as clone32, isNil as isNil29 } from "ramda";
 import { isNilOrEmpty as isNilOrEmpty8 } from "qx-util";
 var GridFieldColumnController = class extends GridColumnController {
   constructor() {
@@ -33934,7 +34195,7 @@ var GridFieldColumnController = class extends GridColumnController {
       srfkey: value,
       ...wfContext
     });
-    const tempParams = clone33(this.params);
+    const tempParams = clone32(this.params);
     const { context: newContext, params: newParams } = this.handlePublicParams(
       row.data,
       tempContext,
@@ -35479,7 +35740,7 @@ var PickupViewPanelController = class extends ControlController {
 
 // src/controller/control/search-bar/search-bar.controller.ts
 import { mergeInLeft as mergeInLeft3, recursiveIterate as recursiveIterate10 } from "@ibiz-template/core";
-import { clone as clone35 } from "ramda";
+import { clone as clone34 } from "ramda";
 import { isString as isString3 } from "lodash-es";
 
 // src/controller/control/search-bar/search-bar-filter.controller.ts
@@ -35937,6 +36198,9 @@ async function calcFilterModelBySchema(json, appDataEntityId, modelAppId) {
     }
   });
   const addSearchBarFilters = [];
+  addFields.sort((a, b) => {
+    return (a.description || "").localeCompare(b.description || "");
+  });
   addFields.forEach((item) => {
     const ops = typeToOPs[item.type];
     if (!ops) {
@@ -35968,7 +36232,7 @@ async function calcFilterModelBySchema(json, appDataEntityId, modelAppId) {
 
 // src/controller/control/search-bar/search-bar-filter-items.controller.ts
 import { RuntimeError as RuntimeError62 } from "@ibiz-template/core";
-import { clone as clone34 } from "ramda";
+import { clone as clone33 } from "ramda";
 var SubFieldRegex2 = /^N_(.\w+)_(.\w+)$/;
 var SearchBarFilterItemsController = class extends SearchBarFilterController {
   constructor(filterModels, appDataEntity, context, params) {
@@ -36053,7 +36317,7 @@ var SearchBarFilterItemsController = class extends SearchBarFilterController {
       const matches = subStr.match(SubFieldRegex2);
       const subField = matches[1];
       const subOP = matches[2];
-      const cloneItem = clone34(item);
+      const cloneItem = clone33(item);
       cloneItem.defsearchMode.valueOP = subOP;
       cloneItem.id = subField;
       const filterC = new SearchBarFilterController(
@@ -36474,6 +36738,8 @@ var SearchBarController = class extends ControlController {
     this.state.quickSearchItems = [];
     this.state.quickSearchFieldNames = [];
     this.state.quickSearchPlaceHolder = "";
+    this.state.filterMode = "default";
+    this.state.customCond = "";
     this.resetFilter();
     this.state.visible = !!(this.model.enableQuickSearch || this.model.enableGroup || this.enableFilter);
   }
@@ -36520,7 +36786,7 @@ var SearchBarController = class extends ControlController {
     if (!this.addSchemaFilters) {
       return;
     }
-    const tempParams = clone35(this.jsonSchemaParams);
+    const tempParams = clone34(this.jsonSchemaParams);
     Object.assign(tempParams, this.params);
     const json = await getEntitySchema(
       this.model.appDataEntityId,
@@ -36548,7 +36814,7 @@ var SearchBarController = class extends ControlController {
       }
     });
     if (addSearchBarFilters.length > 0) {
-      this.model = clone35(this.model);
+      this.model = clone34(this.model);
       this.model.searchBarFilters = addSearchBarFilters.concat(...mergeFilters);
       this.model.enableFilter = true;
     }
@@ -36717,6 +36983,42 @@ var SearchBarController = class extends ControlController {
       );
     }
   }
+  /**
+   * 附加自定义条件
+   *
+   * @author zhanghengfeng
+   * @date 2024-07-19 10:07:34
+   * @param {IFilterNode[]} nodes
+   * @return {*}  {void}
+   */
+  attachCustomCond(nodes) {
+    if (!this.state.customCond) {
+      return;
+    }
+    if (!nodes[0]) {
+      nodes[0] = {
+        nodeType: "GROUP",
+        logicType: "AND",
+        children: []
+      };
+    }
+    const group = nodes[0];
+    if (!Array.isArray(group.children)) {
+      group.children = [];
+    }
+    const item = group.children.find(
+      (child) => child.nodeType === "CUSTOM" && child.customType === "PQL"
+    );
+    if (item) {
+      item.customCond = this.state.customCond;
+    } else {
+      group.children.push({
+        nodeType: "CUSTOM",
+        customType: "PQL",
+        customCond: this.state.customCond
+      });
+    }
+  }
   /**
    * 计算过滤项参数
    * @author lxm
@@ -36727,7 +37029,9 @@ var SearchBarController = class extends ControlController {
     if (!this.enableFilter) {
       return;
     }
-    const searchconds = calcSearchConds(this.state.filterNodes, {
+    const nodes = clone34(this.state.filterNodes);
+    this.attachCustomCond(nodes);
+    const searchconds = calcSearchConds(nodes, {
       after: (node, cond) => {
         if (node.nodeType === "FIELD" && isString3(node.value)) {
           if (ScriptValueRegex2.test(node.value)) {
@@ -36741,6 +37045,17 @@ var SearchBarController = class extends ControlController {
         }
       }
     });
+    if (!searchconds) {
+      const customNodes = [
+        {
+          nodeType: "GROUP",
+          logicType: "AND",
+          children: []
+        }
+      ];
+      this.attachCustomCond(customNodes);
+      return calcSearchConds(customNodes);
+    }
     return searchconds;
   }
   /**
@@ -36894,7 +37209,20 @@ var SearchBarController = class extends ControlController {
    */
   async handleSave() {
     if (this.grid && this.state.selectedSearchGroupItem) {
-      const filters = calcSearchCondExs(this.state.filterNodes);
+      const nodes = clone34(this.state.filterNodes);
+      this.attachCustomCond(nodes);
+      let filters = calcSearchCondExs(nodes);
+      if (!filters) {
+        const customNodes = [
+          {
+            nodeType: "GROUP",
+            logicType: "AND",
+            children: []
+          }
+        ];
+        this.attachCustomCond(customNodes);
+        filters = calcSearchCondExs(customNodes);
+      }
       const saveParams = {
         searchconds: filters,
         sort: this.grid.state.sortQuery,
@@ -36940,7 +37268,7 @@ var SearchBarController = class extends ControlController {
    * @Date: 2023-12-21 10:29:24
    */
   async handleGroupClick(groupItem) {
-    var _a;
+    var _a, _b;
     if (this.enableStorage) {
       const key = (_a = this.storageKeyFn) == null ? void 0 : _a.call(this);
       if (key && groupItem.name) {
@@ -36959,9 +37287,26 @@ var SearchBarController = class extends ControlController {
       const filterNodes = groupItem.searchGroupData.searchconds.map(
         (item) => SearchCondEx2filterNode(item)
       );
+      this.state.customCond = "";
+      if (filterNodes && filterNodes[0]) {
+        const group = filterNodes[0];
+        const { children } = group;
+        if (Array.isArray(children)) {
+          const index = children.findIndex(
+            (child) => child.nodeType === "CUSTOM" && child.customType === "PQL"
+          );
+          if (index !== -1) {
+            const item = children.splice(index, 1);
+            this.state.customCond = ((_b = item[0]) == null ? void 0 : _b.customCond) || "";
+          }
+        }
+      }
+      this.state.filterMode = "default";
       this.state.filterNodes = filterNodes;
     } else {
       this.state.filterNodes = getOriginFilterNodes();
+      this.state.customCond = "";
+      this.state.filterMode = "default";
     }
     recursiveIterate10(this.state.filterNodes[0], (node) => {
       if (node.nodeType === "FIELD") {
@@ -39172,10 +39517,10 @@ var MDCtrlController = class extends MDControlController {
 
 // src/controller/control/kanban/kanban.controller.ts
 import { RuntimeError as RuntimeError65, RuntimeModelError as RuntimeModelError68 } from "@ibiz-template/core";
-import { clone as clone37, isNil as isNil33 } from "ramda";
+import { clone as clone36, isNil as isNil33 } from "ramda";
 
 // src/controller/control/kanban/kanban.service.ts
-import { clone as clone36 } from "ramda";
+import { clone as clone35 } from "ramda";
 var KanbanService = class extends DataViewControlService {
   /**
    * 更新分组数据
@@ -39204,7 +39549,7 @@ var KanbanService = class extends DataViewControlService {
    */
   async moveOrderItem(context, data, args) {
     const moveAction = this.model.moveControlAction.appDEMethodId;
-    const params = clone36(data.getOrigin());
+    const params = clone35(data.getOrigin());
     Object.assign(params, args);
     let res = await this.exec(moveAction, context, params, {
       srfupdateitem: true
@@ -39536,7 +39881,7 @@ var KanbanController = class extends DataViewControlController {
       }
       return moveData;
     };
-    const draggedItem = clone37(fromGroup.children[fromIndex]);
+    const draggedItem = clone36(fromGroup.children[fromIndex]);
     const removeItems = fromGroup.children.splice(fromIndex, 1);
     toGroup.children.splice(toIndex, 0, ...removeItems);
     if (info.from !== info.to) {
@@ -39809,7 +40154,7 @@ import {
   awaitTimeout as awaitTimeout3,
   recursiveIterate as recursiveIterate12
 } from "@ibiz-template/core";
-import { clone as clone38 } from "ramda";
+import { clone as clone37 } from "ramda";
 
 // src/controller/control/tree-grid-ex/tree-grid-ex.service.ts
 var TreeGridExService = class extends TreeService {
@@ -40281,7 +40626,7 @@ var TreeGridExController = class extends TreeController {
         );
       }
       if (row.data._deData.srfuf === 1 /* UPDATE */) {
-        row.cacheData = clone38(row.data);
+        row.cacheData = clone37(row.data);
         const defaultVal = this.calcDefaultValue(row.data, false);
         Object.assign(row.data, defaultVal);
       }
@@ -40394,7 +40739,7 @@ import {
   RuntimeError as RuntimeError67,
   RuntimeModelError as RuntimeModelError70
 } from "@ibiz-template/core";
-import { clone as clone39 } from "ramda";
+import { clone as clone38 } from "ramda";
 import dayjs7 from "dayjs";
 var TreeGridExNodeColumnController = class {
   /**
@@ -40611,7 +40956,7 @@ var TreeGridExNodeColumnController = class {
       srfkey: value,
       ...wfContext
     });
-    const tempParams = clone39(this.params);
+    const tempParams = clone38(this.params);
     const { userParam } = this.nodeColumn;
     if (userParam) {
       const { navigateContexts, navigateParams } = parseUserParams(userParam);
@@ -42764,8 +43109,8 @@ import { QXEvent as QXEvent11 } from "qx-util";
 
 // src/controller/notification/async-action.controller.ts
 import { QXEvent as QXEvent9 } from "qx-util";
-import { clone as clone40 } from "ramda";
-import { isNil as isNil34, isNumber as isNumber2 } from "lodash-es";
+import { clone as clone39 } from "ramda";
+import { isNil as isNil34, isNumber as isNumber3 } from "lodash-es";
 import dayjs8 from "dayjs";
 var AsyncActionController = class {
   constructor() {
@@ -42839,7 +43184,7 @@ var AsyncActionController = class {
       "updatedate"
     ];
     dateFields.forEach((key) => {
-      if (isNumber2(data[key])) {
+      if (isNumber3(data[key])) {
         data[key] = dayjs8(data[key]).format("YYYY-MM-DD HH:mm:ss");
       }
     });
@@ -42875,7 +43220,7 @@ var AsyncActionController = class {
     } else {
       this.noticeResult(action);
     }
-    this.evt.emit("add", clone40(action));
+    this.evt.emit("add", clone39(action));
     this.evt.emit("dataChange");
   }
   /**
@@ -42897,7 +43242,7 @@ var AsyncActionController = class {
       }
       this.noticeResult(action);
     }
-    this.evt.emit("change", clone40(action));
+    this.evt.emit("change", clone39(action));
     this.evt.emit("dataChange");
   }
   noticeResult(action) {
@@ -44062,7 +44407,7 @@ var ViewEngineBase = class {
 
 // src/engine/md-view.engine.ts
 import { RuntimeModelError as RuntimeModelError73 } from "@ibiz-template/core";
-import { clone as clone41 } from "ramda";
+import { clone as clone40 } from "ramda";
 var MDViewEngine = class extends ViewEngineBase {
   /**
    * 多数据部件名称
@@ -44317,7 +44662,7 @@ var MDViewEngine = class extends ViewEngineBase {
         ibiz.i18n.t("runtime.engine.logicNewdata")
       );
     }
-    const params = clone41(this.view.params);
+    const params = clone40(this.view.params);
     if (copyMode) {
       params.srfcopymode = copyMode;
     }