@ibiz-template/runtime 0.5.3 → 0.5.4

package/out/application.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"application.d.ts","sourceRoot":"","sources":["../src/application.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,GAAG,EAAY,MAAM,qBAAqB,CAAC;AACpD,OAAO,EACL,cAAc,EACd,QAAQ,EACR,YAAY,EACZ,SAAS,EACT,UAAU,EACX,MAAM,kBAAkB,CAAC;AAC1B,OAAO,EACL,gBAAgB,EAChB,eAAe,EACf,aAAa,EACb,aAAa,EACb,WAAW,EACZ,MAAM,WAAW,CAAC;AACnB,OAAO,EAAE,WAAW,EAAE,MAAM,aAAa,CAAC;AAE1C;;;;;;;;GAQG;AACH,qBAAa,WAAY,YAAW,WAAW;aAkFjB,KAAK,EAAE,YAAY;IAjF/C;;;;;;;OAOG;IACH,IAAI,KAAK,IAAI,MAAM,CAElB;IAED;;;;;;OAMG;IACH,QAAQ,CAAC,iBAAiB,EAAE,GAAG,CAAC,MAAM,EAAE,MAAM,CAAC,CAAa;IAE5D;;;;;;OAMG;IACH,QAAQ,CAAC,GAAG,EAAE,GAAG,CAAC;IAElB;;;;;;OAMG;IACH,QAAQ,CAAC,WAAW,EAAE,aAAa,CAAC;IAEpC;;;;;OAKG;IACH,QAAQ,CAAC,SAAS,EAAE,aAAa,CAAC;IAElC;;;;;;OAMG;IACH,QAAQ,CAAC,QAAQ,EAAE,eAAe,CAAC;IAEnC;;;;;;OAMG;IACH,QAAQ,CAAC,SAAS,EAAE,gBAAgB,CAAC;IAErC;;;;;;OAMG;IACH,IAAI,CAAC,EAAE,WAAW,CAAC;IAEnB;;;;;;OAMG;gBACyB,KAAK,EAAE,YAAY;IAc/C;;;;;;OAMG;IACG,IAAI,IAAI,OAAO,CAAC,IAAI,CAAC;IAgB3B;;;;;;;OAOG;cACa,iBAAiB,IAAI,OAAO,CAAC,IAAI,CAAC;IAWlD;;;;;;;OAOG;IACH,UAAU,CAAC,EAAE,EAAE,MAAM,GAAG,QAAQ,GAAG,IAAI;IAMvC;;;;;;;OAOG;IACG,WAAW,CAAC,QAAQ,EAAE,MAAM,GAAG,OAAO,CAAC,cAAc,GAAG,SAAS,CAAC;IAqBxE;;;;;;;OAOG;IACG,SAAS,CACb,EAAE,EAAE,MAAM,EACV,eAAe,CAAC,EAAE,MAAM,GACvB,OAAO,CAAC,SAAS,GAAG,SAAS,CAAC;IAajC;;;;;;;OAOG;IACG,YAAY,CAChB,WAAW,EAAE,MAAM,EACnB,eAAe,EAAE,MAAM,GACtB,OAAO,CAAC,UAAU,GAAG,SAAS,CAAC;CASnC"}
+{"version":3,"file":"application.d.ts","sourceRoot":"","sources":["../src/application.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,GAAG,EAAY,MAAM,qBAAqB,CAAC;AACpD,OAAO,EACL,cAAc,EACd,QAAQ,EACR,YAAY,EACZ,SAAS,EACT,UAAU,EACX,MAAM,kBAAkB,CAAC;AAC1B,OAAO,EACL,gBAAgB,EAChB,eAAe,EACf,aAAa,EACb,aAAa,EACb,WAAW,EACZ,MAAM,WAAW,CAAC;AACnB,OAAO,EAAE,WAAW,EAAE,MAAM,aAAa,CAAC;AAE1C;;;;;;;;GAQG;AACH,qBAAa,WAAY,YAAW,WAAW;aAkFjB,KAAK,EAAE,YAAY;IAjF/C;;;;;;;OAOG;IACH,IAAI,KAAK,IAAI,MAAM,CAElB;IAED;;;;;;OAMG;IACH,QAAQ,CAAC,iBAAiB,EAAE,GAAG,CAAC,MAAM,EAAE,MAAM,CAAC,CAAa;IAE5D;;;;;;OAMG;IACH,QAAQ,CAAC,GAAG,EAAE,GAAG,CAAC;IAElB;;;;;;OAMG;IACH,QAAQ,CAAC,WAAW,EAAE,aAAa,CAAC;IAEpC;;;;;OAKG;IACH,QAAQ,CAAC,SAAS,EAAE,aAAa,CAAC;IAElC;;;;;;OAMG;IACH,QAAQ,CAAC,QAAQ,EAAE,eAAe,CAAC;IAEnC;;;;;;OAMG;IACH,QAAQ,CAAC,SAAS,EAAE,gBAAgB,CAAC;IAErC;;;;;;OAMG;IACH,IAAI,CAAC,EAAE,WAAW,CAAC;IAEnB;;;;;;OAMG;gBACyB,KAAK,EAAE,YAAY;IAc/C;;;;;;OAMG;IACG,IAAI,IAAI,OAAO,CAAC,IAAI,CAAC;IAqB3B;;;;;;;OAOG;cACa,iBAAiB,IAAI,OAAO,CAAC,IAAI,CAAC;IAWlD;;;;;;;OAOG;IACH,UAAU,CAAC,EAAE,EAAE,MAAM,GAAG,QAAQ,GAAG,IAAI;IAMvC;;;;;;;OAOG;IACG,WAAW,CAAC,QAAQ,EAAE,MAAM,GAAG,OAAO,CAAC,cAAc,GAAG,SAAS,CAAC;IAqBxE;;;;;;;OAOG;IACG,SAAS,CACb,EAAE,EAAE,MAAM,EACV,eAAe,CAAC,EAAE,MAAM,GACvB,OAAO,CAAC,SAAS,GAAG,SAAS,CAAC;IAajC;;;;;;;OAOG;IACG,YAAY,CAChB,WAAW,EAAE,MAAM,EACnB,eAAe,EAAE,MAAM,GACtB,OAAO,CAAC,UAAU,GAAG,SAAS,CAAC;CASnC"}

package/out/application.js

@@ -56,7 +56,10 @@ export class Application {
     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(), this.model.appId);
             this.mqtt.evt.on('message', message => {
                 ibiz.mc.command.asyncAction.next(message);

package/out/controller/control/form/edit-form/edit-form.controller.js

@@ -248,7 +248,7 @@ export class EditFormController extends FormController {
                 default: `${this.data.srfmajortext || ''}保存成功`,
             });
         }
-        ibiz.mc.command.send(res.data, isCreate ? 'OBJECTCREATED' : 'OBJECTUPDATED');
+        ibiz.mc.command.send(res.data.$origin, isCreate ? 'OBJECTCREATED' : 'OBJECTUPDATED');
         return this.data;
     }
     /**

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

@@ -48,6 +48,13 @@ export declare class SearchBarController extends ControlController<ISearchBar, I
      * @Date: 2023-12-21 10:17:43
      */
     isBackendSearchGroup: boolean;
