@ibiz-template/runtime 0.5.3 → 0.5.4

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

@@ -73,6 +73,14 @@ export class SearchBarController
    */
   isBackendSearchGroup = this.model.searchBarStyle === 'SEARCHBAR2';
 
+  /**
+   * 是否有默认选中
+   * @return {*}
+   * @author: zhujiamin
+   * @Date: 2023-12-21 10:17:43
+   */
+  hasDefaultSelect = false;
+
   /**
    * 启用自定义过滤项
    * @author lxm
@@ -148,12 +156,15 @@ export class SearchBarController
 
     // 实例部件服务
     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);
   }
 
   /**
@@ -418,18 +429,21 @@ export class SearchBarController
    * @author: zhujiamin
    * @Date: 2023-12-19 14:43:46
    */
-  async initSearBarGroups(): Promise<void> {
+  async initSearBarGroups(firstInit: boolean = false): Promise<void> {
     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: {} as IData,
               order: (index + 1) * 100,
+              defaultSelect: false,
+              noEdit: true,
             };
             if (item.data) {
               try {
@@ -455,6 +469,9 @@ export class SearchBarController
                 ibiz.log.error(`${item.data}非标准JSON格式:`, error);
               }
             }
+            if (item.defaultGroup) {
+              tempGroup.defaultSelect = true;
+            }
             return tempGroup;
           },
         );
@@ -465,13 +482,13 @@ export class SearchBarController
         res.data.forEach((group: IData) => {
           // 已经存在的覆盖，否则新增
           const existGroup = this.state.searchBarGroups.find(
-            item => item.id === group.id,
+            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
@@ -480,7 +497,6 @@ export class SearchBarController
               0,
             );
             this.state.searchBarGroups.push({
-              appId: this.context.srfappid,
               saved: true,
               show: true,
               searchGroupData: {},
@@ -497,6 +513,20 @@ export class SearchBarController
       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);
+        }
+      }
     }
   }
 
@@ -524,14 +554,15 @@ export class SearchBarController
         ibiz.message.success('保存成功');
       } 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) {
+            mergeInLeft(savedGroup, res.data);
             savedGroup.saved = true;
           }
           ibiz.message.success('保存成功');

package/src/controller/control/search-bar/search-bar.service.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';
 
 /**
  * 搜索栏服务
@@ -53,8 +53,16 @@ export class SearchBarService {
    *
    */
   async fetch(): Promise<IHttpResponse> {
-    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) {
@@ -68,9 +76,7 @@ export class SearchBarService {
    *
    */
   async get(id: string): Promise<IHttpResponse> {
-    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] as IData[]);
     }
@@ -82,34 +88,39 @@ export class SearchBarService {
    *
    */
   async remove(id: string): Promise<IHttpResponse> {
-    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: string): Promise<IHttpResponse> {
     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: string, data: IData): Promise<IHttpResponse> {
+  async createWithParams(
+    group: IBackendSearchBarGroup,
+    data: IData,
+  ): Promise<IHttpResponse> {
     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;
   }
@@ -164,8 +175,14 @@ export class SearchBarService {
   convertBackDataToFront(data: IData[]): IData[] {
     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);
@@ -190,12 +207,17 @@ export class SearchBarService {
   convertFrontDataToBack(data: IData[]): IData[] {
     return data.map(item => {
       const tempItem: IData = {
-        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 &&

package/src/engine/md-view.engine.ts

@@ -139,7 +139,11 @@ 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/src/interface/controller/controller/control/i-search-bar.controller.ts

@@ -21,4 +21,13 @@ export interface ISearchBarController
    * @returns {*}  {IParams}
    */
   getFilterParams(): IParams;
+
+  /**
+   * 有默认选中分组
+   *
+   * @author lxm
+   * @date 2022-09-22 17:09:21
+   * @returns {*}  {IParams}
+   */
+  hasDefaultSelect: boolean;
 }

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

@@ -155,7 +155,31 @@ 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 {*}
@@ -187,4 +211,20 @@ 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;
 }

package/src/plugin/remote-plugin-item/remote-plugin-item.ts

@@ -15,6 +15,14 @@ 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/src/service/mqtt/mqtt.service.ts

@@ -1,6 +1,6 @@
 import { IPortalMessage } from '@ibiz-template/core';
 import { MqttClient, IClientOptions } from 'mqtt';
-import { QXEvent, createUUID, isNilOrEmpty } from 'qx-util';
+import { QXEvent, createUUID } from 'qx-util';
 
 /**
  * mqtt 连接服务
@@ -63,9 +63,6 @@ export class MqttService {
     protected token: string,
     protected appId: string,
   ) {
-    if (isNilOrEmpty(mqttTopic) || isNilOrEmpty(token)) {
-      throw new Error('mqttTopic or token is empty');
-    }
     this.options.username = mqttTopic;
     this.options.password = token;
   }

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

@@ -248,9 +248,14 @@ export class DynamicCodeListCache {
     }
 
     // *预定义加载
-    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 res = await app.net.get(
-        `/dictionaries/codelist/${this.codeList.codeName}`,
+        `/dictionaries/codelist/${tag}`,
         tempParams,
       );
       return Object.freeze(res.data.items);