@ibiz-template/runtime 0.5.3 → 0.5.4

package/dist/index.esm.js

@@ -4711,9 +4711,11 @@ var DynamicCodeListCache = class {
     if (!tempParams.size) {
       tempParams.size = 1e4;
     }
-    if (this.isPredefined) {
+    if (this.isPredefined && this.codeList.codeName) {
+      const index = this.codeList.codeName.indexOf("__");
+      const tag = index !== -1 ? this.codeList.codeName.substring(index + 2) : this.codeList.codeName;
       const res2 = await app.net.get(
-        "/dictionaries/codelist/".concat(this.codeList.codeName),
+        "/dictionaries/codelist/".concat(tag),
         tempParams
       );
       return Object.freeze(res2.data.items);
@@ -10278,7 +10280,7 @@ var GanttCodeListNodeData = class extends TreeCodeListNodeData {
 };
 
 // src/service/mqtt/mqtt.service.ts
-import { QXEvent as QXEvent3, createUUID as createUUID7, isNilOrEmpty as isNilOrEmpty6 } from "qx-util";
+import { QXEvent as QXEvent3, createUUID as createUUID7 } from "qx-util";
 var MqttService = class {
   /**
    * Creates an instance of MqttService.
@@ -10319,9 +10321,6 @@ var MqttService = class {
       keepalive: 60,
       clean: true
     };
-    if (isNilOrEmpty6(mqttTopic) || isNilOrEmpty6(token)) {
-      throw new Error("mqttTopic or token is empty");
-    }
     this.options.username = mqttTopic;
     this.options.password = token;
   }
@@ -10879,7 +10878,7 @@ var Application = class {
   async init() {
     await this.authority.init();
     await this.loadAppModelStyle();
-    if (ibiz.env.enableMqtt && ibiz.appData && ibiz.auth.isAnonymous !== true) {
+    if (ibiz.env.enableMqtt && ibiz.appData && ibiz.appData.mqtttopic && ibiz.auth.isAnonymous !== true) {
       this.mqtt = new MqttService(
         ibiz.appData.mqtttopic,
         getToken(),
@@ -11772,7 +11771,7 @@ function getOriginData(data) {
 
 // src/controller/utils/value-rule/value-rule.ts
 import { RuntimeError as RuntimeError27 } from "@ibiz-template/core";
-import { isNilOrEmpty as isNilOrEmpty7, isNumber } from "qx-util";
+import { isNilOrEmpty as isNilOrEmpty6, isNumber } from "qx-util";
 import { isNil as isNil15 } from "ramda";
 function generateRules(itemVRs, name, valueItemName) {
   const rules = [];
@@ -11812,7 +11811,7 @@ function generateRules(itemVRs, name, valueItemName) {
       const valueName = valueItemName || name;
       rules.push({
         validator: (rule, value, callback, source) => {
-          if (isNilOrEmpty7(source[valueName])) {
+          if (isNilOrEmpty6(source[valueName])) {
             return true;
           }
           const { isPast, infoMessage } = verifyDeRules(
@@ -20854,7 +20853,7 @@ var FormGroupPanelController = class extends FormDetailController {
 
 // src/controller/control/form/form-detail/form-item/form-item.controller.ts
 import Schema from "async-validator";
-import { isNilOrEmpty as isNilOrEmpty8 } from "qx-util";
+import { isNilOrEmpty as isNilOrEmpty7 } from "qx-util";
 
 // src/controller/control/form/form-detail/form-item/form-item.state.ts
 var FormItemState = class extends FormDetailState {
@@ -21110,7 +21109,7 @@ var FormItemController = class extends FormDetailController {
       this.state.error = null;
       return true;
     }
-    if (this.state.required && isNilOrEmpty8(this.data[this.name])) {
+    if (this.state.required && isNilOrEmpty7(this.data[this.name])) {
       this.state.error = "\u8BF7\u586B\u5199".concat(this.model.caption || "");
       return false;
     }
@@ -22351,7 +22350,7 @@ var EditFormController = class extends FormController {
       });
     }
     ibiz.mc.command.send(
-      res.data,
+      res.data.$origin,
       isCreate ? "OBJECTCREATED" : "OBJECTUPDATED"
     );
     return this.data;
@@ -24439,7 +24438,7 @@ var GridUAColumnController = class extends GridColumnController {
 // src/controller/control/grid/grid-column/grid-field-edit-column/grid-field-edit-column.controller.ts
 import { RuntimeError as RuntimeError54 } from "@ibiz-template/core";
 import Schema2 from "async-validator";
-import { isNilOrEmpty as isNilOrEmpty9 } from "qx-util";
+import { isNilOrEmpty as isNilOrEmpty8 } from "qx-util";
 var GridFieldEditColumnController = class extends GridFieldColumnController {
   constructor() {
     super(...arguments);
@@ -24678,7 +24677,7 @@ var GridFieldEditColumnController = class extends GridFieldColumnController {
    */
   async validate(row) {
     const editName = this.fieldName;
-    if (ibiz.config.grid.editShowMode !== "cell" && row.editColStates[editName].required && isNilOrEmpty9(row.data[editName])) {
+    if (ibiz.config.grid.editShowMode !== "cell" && row.editColStates[editName].required && isNilOrEmpty8(row.data[editName])) {
       row.errors[editName] = "\u8BF7\u586B\u5199".concat(this.model.caption || "");
       return false;
     }
@@ -25681,8 +25680,16 @@ var SearchBarService = class {
    *
    */
   async fetch() {
-    const res = await this.app.net.post("".concat(this.themeUrl, "/fetch_default"), {
-      app_view_tag: this.viewTag,
+    const searchconds = [
+      {
+        condop: "EQ",
+        condtype: "DEFIELD",
+        fieldname: "app_view_tag",
+        value: this.viewTag
+      }
+    ];
+    const res = await this.app.net.post("".concat(this.themeUrl, "/fetch_cur_user_all"), {
+      searchconds,
       sort: "create_time,asc"
     });
     if (res.ok) {
@@ -25695,9 +25702,7 @@ var SearchBarService = class {
    *
    */
   async get(id) {
-    const res = await this.app.net.get("".concat(this.themeUrl, "/").concat(id), {
-      app_view_tag: this.viewTag
-    });
+    const res = await this.app.net.get("".concat(this.themeUrl, "/").concat(id));
     if (res.ok) {
       [res.data] = this.convertBackDataToFront([res.data]);
     }
@@ -25708,32 +25713,34 @@ var SearchBarService = class {
    *
    */
   async remove(id) {
-    const res = await this.app.net.delete("".concat(this.themeUrl, "/").concat(id), {
-      app_view_tag: this.viewTag
-    });
+    const res = await this.app.net.delete("".concat(this.themeUrl, "/").concat(id));
     return res;
   }
   /**
-   * 新建数据
+   * 新建数据（只有一个标题）
    *
    */
   async create(caption) {
     const res = await this.app.net.post("".concat(this.themeUrl), {
-      name: caption,
+      name: "".concat(this.viewTag, "___").concat(caption),
+      caption,
+      app_tag: this.model.appId,
       app_view_tag: this.viewTag
     });
     return res;
   }
   /**
-   * 新建数据（带参数,给平台配置建立的分组用）
+   * 新建数据（带参数，给平台配置建立的分组用，分组项名称就是id）
    *
    */
-  async createWithParams(id, data) {
+  async createWithParams(group, data) {
     const res = await this.app.net.post("".concat(this.themeUrl), {
-      id,
-      theme_model: JSON.stringify(data),
+      name: group.name,
+      caption: group.caption,
+      app_tag: this.model.appId,
       app_view_tag: this.viewTag,
-      show: data.show
+      theme_model: JSON.stringify(data),
+      valid_flag: group.show ? 1 : 0
     });
     return res;
   }
@@ -25784,8 +25791,14 @@ var SearchBarService = class {
   convertBackDataToFront(data) {
     return data.map((item) => {
       const tempItem = { ...item };
+      if (item.id) {
+        tempItem.id = item.id;
+      }
       if (item.name) {
-        tempItem.caption = item.name;
+        tempItem.name = item.name;
+      }
+      if (item.caption) {
+        tempItem.caption = item.caption;
       }
       if (item.theme_model) {
         tempItem.searchGroupData = JSON.parse(item.theme_model);
@@ -25809,12 +25822,17 @@ var SearchBarService = class {
   convertFrontDataToBack(data) {
     return data.map((item) => {
       const tempItem = {
-        appId: item.appId,
-        app_view_tag: this.viewTag,
-        id: item.id
+        app_tag: this.model.appId,
+        app_view_tag: this.viewTag
       };
+      if (item.id) {
+        tempItem.id = item.id;
+      }
+      if (item.name) {
+        tempItem.name = item.name;
+      }
       if (item.caption) {
-        tempItem.name = item.caption;
+        tempItem.caption = item.caption;
       }
       if (item.searchGroupData && Object.keys(item.searchGroupData).length > 0) {
         tempItem.theme_model = JSON.stringify(item.searchGroupData);
@@ -26010,6 +26028,13 @@ var SearchBarController = class extends ControlController {
      * @Date: 2023-12-21 10:17:43
      */
     this.isBackendSearchGroup = this.model.searchBarStyle === "SEARCHBAR2";
+    /**
+     * 是否有默认选中
+     * @return {*}
+     * @author: zhujiamin
+     * @Date: 2023-12-21 10:17:43
+     */
+    this.hasDefaultSelect = false;
     /**
      * 是否启用根据实体的JSON Schema生成过滤项
      * @author lxm
@@ -26065,11 +26090,14 @@ var SearchBarController = class extends ControlController {
       this.calcQuickSearchPlaceholder();
     }
     if (this.isBackendSearchGroup && this.view.model.codeName) {
-      this.service = new SearchBarService(this.model, this.view.model.codeName);
+      this.service = new SearchBarService(
+        this.model,
+        this.view.model.codeName.toLowerCase()
+      );
       await this.service.init(this.context);
     }
     await this.initSearchBarFilters();
-    await this.initSearBarGroups();
+    await this.initSearBarGroups(true);
   }
   /**
    * 根据实体jsonschema初始化
@@ -26310,18 +26338,21 @@ var SearchBarController = class extends ControlController {
    * @author: zhujiamin
    * @Date: 2023-12-19 14:43:46
    */
-  async initSearBarGroups() {
+  async initSearBarGroups(firstInit = false) {
     this.state.searchBarGroups = [];
     if (this.isBackendSearchGroup) {
       if (this.model.searchBarGroups && this.model.searchBarGroups.length > 0) {
         this.state.searchBarGroups = this.model.searchBarGroups.map(
           (item, index) => {
             const tempGroup = {
-              ...item,
+              name: item.id,
+              caption: item.caption,
               saved: false,
               show: true,
               searchGroupData: {},
-              order: (index + 1) * 100
+              order: (index + 1) * 100,
+              defaultSelect: false,
+              noEdit: true
             };
             if (item.data) {
               try {
@@ -26344,6 +26375,9 @@ var SearchBarController = class extends ControlController {
                 ibiz.log.error("".concat(item.data, "\u975E\u6807\u51C6JSON\u683C\u5F0F:"), error);
               }
             }
+            if (item.defaultGroup) {
+              tempGroup.defaultSelect = true;
+            }
             return tempGroup;
           }
         );
@@ -26352,7 +26386,7 @@ var SearchBarController = class extends ControlController {
       if (res.ok) {
         res.data.forEach((group) => {
           const existGroup = this.state.searchBarGroups.find(
-            (item) => item.id === group.id
+            (item) => item.name === group.name
           );
           if (existGroup) {
             mergeInLeft3(existGroup, group);
@@ -26363,7 +26397,6 @@ var SearchBarController = class extends ControlController {
               0
             );
             this.state.searchBarGroups.push({
-              appId: this.context.srfappid,
               saved: true,
               show: true,
               searchGroupData: {},
@@ -26378,6 +26411,15 @@ var SearchBarController = class extends ControlController {
       this.state.searchBarGroups.forEach((item, index) => {
         item.order = (index + 1) * 100;
       });
+      if (firstInit && this.state.searchBarGroups && this.state.searchBarGroups.length > 0) {
+        const defaultSelectedGroup = this.state.searchBarGroups.find((group) => {
+          return group.defaultSelect;
+        });
+        if (defaultSelectedGroup) {
+          this.hasDefaultSelect = true;
+          this.handleGroupClick(defaultSelectedGroup);
+        }
+      }
     }
   }
   /**
@@ -26403,14 +26445,15 @@ var SearchBarController = class extends ControlController {
         ibiz.message.success("\u4FDD\u5B58\u6210\u529F");
       } else {
         const res = await this.service.createWithParams(
-          this.state.selectedSearchGroupItem.id,
+          this.state.selectedSearchGroupItem,
           saveParams
         );
         if (res.ok) {
           const savedGroup = this.state.searchBarGroups.find(
-            (group) => group.id === res.data.id
+            (group) => group.name === res.data.name
           );
           if (savedGroup) {
+            mergeInLeft3(savedGroup, res.data);
             savedGroup.saved = true;
           }
           ibiz.message.success("\u4FDD\u5B58\u6210\u529F");
@@ -31782,7 +31825,7 @@ var MDViewEngine = class extends ViewEngineBase {
         this.reLoad();
       });
     }
-    if (!this.view.state.noLoadDefault && model.loadDefault) {
+    if (!this.view.state.noLoadDefault && model.loadDefault && !this.searchBar.hasDefaultSelect) {
       this.load();
     }
   }