+    /**
+     * 是否有默认选中
+     * @return {*}
+     * @author: zhujiamin
+     * @Date: 2023-12-21 10:17:43
+     */
+    hasDefaultSelect: boolean;
     /**
      * 启用自定义过滤项
      * @author lxm
@@ -171,7 +178,7 @@ export declare class SearchBarController extends ControlController<ISearchBar, I
      * @author: zhujiamin
      * @Date: 2023-12-19 14:43:46
      */
-    initSearBarGroups(): Promise<void>;
+    initSearBarGroups(firstInit?: boolean): Promise<void>;
     /**
      * 处理保存
      * @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":"AAKA,OAAO,EAAE,cAAc,EAAE,UAAU,EAAE,gBAAgB,EAAE,MAAM,kBAAkB,CAAC;AAEhF,OAAO,EACL,eAAe,EACf,eAAe,EACf,oBAAoB,EACpB,WAAW,EACX,sBAAsB,EACtB,eAAe,EAChB,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;AAIxD;;;;;;;;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,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,CAEtC;IAED;;;;;OAKG;IACH,aAAa,EAAG,cAAc,CAAC;IAE/B,SAAS,CAAC,SAAS,IAAI,IAAI;cAcX,SAAS,IAAI,OAAO,CAAC,IAAI,CAAC;IAwB1C;;;;;OAKG;IACG,kBAAkB,IAAI,OAAO,CAAC,IAAI,CAAC;IAoCzC;;;;;;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;IA2B1B;;;;OAIG;IACH,WAAW,IAAI,IAAI;IAKnB;;;;;;OAMG;cACa,oBAAoB,IAAI,OAAO,CAAC,IAAI,CAAC;IAYrD;;;;;OAKG;IACH,WAAW,IAAI,KAAK,EAAE,GAAG,SAAS;IAsBlC;;;;;;OAMG;IACH,aAAa,CAAC,IAAI,EAAE,WAAW,GAAG,KAAK;IAkBvC;;;;;;OAMG;IACH,YAAY,CAAC,IAAI,EAAE,KAAK,GAAG,WAAW;IAqBtC;;;;;OAKG;IACH,SAAS,CAAC,oBAAoB,IAAI,WAAW,EAAE;IAU/C;;;;;OAKG;IACG,iBAAiB,IAAI,OAAO,CAAC,IAAI,CAAC;IAkFxC;;;;;OAKG;IACG,UAAU,IAAI,OAAO,CAAC,IAAI,CAAC;IAkCjC;;;;;OAKG;IACG,gBAAgB,CAAC,SAAS,EAAE,sBAAsB,GAAG,OAAO,CAAC,IAAI,CAAC;CA4BzE"}
+{"version":3,"file":"search-bar.controller.d.ts","sourceRoot":"","sources":["../../../../src/controller/control/search-bar/search-bar.controller.ts"],"names":[],"mappings":"AAKA,OAAO,EAAE,cAAc,EAAE,UAAU,EAAE,gBAAgB,EAAE,MAAM,kBAAkB,CAAC;AAEhF,OAAO,EACL,eAAe,EACf,eAAe,EACf,oBAAoB,EACpB,WAAW,EACX,sBAAsB,EACtB,eAAe,EAChB,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;AAIxD;;;;;;;;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,CAEtC;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;IAoCzC;;;;;;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;IA2B1B;;;;OAIG;IACH,WAAW,IAAI,IAAI;IAKnB;;;;;;OAMG;cACa,oBAAoB,IAAI,OAAO,CAAC,IAAI,CAAC;IAYrD;;;;;OAKG;IACH,WAAW,IAAI,KAAK,EAAE,GAAG,SAAS;IAsBlC;;;;;;OAMG;IACH,aAAa,CAAC,IAAI,EAAE,WAAW,GAAG,KAAK;IAkBvC;;;;;;OAMG;IACH,YAAY,CAAC,IAAI,EAAE,KAAK,GAAG,WAAW;IAqBtC;;;;;OAKG;IACH,SAAS,CAAC,oBAAoB,IAAI,WAAW,EAAE;IAU/C;;;;;OAKG;IACG,iBAAiB,CAAC,SAAS,GAAE,OAAe,GAAG,OAAO,CAAC,IAAI,CAAC;IAqGlE;;;;;OAKG;IACG,UAAU,IAAI,OAAO,CAAC,IAAI,CAAC;IAmCjC;;;;;OAKG;IACG,gBAAgB,CAAC,SAAS,EAAE,sBAAsB,GAAG,OAAO,CAAC,IAAI,CAAC;CA4BzE"}

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

@@ -46,6 +46,13 @@ export class SearchBarController 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
@@ -101,11 +108,11 @@ export class SearchBarController extends ControlController {
         }
         // 实例部件服务
         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初始化
@@ -342,12 +349,21 @@ export class SearchBarController 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 = Object.assign(Object.assign({}, item), { saved: false, show: true, searchGroupData: {}, order: (index + 1) * 100 });
+                    const tempGroup = {
+                        name: item.id,
+                        caption: item.caption,
+                        saved: false,
+                        show: true,
+                        searchGroupData: {},
+                        order: (index + 1) * 100,
+                        defaultSelect: false,
+                        noEdit: true,
+                    };
                     if (item.data) {
                         try {
                             // 解析data属性到对应位置
@@ -373,6 +389,9 @@ export class SearchBarController extends ControlController {
                             ibiz.log.error(`${item.data}非标准JSON格式:`, error);
                         }
                     }
+                    if (item.defaultGroup) {
+                        tempGroup.defaultSelect = true;
+                    }
                     return tempGroup;
                 });
             }
@@ -381,17 +400,17 @@ export class SearchBarController extends ControlController {
             if (res.ok) {
                 res.data.forEach((group) => {
                     // 已经存在的覆盖，否则新增
-                    const existGroup = this.state.searchBarGroups.find(item => item.id === group.id);
+                    const existGroup = this.state.searchBarGroups.find(item => item.name === group.name);
                     if (existGroup) {
                         mergeInLeft(existGroup, group);
                         existGroup.saved = true;
                     }
                     else {
-                        // 找出最大的order项的下标index，然后+2新增
+                        // 找出最大的order项的下标index，然后+2新增（第n项order为(n+1)*100）
                         const tempMaxOrderIndex = this.state.searchBarGroups.reduce((maxIndex, item, currentIndex) => item.order > this.state.searchBarGroups[maxIndex].order
                             ? currentIndex
                             : maxIndex, 0);
-                        this.state.searchBarGroups.push(Object.assign({ appId: this.context.srfappid, saved: true, show: true, searchGroupData: {}, order: (tempMaxOrderIndex + 2) * 100 }, group));
+                        this.state.searchBarGroups.push(Object.assign({ saved: true, show: true, searchGroupData: {}, order: (tempMaxOrderIndex + 2) * 100 }, group));
                     }
                 });
             }
@@ -401,6 +420,18 @@ export class SearchBarController 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);
+                }
+            }
         }
     }
     /**
@@ -427,10 +458,11 @@ export class SearchBarController extends ControlController {
                 ibiz.message.success('保存成功');
             }
             else {
-                const res = await this.service.createWithParams(this.state.selectedSearchGroupItem.id, saveParams);
+                const res = await this.service.createWithParams(this.state.selectedSearchGroupItem, saveParams);
                 if (res.ok) {
-                    const savedGroup = this.state.searchBarGroups.find(group => group.id === res.data.id);
+                    const savedGroup = this.state.searchBarGroups.find(group => group.name === res.data.name);
                     if (savedGroup) {
+                        mergeInLeft(savedGroup, res.data);
                         savedGroup.saved = true;
                     }
                     ibiz.message.success('保存成功');

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

@@ -1,6 +1,6 @@
 import { IHttpResponse } from '@ibiz-template/core';
 import { ISearchBar } from '@ibiz/model-core';
-import { IAppService } from '../../../interface';
+import { IAppService, IBackendSearchBarGroup } from '../../../interface';
 /**
  * 搜索栏服务
  * @return {*}
@@ -52,15 +52,15 @@ export declare class SearchBarService {
      */
     remove(id: string): Promise<IHttpResponse>;
     /**
-     * 新建数据
+     * 新建数据（只有一个标题）
      *
      */
     create(caption: string): Promise<IHttpResponse>;
     /**
-     * 新建数据（带参数,给平台配置建立的分组用）
+     * 新建数据（带参数，给平台配置建立的分组用，分组项名称就是id）
      *
      */
-    createWithParams(id: string, data: IData): Promise<IHttpResponse>;
+    createWithParams(group: IBackendSearchBarGroup, data: IData): Promise<IHttpResponse>;
     /**
      * 批量新建
      * @param {IData} data

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

@@ -1 +1 @@
-{"version":3,"file":"search-bar.service.d.ts","sourceRoot":"","sources":["../../../../src/controller/control/search-bar/search-bar.service.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,aAAa,EAAE,MAAM,qBAAqB,CAAC;AACpD,OAAO,EAAE,UAAU,EAAE,MAAM,kBAAkB,CAAC;AAC9C,OAAO,EAAE,WAAW,EAAE,MAAM,oBAAoB,CAAC;AAEjD;;;;;GAKG;AACH,qBAAa,gBAAgB;IAC3B;;;OAGG;IACH,GAAG,EAAG,WAAW,CAAC;IAElB;;;OAGG;IACH,OAAO,EAAG,MAAM,CAAC;IAEjB;;;OAGG;IACH,QAAQ,CAAC,KAAK,EAAE,UAAU,CAAC;IAE3B;;;OAGG;gBACS,KAAK,EAAE,UAAU,EAAE,OAAO,EAAE,MAAM;IAKxC,IAAI,CAAC,QAAQ,CAAC,EAAE,QAAQ,GAAG,OAAO,CAAC,IAAI,CAAC;IAI9C;;;;;OAKG;IACH,QAAQ,SAAgC;IAExC;;;OAGG;IACG,KAAK,IAAI,OAAO,CAAC,aAAa,CAAC;IAWrC;;;OAGG;IACG,GAAG,CAAC,EAAE,EAAE,MAAM,GAAG,OAAO,CAAC,aAAa,CAAC;IAU7C;;;OAGG;IACG,MAAM,CAAC,EAAE,EAAE,MAAM,GAAG,OAAO,CAAC,aAAa,CAAC;IAOhD;;;OAGG;IACG,MAAM,CAAC,OAAO,EAAE,MAAM,GAAG,OAAO,CAAC,aAAa,CAAC;IAQrD;;;OAGG;IACG,gBAAgB,CAAC,EAAE,EAAE,MAAM,EAAE,IAAI,EAAE,KAAK,GAAG,OAAO,CAAC,aAAa,CAAC;IAUvE;;;;;;OAMG;IACG,WAAW,CAAC,IAAI,EAAE,KAAK,EAAE,GAAG,OAAO,CAAC,aAAa,CAAC;IAMxD;;;OAGG;IACG,MAAM,CAAC,EAAE,EAAE,MAAM,EAAE,IAAI,EAAE,KAAK,GAAG,OAAO,CAAC,aAAa,CAAC;IAM7D;;;;;;OAMG;IACG,WAAW,CAAC,IAAI,EAAE,KAAK,EAAE,GAAG,OAAO,CAAC,aAAa,CAAC;IAUxD;;;;;;OAMG;IACH,sBAAsB,CAAC,IAAI,EAAE,KAAK,EAAE,GAAG,KAAK,EAAE;IAmB9C;;;;;;OAMG;IACH,sBAAsB,CAAC,IAAI,EAAE,KAAK,EAAE,GAAG,KAAK,EAAE;CAyB/C"}
+{"version":3,"file":"search-bar.service.d.ts","sourceRoot":"","sources":["../../../../src/controller/control/search-bar/search-bar.service.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,aAAa,EAAE,MAAM,qBAAqB,CAAC;AACpD,OAAO,EAAE,UAAU,EAAE,MAAM,kBAAkB,CAAC;AAC9C,OAAO,EAAE,WAAW,EAAE,sBAAsB,EAAE,MAAM,oBAAoB,CAAC;AAEzE;;;;;GAKG;AACH,qBAAa,gBAAgB;IAC3B;;;OAGG;IACH,GAAG,EAAG,WAAW,CAAC;IAElB;;;OAGG;IACH,OAAO,EAAG,MAAM,CAAC;IAEjB;;;OAGG;IACH,QAAQ,CAAC,KAAK,EAAE,UAAU,CAAC;IAE3B;;;OAGG;gBACS,KAAK,EAAE,UAAU,EAAE,OAAO,EAAE,MAAM;IAKxC,IAAI,CAAC,QAAQ,CAAC,EAAE,QAAQ,GAAG,OAAO,CAAC,IAAI,CAAC;IAI9C;;;;;OAKG;IACH,QAAQ,SAAgC;IAExC;;;OAGG;IACG,KAAK,IAAI,OAAO,CAAC,aAAa,CAAC;IAmBrC;;;OAGG;IACG,GAAG,CAAC,EAAE,EAAE,MAAM,GAAG,OAAO,CAAC,aAAa,CAAC;IAQ7C;;;OAGG;IACG,MAAM,CAAC,EAAE,EAAE,MAAM,GAAG,OAAO,CAAC,aAAa,CAAC;IAKhD;;;OAGG;IACG,MAAM,CAAC,OAAO,EAAE,MAAM,GAAG,OAAO,CAAC,aAAa,CAAC;IAUrD;;;OAGG;IACG,gBAAgB,CACpB,KAAK,EAAE,sBAAsB,EAC7B,IAAI,EAAE,KAAK,GACV,OAAO,CAAC,aAAa,CAAC;IAYzB;;;;;;OAMG;IACG,WAAW,CAAC,IAAI,EAAE,KAAK,EAAE,GAAG,OAAO,CAAC,aAAa,CAAC;IAMxD;;;OAGG;IACG,MAAM,CAAC,EAAE,EAAE,MAAM,EAAE,IAAI,EAAE,KAAK,GAAG,OAAO,CAAC,aAAa,CAAC;IAM7D;;;;;;OAMG;IACG,WAAW,CAAC,IAAI,EAAE,KAAK,EAAE,GAAG,OAAO,CAAC,aAAa,CAAC;IAUxD;;;;;;OAMG;IACH,sBAAsB,CAAC,IAAI,EAAE,KAAK,EAAE,GAAG,KAAK,EAAE;IAyB9C;;;;;;OAMG;IACH,sBAAsB,CAAC,IAAI,EAAE,KAAK,EAAE,GAAG,KAAK,EAAE;CA8B/C"}

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

@@ -28,8 +28,16 @@ export class SearchBarService {
      *
      */
     async fetch() {
-        const res = await this.app.net.post(`${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(`${this.themeUrl}/fetch_cur_user_all`, {
+            searchconds,
             sort: 'create_time,asc',
         });
         if (res.ok) {
@@ -42,9 +50,7 @@ export class SearchBarService {
      *
      */
     async get(id) {
-        const res = await this.app.net.get(`${this.themeUrl}/${id}`, {
-            app_view_tag: this.viewTag,
-        });
+        const res = await this.app.net.get(`${this.themeUrl}/${id}`);
         if (res.ok) {
             [res.data] = this.convertBackDataToFront([res.data]);
         }
@@ -55,32 +61,34 @@ export class SearchBarService {
      *
      */
     async remove(id) {
-        const res = await this.app.net.delete(`${this.themeUrl}/${id}`, {
-            app_view_tag: this.viewTag,
-        });
+        const res = await this.app.net.delete(`${this.themeUrl}/${id}`);
         return res;
     }
     /**
-     * 新建数据
+     * 新建数据（只有一个标题）
      *
      */
     async create(caption) {
         const res = await this.app.net.post(`${this.themeUrl}`, {
-            name: caption,
+            name: `${this.viewTag}___${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(`${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;
     }
@@ -128,8 +136,14 @@ export class SearchBarService {
     convertBackDataToFront(data) {
         return data.map(item => {
             const tempItem = Object.assign({}, 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);
@@ -153,12 +167,17 @@ export class SearchBarService {
     convertFrontDataToBack(data) {
         return data.map(item => {
             const tempItem = {
-                appId: item.appId,
+                app_tag: this.model.appId,
                 app_view_tag: this.viewTag,
-                id: item.id,
             };
+            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) {

package/out/engine/md-view.engine.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"md-view.engine.d.ts","sourceRoot":"","sources":["../../src/engine/md-view.engine.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,mBAAmB,EAAE,MAAM,kBAAkB,CAAC;AAGvD,OAAO,EAAE,cAAc,EAAE,MAAM,eAAe,CAAC;AAC/C,OAAO,EACL,YAAY,EACZ,YAAY,EACZ,oBAAoB,EACpB,qBAAqB,EACrB,kBAAkB,EAClB,oBAAoB,EACpB,gBAAgB,EAChB,SAAS,EACT,eAAe,EAChB,MAAM,cAAc,CAAC;AAEtB,OAAO,EAAE,cAAc,EAAE,MAAM,oBAAoB,CAAC;AAEpD;;;;;;;GAOG;AACH,qBAAa,YAAa,SAAQ,cAAc;IAC9C,UAAkB,IAAI,EAAE,cAAc,CACpC,mBAAmB,EACnB,YAAY,EACZ,YAAY,CACb,CAAC;IAEF;;;;;;OAMG;IACH,IAAI,gBAAgB,IAAI,MAAM,CAE7B;IAED;;;;;OAKG;IACH,SAAS,KAAK,UAAU,IAAI,qBAAqB,CAEhD;IAED;;;;;OAKG;IACH,SAAS,KAAK,SAAS,IAAI,oBAAoB,CAE9C;IAED;;;;;;OAMG;IACH,SAAS,KAAK,YAAY,IAAI,oBAAoB,CAIjD;IAEK,SAAS,IAAI,OAAO,CAAC,IAAI,CAAC;IAc1B,SAAS,IAAI,OAAO,CAAC,IAAI,CAAC;IAsDhC;;;;;;;OAOG;cACa,aAAa,CAAC,KAAK,EAAE,SAAS,GAAG,OAAO,CAAC,IAAI,CAAC;IAQxD,IAAI,CAAC,GAAG,EAAE,MAAM,EAAE,IAAI,EAAE,GAAG,GAAG,OAAO,CAAC,KAAK,GAAG,IAAI,GAAG,SAAS,CAAC;IA8CrE,SAAS,CAAC,OAAO,IAAI,KAAK,EAAE;IAI5B;;;;;;;;OAQG;cACa,QAAQ,CAAC,IAAI,EAAE;QAC7B,IAAI,EAAE,KAAK,EAAE,CAAC;QACd,KAAK,CAAC,EAAE,UAAU,CAAC;QACnB,OAAO,CAAC,EAAE,QAAQ,CAAC;QACnB,MAAM,CAAC,EAAE,OAAO,CAAC;KAClB,GAAG,OAAO,CAAC,eAAe,CAAC;IA4B5B;;;;;;;;OAQG;cACa,OAAO,CAAC,IAAI,EAAE;QAC5B,IAAI,EAAE,KAAK,EAAE,CAAC;QACd,KAAK,CAAC,EAAE,UAAU,CAAC;QACnB,QAAQ,CAAC,EAAE,OAAO,CAAC;KACpB,GAAG,OAAO,CAAC,eAAe,CAAC;IAgC5B;;;;;;OAMG;cACa,MAAM,CAAC,IAAI,CAAC,EAAE,kBAAkB,GAAG,SAAS,GAAG,OAAO,CAAC,IAAI,CAAC;IAI5E;;;;;OAKG;cACa,IAAI,CAAC,IAAI,GAAE,gBAAqB,GAAG,OAAO,CAAC,IAAI,CAAC;IAIhE;;;;;OAKG;cACa,OAAO,IAAI,OAAO,CAAC,IAAI,CAAC;IAIxC;;;;;OAKG;cACa,MAAM,IAAI,OAAO,CAAC,IAAI,CAAC;IAIvC;;;;;OAKG;IACH,SAAS,CAAC,eAAe,IAAI,OAAO;IAapC;;;;;OAKG;cACa,UAAU,IAAI,OAAO,CAAC,IAAI,CAAC;IAI3C;;;;;;OAMG;cACa,UAAU,CAAC,IAAI,EAAE;QAAE,KAAK,EAAE,UAAU,CAAA;KAAE,GAAG,OAAO,CAAC,IAAI,CAAC;IAItE;;;;;;OAMG;IACG,IAAI,CAAC,IAAI,EAAE;QAAE,IAAI,EAAE,KAAK,EAAE,CAAC;QAAC,KAAK,CAAC,EAAE,UAAU,CAAA;KAAE,GAAG,OAAO,CAAC,IAAI,CAAC;IAItE,SAAS,CAAC,qBAAqB,IAAI,OAAO;IAc1C;;;;;OAKG;IACH,SAAS,CAAC,YAAY,IAAI,IAAI;CAS/B"}
+{"version":3,"file":"md-view.engine.d.ts","sourceRoot":"","sources":["../../src/engine/md-view.engine.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,mBAAmB,EAAE,MAAM,kBAAkB,CAAC;AAGvD,OAAO,EAAE,cAAc,EAAE,MAAM,eAAe,CAAC;AAC/C,OAAO,EACL,YAAY,EACZ,YAAY,EACZ,oBAAoB,EACpB,qBAAqB,EACrB,kBAAkB,EAClB,oBAAoB,EACpB,gBAAgB,EAChB,SAAS,EACT,eAAe,EAChB,MAAM,cAAc,CAAC;AAEtB,OAAO,EAAE,cAAc,EAAE,MAAM,oBAAoB,CAAC;AAEpD;;;;;;;GAOG;AACH,qBAAa,YAAa,SAAQ,cAAc;IAC9C,UAAkB,IAAI,EAAE,cAAc,CACpC,mBAAmB,EACnB,YAAY,EACZ,YAAY,CACb,CAAC;IAEF;;;;;;OAMG;IACH,IAAI,gBAAgB,IAAI,MAAM,CAE7B;IAED;;;;;OAKG;IACH,SAAS,KAAK,UAAU,IAAI,qBAAqB,CAEhD;IAED;;;;;OAKG;IACH,SAAS,KAAK,SAAS,IAAI,oBAAoB,CAE9C;IAED;;;;;;OAMG;IACH,SAAS,KAAK,YAAY,IAAI,oBAAoB,CAIjD;IAEK,SAAS,IAAI,OAAO,CAAC,IAAI,CAAC;IAc1B,SAAS,IAAI,OAAO,CAAC,IAAI,CAAC;IA0DhC;;;;;;;OAOG;cACa,aAAa,CAAC,KAAK,EAAE,SAAS,GAAG,OAAO,CAAC,IAAI,CAAC;IAQxD,IAAI,CAAC,GAAG,EAAE,MAAM,EAAE,IAAI,EAAE,GAAG,GAAG,OAAO,CAAC,KAAK,GAAG,IAAI,GAAG,SAAS,CAAC;IA8CrE,SAAS,CAAC,OAAO,IAAI,KAAK,EAAE;IAI5B;;;;;;;;OAQG;cACa,QAAQ,CAAC,IAAI,EAAE;QAC7B,IAAI,EAAE,KAAK,EAAE,CAAC;QACd,KAAK,CAAC,EAAE,UAAU,CAAC;QACnB,OAAO,CAAC,EAAE,QAAQ,CAAC;QACnB,MAAM,CAAC,EAAE,OAAO,CAAC;KAClB,GAAG,OAAO,CAAC,eAAe,CAAC;IA4B5B;;;;;;;;OAQG;cACa,OAAO,CAAC,IAAI,EAAE;QAC5B,IAAI,EAAE,KAAK,EAAE,CAAC;QACd,KAAK,CAAC,EAAE,UAAU,CAAC;QACnB,QAAQ,CAAC,EAAE,OAAO,CAAC;KACpB,GAAG,OAAO,CAAC,eAAe,CAAC;IAgC5B;;;;;;OAMG;cACa,MAAM,CAAC,IAAI,CAAC,EAAE,kBAAkB,GAAG,SAAS,GAAG,OAAO,CAAC,IAAI,CAAC;IAI5E;;;;;OAKG;cACa,IAAI,CAAC,IAAI,GAAE,gBAAqB,GAAG,OAAO,CAAC,IAAI,CAAC;IAIhE;;;;;OAKG;cACa,OAAO,IAAI,OAAO,CAAC,IAAI,CAAC;IAIxC;;;;;OAKG;cACa,MAAM,IAAI,OAAO,CAAC,IAAI,CAAC;IAIvC;;;;;OAKG;IACH,SAAS,CAAC,eAAe,IAAI,OAAO;IAapC;;;;;OAKG;cACa,UAAU,IAAI,OAAO,CAAC,IAAI,CAAC;IAI3C;;;;;;OAMG;cACa,UAAU,CAAC,IAAI,EAAE;QAAE,KAAK,EAAE,UAAU,CAAA;KAAE,GAAG,OAAO,CAAC,IAAI,CAAC;IAItE;;;;;;OAMG;IACG,IAAI,CAAC,IAAI,EAAE;QAAE,IAAI,EAAE,KAAK,EAAE,CAAC;QAAC,KAAK,CAAC,EAAE,UAAU,CAAA;KAAE,GAAG,OAAO,CAAC,IAAI,CAAC;IAItE,SAAS,CAAC,qBAAqB,IAAI,OAAO;IAc1C;;;;;OAKG;IACH,SAAS,CAAC,YAAY,IAAI,IAAI;CAS/B"}

package/out/engine/md-view.engine.js

@@ -104,7 +104,9 @@ export class MDViewEngine extends ViewEngineBase {
             });
         }
         // 默认加载
-        if (!this.view.state.noLoadDefault && model.loadDefault) {
+        if (!this.view.state.noLoadDefault &&
+            model.loadDefault &&
+            !this.searchBar.hasDefaultSelect) {
             this.load();
         }
     }

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

@@ -19,5 +19,13 @@ export interface ISearchBarController extends IControlController<ISearchBar, ISe
      * @returns {*}  {IParams}
      */
     getFilterParams(): IParams;
+    /**
+     * 有默认选中分组
+     *
+     * @author lxm
+     * @date 2022-09-22 17:09:21
+     * @returns {*}  {IParams}
+     */
+    hasDefaultSelect: boolean;
 }
 //# sourceMappingURL=i-search-bar.controller.d.ts.map

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

@@ -1 +1 @@
-{"version":3,"file":"i-search-bar.controller.d.ts","sourceRoot":"","sources":["../../../../../src/interface/controller/controller/control/i-search-bar.controller.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,UAAU,EAAE,MAAM,kBAAkB,CAAC;AAC9C,OAAO,EAAE,eAAe,EAAE,MAAM,aAAa,CAAC;AAC9C,OAAO,EAAE,eAAe,EAAE,MAAM,aAAa,CAAC;AAC9C,OAAO,EAAE,kBAAkB,EAAE,MAAM,wBAAwB,CAAC;AAE5D;;;;;;;GAOG;AACH,MAAM,WAAW,oBACf,SAAQ,kBAAkB,CAAC,UAAU,EAAE,eAAe,EAAE,eAAe,CAAC;IACxE;;;;;;OAMG;IACH,eAAe,IAAI,OAAO,CAAC;CAC5B"}
+{"version":3,"file":"i-search-bar.controller.d.ts","sourceRoot":"","sources":["../../../../../src/interface/controller/controller/control/i-search-bar.controller.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,UAAU,EAAE,MAAM,kBAAkB,CAAC;AAC9C,OAAO,EAAE,eAAe,EAAE,MAAM,aAAa,CAAC;AAC9C,OAAO,EAAE,eAAe,EAAE,MAAM,aAAa,CAAC;AAC9C,OAAO,EAAE,kBAAkB,EAAE,MAAM,wBAAwB,CAAC;AAE5D;;;;;;;GAOG;AACH,MAAM,WAAW,oBACf,SAAQ,kBAAkB,CAAC,UAAU,EAAE,eAAe,EAAE,eAAe,CAAC;IACxE;;;;;;OAMG;IACH,eAAe,IAAI,OAAO,CAAC;IAE3B;;;;;;OAMG;IACH,gBAAgB,EAAE,OAAO,CAAC;CAC3B"}

package/out/interface/controller/state/control/i-search-bar.state.d.ts

@@ -135,7 +135,28 @@ export interface ISearchGroupData {
  * 后台分组接口
  *
  */
-export interface IBackendSearchBarGroup extends ISearchBarGroup {
+export interface IBackendSearchBarGroup {
+    /**
+     * 唯一标识
+     * @return {*}
+     * @author: zhujiamin
+     * @Date: 2024-01-17 18:28:45
+     */
+    id?: string;
+    /**
+     * 标题
+     * @return {*}
+     * @author: zhujiamin
+     * @Date: 2023-12-22 14:25:09
+     */
+    caption?: string;
+    /**
+     * 分组项名称（模型的id, 新建的为viewtag___caption）
+     * @return {*}
+     * @author: zhujiamin
+     * @Date: 2023-12-22 14:25:09
+     */
+    name: string;
     /**
      * 是否保存过
      * @return {*}
@@ -164,5 +185,19 @@ export interface IBackendSearchBarGroup extends ISearchBarGroup {
      * @Date: 2023-12-21 11:24:21
      */
     searchGroupData: ISearchGroupData;
+    /**
+     * 是否默认选中
+     * @return {*}
+     * @author: zhujiamin
+     * @Date: 2023-12-21 11:24:21
+     */
+    defaultSelect?: boolean;
+    /**
+     * 是否不可编辑
+     * @return {*}
+     * @author: zhujiamin
+     * @Date: 2024-01-17 17:24:28
+     */
+    noEdit?: boolean;
 }
 //# sourceMappingURL=i-search-bar.state.d.ts.map

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

@@ -1 +1 @@
-{"version":3,"file":"i-search-bar.state.d.ts","sourceRoot":"","sources":["../../../../../src/interface/controller/state/control/i-search-bar.state.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,eAAe,EAAE,MAAM,kBAAkB,CAAC;AACnD,OAAO,EAAE,aAAa,EAAE,MAAM,mBAAmB,CAAC;AAClD,OAAO,EAAE,YAAY,EAAE,MAAM,gBAAgB,CAAC;AAE9C,MAAM,WAAW,iBAAiB;IAChC;;;;;OAKG;IACH,IAAI,EAAE,KAAK,CAAC;IAEZ;;;;;OAKG;IACH,SAAS,EAAE,KAAK,GAAG,IAAI,CAAC;IAExB;;;;;OAKG;IACH,KAAK,CAAC,EAAE,OAAO,CAAC;IAEhB;;;;;OAKG;IACH,OAAO,CAAC,EAAE,MAAM,CAAC;IAEjB;;;;;OAKG;IACH,QAAQ,EAAE,WAAW,EAAE,CAAC;CACzB;AAED,MAAM,WAAW,eAAe;IAC9B;;;;;OAKG;IACH,IAAI,EAAE,IAAI,CAAC;IAEX;;;;;OAKG;IACH,KAAK,EAAE,MAAM,GAAG,IAAI,CAAC;IAErB;;;;;OAKG;IACH,KAAK,EAAE,OAAO,GAAG,IAAI,CAAC;IAEtB;;;;;OAKG;IACH,OAAO,EAAE,MAAM,GAAG,IAAI,CAAC;CACxB;AAED,MAAM,MAAM,WAAW,GAAG,iBAAiB,GAAG,eAAe,CAAC;AAE9D,MAAM,WAAW,eAAgB,SAAQ,aAAa;IACpD;;;;;OAKG;IACH,KAAK,EAAE,MAAM,CAAC;IAEd;;;;;OAKG;IACH,OAAO,EAAE,OAAO,CAAC;IAEjB;;;;;OAKG;IACH,iBAAiB,EAAE,eAAe,GAAG,IAAI,CAAC;IAE1C;;;;;OAKG;IACH,WAAW,EAAE,WAAW,EAAE,CAAC;IAE3B;;;;;OAKG;IACH,uBAAuB,EAAE,sBAAsB,GAAG,IAAI,CAAC;IAEvD;;;;;OAKG;IACH,eAAe,EAAE,sBAAsB,EAAE,CAAC;CAC3C;AAED;;;GAGG;AACH,MAAM,WAAW,gBAAgB;IAC/B;;OAEG;IACH,YAAY,CAAC,EAAE,KAAK,CAAC,YAAY,CAAC,CAAC;IAEnC;;OAEG;IACH,WAAW,CAAC,EAAE,KAAK,EAAE,CAAC;IAEtB;;OAEG;IACH,IAAI,CAAC,EAAE,MAAM,CAAC;CACf;AAED;;;GAGG;AACH,MAAM,WAAW,sBAAuB,SAAQ,eAAe;IAC7D;;;;;OAKG;IACH,KAAK,EAAE,OAAO,CAAC;IAEf;;;;;OAKG;IACH,IAAI,EAAE,OAAO,CAAC;IAEd;;;;;OAKG;IACH,KAAK,EAAE,MAAM,CAAC;IAEd;;;;;OAKG;IACH,eAAe,EAAE,gBAAgB,CAAC;CACnC"}
+{"version":3,"file":"i-search-bar.state.d.ts","sourceRoot":"","sources":["../../../../../src/interface/controller/state/control/i-search-bar.state.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,eAAe,EAAE,MAAM,kBAAkB,CAAC;AACnD,OAAO,EAAE,aAAa,EAAE,MAAM,mBAAmB,CAAC;AAClD,OAAO,EAAE,YAAY,EAAE,MAAM,gBAAgB,CAAC;AAE9C,MAAM,WAAW,iBAAiB;IAChC;;;;;OAKG;IACH,IAAI,EAAE,KAAK,CAAC;IAEZ;;;;;OAKG;IACH,SAAS,EAAE,KAAK,GAAG,IAAI,CAAC;IAExB;;;;;OAKG;IACH,KAAK,CAAC,EAAE,OAAO,CAAC;IAEhB;;;;;OAKG;IACH,OAAO,CAAC,EAAE,MAAM,CAAC;IAEjB;;;;;OAKG;IACH,QAAQ,EAAE,WAAW,EAAE,CAAC;CACzB;AAED,MAAM,WAAW,eAAe;IAC9B;;;;;OAKG;IACH,IAAI,EAAE,IAAI,CAAC;IAEX;;;;;OAKG;IACH,KAAK,EAAE,MAAM,GAAG,IAAI,CAAC;IAErB;;;;;OAKG;IACH,KAAK,EAAE,OAAO,GAAG,IAAI,CAAC;IAEtB;;;;;OAKG;IACH,OAAO,EAAE,MAAM,GAAG,IAAI,CAAC;CACxB;AAED,MAAM,MAAM,WAAW,GAAG,iBAAiB,GAAG,eAAe,CAAC;AAE9D,MAAM,WAAW,eAAgB,SAAQ,aAAa;IACpD;;;;;OAKG;IACH,KAAK,EAAE,MAAM,CAAC;IAEd;;;;;OAKG;IACH,OAAO,EAAE,OAAO,CAAC;IAEjB;;;;;OAKG;IACH,iBAAiB,EAAE,eAAe,GAAG,IAAI,CAAC;IAE1C;;;;;OAKG;IACH,WAAW,EAAE,WAAW,EAAE,CAAC;IAE3B;;;;;OAKG;IACH,uBAAuB,EAAE,sBAAsB,GAAG,IAAI,CAAC;IAEvD;;;;;OAKG;IACH,eAAe,EAAE,sBAAsB,EAAE,CAAC;CAC3C;AAED;;;GAGG;AACH,MAAM,WAAW,gBAAgB;IAC/B;;OAEG;IACH,YAAY,CAAC,EAAE,KAAK,CAAC,YAAY,CAAC,CAAC;IAEnC;;OAEG;IACH,WAAW,CAAC,EAAE,KAAK,EAAE,CAAC;IAEtB;;OAEG;IACH,IAAI,CAAC,EAAE,MAAM,CAAC;CACf;AAED;;;GAGG;AACH,MAAM,WAAW,sBAAsB;IACrC;;;;;OAKG;IACH,EAAE,CAAC,EAAE,MAAM,CAAC;IAEZ;;;;;OAKG;IACH,OAAO,CAAC,EAAE,MAAM,CAAC;IAEjB;;;;;OAKG;IACH,IAAI,EAAE,MAAM,CAAC;IAEb;;;;;OAKG;IACH,KAAK,EAAE,OAAO,CAAC;IAEf;;;;;OAKG;IACH,IAAI,EAAE,OAAO,CAAC;IAEd;;;;;OAKG;IACH,KAAK,EAAE,MAAM,CAAC;IAEd;;;;;OAKG;IACH,eAAe,EAAE,gBAAgB,CAAC;IAElC;;;;;OAKG;IACH,aAAa,CAAC,EAAE,OAAO,CAAC;IAExB;;;;;OAKG;IACH,MAAM,CAAC,EAAE,OAAO,CAAC;CAClB"}

package/out/plugin/remote-plugin-item/remote-plugin-item.d.ts

@@ -15,6 +15,16 @@ export interface ISystemImportMap {
      * @type {string}
      */
     baseUrl?: string;
+    /**
+     * package.json 清单
+     *
+     * @author chitanda
+     * @date 2024-01-11 20:01:57
+     * @type {{ [key: string]: string }}
+     */
+    packages: {
+        [key: string]: string;
+    };
     /**
      * 脚本
      *

package/out/plugin/remote-plugin-item/remote-plugin-item.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"remote-plugin-item.d.ts","sourceRoot":"","sources":["../../../src/plugin/remote-plugin-item/remote-plugin-item.ts"],"names":[],"mappings":"AAAA;;;;;;;GAOG;AACH,MAAM,WAAW,gBAAgB;IAC/B;;;;;;OAMG;IACH,OAAO,CAAC,EAAE,MAAM,CAAC;IACjB;;;;;;OAMG;IACH,OAAO,EAAE;QAAE,CAAC,GAAG,EAAE,MAAM,GAAG,MAAM,CAAA;KAAE,CAAC;IACnC;;;;;;OAMG;IACH,MAAM,EAAE;QAAE,CAAC,GAAG,EAAE,MAAM,GAAG,MAAM,GAAG,MAAM,EAAE,CAAA;KAAE,CAAC;CAC9C;AAED;;;;;;;GAOG;AACH,MAAM,WAAW,kBAAkB;IACjC;;;;;;OAMG;IACH,OAAO,EAAE,MAAM,CAAC;IAChB;;;;;;OAMG;IACH,IAAI,EAAE,MAAM,CAAC;IACb;;;;;;OAMG;IACH,OAAO,EAAE,MAAM,CAAC;IAChB;;;;;;OAMG;IACH,MAAM,EAAE,MAAM,CAAC;IACf;;;;;;OAMG;IACH,MAAM,EAAE,MAAM,CAAC;IACf;;;;;;OAMG;IACH,MAAM,EAAE,MAAM,GAAG,MAAM,EAAE,CAAC;IAC1B;;;;;;OAMG;IACH,GAAG,CAAC,EAAE,OAAO,CAAC;IACd;;;;;;OAMG;IACH,oBAAoB,CAAC,EAAE,gBAAgB,CAAC;CACzC;AAED;;;;;;;GAOG;AACH,qBAAa,gBAAgB;IAC3B;;;;;;OAMG;IACH,QAAQ,CAAC,GAAG,EAAE,MAAM,CAAC;IAErB;;;;;;OAMG;IACH,QAAQ,CAAC,IAAI,EAAE,MAAM,CAAC;IAEtB;;;;;;OAMG;IACH,QAAQ,CAAC,MAAM,EAAE,kBAAkB,CAAC;IAEpC;;;;;;;;OAQG;gBACS,GAAG,EAAE,MAAM,EAAE,IAAI,EAAE,MAAM,EAAE,MAAM,EAAE,kBAAkB;CAKlE"}
+{"version":3,"file":"remote-plugin-item.d.ts","sourceRoot":"","sources":["../../../src/plugin/remote-plugin-item/remote-plugin-item.ts"],"names":[],"mappings":"AAAA;;;;;;;GAOG;AACH,MAAM,WAAW,gBAAgB;IAC/B;;;;;;OAMG;IACH,OAAO,CAAC,EAAE,MAAM,CAAC;IACjB;;;;;;OAMG;IACH,QAAQ,EAAE;QAAE,CAAC,GAAG,EAAE,MAAM,GAAG,MAAM,CAAA;KAAE,CAAC;IACpC;;;;;;OAMG;IACH,OAAO,EAAE;QAAE,CAAC,GAAG,EAAE,MAAM,GAAG,MAAM,CAAA;KAAE,CAAC;IACnC;;;;;;OAMG;IACH,MAAM,EAAE;QAAE,CAAC,GAAG,EAAE,MAAM,GAAG,MAAM,GAAG,MAAM,EAAE,CAAA;KAAE,CAAC;CAC9C;AAED;;;;;;;GAOG;AACH,MAAM,WAAW,kBAAkB;IACjC;;;;;;OAMG;IACH,OAAO,EAAE,MAAM,CAAC;IAChB;;;;;;OAMG;IACH,IAAI,EAAE,MAAM,CAAC;IACb;;;;;;OAMG;IACH,OAAO,EAAE,MAAM,CAAC;IAChB;;;;;;OAMG;IACH,MAAM,EAAE,MAAM,CAAC;IACf;;;;;;OAMG;IACH,MAAM,EAAE,MAAM,CAAC;IACf;;;;;;OAMG;IACH,MAAM,EAAE,MAAM,GAAG,MAAM,EAAE,CAAC;IAC1B;;;;;;OAMG;IACH,GAAG,CAAC,EAAE,OAAO,CAAC;IACd;;;;;;OAMG;IACH,oBAAoB,CAAC,EAAE,gBAAgB,CAAC;CACzC;AAED;;;;;;;GAOG;AACH,qBAAa,gBAAgB;IAC3B;;;;;;OAMG;IACH,QAAQ,CAAC,GAAG,EAAE,MAAM,CAAC;IAErB;;;;;;OAMG;IACH,QAAQ,CAAC,IAAI,EAAE,MAAM,CAAC;IAEtB;;;;;;OAMG;IACH,QAAQ,CAAC,MAAM,EAAE,kBAAkB,CAAC;IAEpC;;;;;;;;OAQG;gBACS,GAAG,EAAE,MAAM,EAAE,IAAI,EAAE,MAAM,EAAE,MAAM,EAAE,kBAAkB;CAKlE"}

package/out/service/mqtt/mqtt.service.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"mqtt.service.d.ts","sourceRoot":"","sources":["../../../src/service/mqtt/mqtt.service.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,cAAc,EAAE,MAAM,qBAAqB,CAAC;AACrD,OAAO,EAAE,UAAU,EAAE,cAAc,EAAE,MAAM,MAAM,CAAC;AAClD,OAAO,EAAE,OAAO,EAA4B,MAAM,SAAS,CAAC;AAE5D;;;;;;;GAOG;AACH,qBAAa,WAAW;IAiDpB,SAAS,CAAC,SAAS,EAAE,MAAM;IAC3B,SAAS,CAAC,KAAK,EAAE,MAAM;IACvB,SAAS,CAAC,KAAK,EAAE,MAAM;IAlDzB;;;;;OAKG;IACH,QAAQ,CAAC,GAAG,EAAE,OAAO,CAAC;QAAE,OAAO,EAAE,CAAC,GAAG,EAAE,cAAc,KAAK,IAAI,CAAA;KAAE,CAAC,CACjD;IAEhB;;;;;;OAMG;IACH,MAAM,CAAC,EAAE,UAAU,CAAC;IAEpB;;;;;;;OAOG;IACH,SAAS,CAAC,OAAO,EAAE,cAAc,CAU/B;IAEF;;;;;;;;OAQG;gBAES,SAAS,EAAE,MAAM,EACjB,KAAK,EAAE,MAAM,EACb,KAAK,EAAE,MAAM;IASzB;;;;;;OAMG;IACG,OAAO,IAAI,OAAO,CAAC,IAAI,CAAC;IA6B9B;;;;;OAKG;IACH,KAAK,IAAI,IAAI;CAGd"}
+{"version":3,"file":"mqtt.service.d.ts","sourceRoot":"","sources":["../../../src/service/mqtt/mqtt.service.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,cAAc,EAAE,MAAM,qBAAqB,CAAC;AACrD,OAAO,EAAE,UAAU,EAAE,cAAc,EAAE,MAAM,MAAM,CAAC;AAClD,OAAO,EAAE,OAAO,EAAc,MAAM,SAAS,CAAC;AAE9C;;;;;;;GAOG;AACH,qBAAa,WAAW;IAiDpB,SAAS,CAAC,SAAS,EAAE,MAAM;IAC3B,SAAS,CAAC,KAAK,EAAE,MAAM;IACvB,SAAS,CAAC,KAAK,EAAE,MAAM;IAlDzB;;;;;OAKG;IACH,QAAQ,CAAC,GAAG,EAAE,OAAO,CAAC;QAAE,OAAO,EAAE,CAAC,GAAG,EAAE,cAAc,KAAK,IAAI,CAAA;KAAE,CAAC,CACjD;IAEhB;;;;;;OAMG;IACH,MAAM,CAAC,EAAE,UAAU,CAAC;IAEpB;;;;;;;OAOG;IACH,SAAS,CAAC,OAAO,EAAE,cAAc,CAU/B;IAEF;;;;;;;;OAQG;gBAES,SAAS,EAAE,MAAM,EACjB,KAAK,EAAE,MAAM,EACb,KAAK,EAAE,MAAM;IAMzB;;;;;;OAMG;IACG,OAAO,IAAI,OAAO,CAAC,IAAI,CAAC;IA6B9B;;;;;OAKG;IACH,KAAK,IAAI,IAAI;CAGd"}

package/out/service/mqtt/mqtt.service.js

@@ -1,4 +1,4 @@
-import { QXEvent, createUUID, isNilOrEmpty } from 'qx-util';
+import { QXEvent, createUUID } from 'qx-util';
 /**
  * mqtt 连接服务
  *
@@ -47,9 +47,6 @@ export class MqttService {
             keepalive: 60,
             clean: true,
         };
-        if (isNilOrEmpty(mqttTopic) || isNilOrEmpty(token)) {
-            throw new Error('mqttTopic or token is empty');
-        }
         this.options.username = mqttTopic;
         this.options.password = token;
     }

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;AAIlD;;;;;;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;IAwEhD;;;;;;;;;OASG;cACa,IAAI,CAClB,OAAO,EAAE,QAAQ,EACjB,MAAM,GAAE,OAAY,GACnB,OAAO,CAAC,YAAY,EAAE,CAAC;IAuE1B;;;;OAIG;IACH,SAAS,CAAC,eAAe,CAAC,KAAK,EAAE,KAAK,EAAE,GAAG,YAAY,EAAE,GAAG,SAAS;IAmBrE;;;;;;;;OAQG;IACG,GAAG,CAAC,OAAO,EAAE,QAAQ,EAAE,MAAM,GAAE,OAAY,GAAG,OAAO,CAAC,YAAY,EAAE,CAAC;CAyC5E"}
+{"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;AAIlD;;;;;;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;IAwEhD;;;;;;;;;OASG;cACa,IAAI,CAClB,OAAO,EAAE,QAAQ,EACjB,MAAM,GAAE,OAAY,GACnB,OAAO,CAAC,YAAY,EAAE,CAAC;IA4E1B;;;;OAIG;IACH,SAAS,CAAC,eAAe,CAAC,KAAK,EAAE,KAAK,EAAE,GAAG,YAAY,EAAE,GAAG,SAAS;IAmBrE;;;;;;;;OAQG;IACG,GAAG,CAAC,OAAO,EAAE,QAAQ,EAAE,MAAM,GAAE,OAAY,GAAG,OAAO,CAAC,YAAY,EAAE,CAAC;CAyC5E"}

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

@@ -148,8 +148,12 @@ export class DynamicCodeListCache {
             tempParams.size = 10000;
         }
         // *预定义加载
-        if (this.isPredefined) {
-            const res = await app.net.get(`/dictionaries/codelist/${this.codeList.codeName}`, tempParams);
+        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 res = await app.net.get(`/dictionaries/codelist/${tag}`, tempParams);
             return Object.freeze(res.data.items);
         }
         // *加载实体服务数据

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@ibiz-template/runtime",
-  "version": "0.5.3",
+  "version": "0.5.4",
   "description": "控制器包",
   "type": "module",
   "main": "out/index.js",
@@ -59,5 +59,5 @@
     "qx-util": "^0.4.8",
     "ramda": "^0.29.0"
   },
-  "gitHead": "ed4f02bed06c2a449d2324a9f48d2885691b2f70"
+  "gitHead": "627ad2605158cf11f72c589e6bf239467f2f90eb"
 }

package/src/application.ts

@@ -130,7 +130,12 @@ export class Application implements IAppService {
   async init(): Promise<void> {
     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()!,

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

@@ -302,7 +302,7 @@ export class EditFormController
       });
     }
     ibiz.mc.command.send(
-      res.data,
+      res.data.$origin,
       isCreate ? 'OBJECTCREATED' : 'OBJECTUPDATED',
     );
     return this.data;