@ibiz-template/vue3-components 0.7.40-alpha.9 → 0.7.41-alpha.0

package/es/panel-component/global-search/global-search.controller.d.ts

@@ -1,37 +1,59 @@
-import { IModalData, PanelItemController } from '@ibiz-template/runtime';
-import { IPanelContainer } from '@ibiz/model-core';
+import { PanelItemController } from '@ibiz-template/runtime';
+import { IPanelRawItem } from '@ibiz/model-core';
+import { IHttpResponse } from '@ibiz-template/core';
 import { GlobalSearchState, ISearchItem } from './global-search.state';
 /**
  * 全局搜索控制器
  *
  * @export
  * @class GlobalSearchController
- * @extends {PanelItemController<IPanelContainer>}
+ * @extends {PanelItemController<IPanelRawItem>}
  */
-export declare class GlobalSearchController extends PanelItemController<IPanelContainer> {
+export declare class GlobalSearchController extends PanelItemController<IPanelRawItem> {
     state: GlobalSearchState;
     /**
-     * 主键属性名称
-     *
+     * @description 主键属性名称
+     * @exposedoc
      * @type {string}
      * @memberof GlobalSearchController
      */
     keyName: string;
     /**
-     * 主文本属性名称
-     *
+     * @description 主文本属性名称
+     * @exposedoc
      * @type {string}
      * @memberof GlobalSearchController
      */
     textName: string;
     /**
-     * 搜索历史缓存标识
-     *
+     * @description 自定义参数
+     * @exposedoc
+     * @protected
+     * @type {IData}
+     * @memberof GlobalSearchController
+     */
+    protected rawItemParams: IData;
+    /**
+     * @description 搜索历史缓存标识
      * @protected
      * @type {string}
      * @memberof GlobalSearchController
      */
-    protected historyCache: string;
+    protected historyCacheKey: string;
+    /**
+     * @description 最大历史记录，默认7条
+     * @protected
+     * @type {number}
+     * @memberof GlobalSearchController
+     */
+    protected maxHistory: number;
+    /**
+     * @description 单次查询最大数量，默认100条
+     * @exposedoc
+     * @type {number}
+     * @memberof GlobalSearchController
+     */
+    size: number;
     /**
      * 创建全局搜索状态对象
      *
@@ -49,65 +71,102 @@ export declare class GlobalSearchController extends PanelItemController<IPanelCo
      */
     protected onInit(): Promise<void>;
     /**
-     * 初始化全局搜索项
+     * 处理直接内容项参数
      *
      * @protected
      * @memberof GlobalSearchController
      */
-    protected initGlobalSearchItem(): Promise<void>;
+    protected handleRawItemParams(): void;
+    /**
+     * 初始化参数
+     *
+     * @protected
+     * @memberof GlobalSearchController
+     */
+    protected initParams(): void;
     /**
      * 初始化历史记录
      *
-     * @private
+     * @protected
+     * @memberof GlobalSearchController
+     */
+    protected initHistory(): void;
+    /**
+     * 初始化全局搜索项
+     *
+     * @protected
      * @memberof GlobalSearchController
      */
-    private initHistory;
+    protected initGlobalSearchItem(): Promise<void>;
     /**
      * 添加历史
-     * - 最多5条记录
-     * @private
+     *
+     * @protected
      * @param {string} query
      * @memberof GlobalSearchController
      */
-    private addToHistory;
+    protected addToHistory(query: string): void;
     /**
-     * 清除历史
+     * 获取查询参数
      *
+     * @protected
+     * @param {ISearchItem} item
+     * @return {*}  {IParams}
      * @memberof GlobalSearchController
      */
-    clearHistory(): void;
+    protected getFetchParams(item: ISearchItem): IParams;
     /**
-     * 搜索
+     * 处理响应头
      *
-     * @param {string} query
-     * @return {*}  {Promise<IData[]>}
+     * @protected
+     * @param {IHttpResponse} response
+     * @return {*}  {{
+     *     page: number;
+     *     total: number;
+     *   }}
      * @memberof GlobalSearchController
      */
-    search(query: string): Promise<IData[]>;
+    protected handleResponseHeader(response: IHttpResponse): {
+        page: number;
+        total: number;
+    };
     /**
      * 通过AC模式加载数据
      *
+     * @protected
      * @param {ISearchItem} item
-     * @param {string} [query]
+     * @return {*}  {Promise<IData[]>}
+     * @memberof GlobalSearchController
+     */
+    protected loadByACMode(item: ISearchItem): Promise<IData[]>;
+    /**
+     * @description 清除历史
+     * @exposedoc
+     * @memberof GlobalSearchController
+     */
+    clearHistory(): void;
+    /**
+     * @description 搜索
+     * @exposedoc
      * @return {*}  {Promise<void>}
      * @memberof GlobalSearchController
      */
-    loadByACMode(item: ISearchItem, query?: string): Promise<IData[]>;
+    search(value: string): Promise<void>;
     /**
      * 打开链接视图
      *
-     * @param {IData} data
-     * @param {ISearchItem} [item]
-     * @return {*}  {(Promise<IModalData | undefined>)}
+     * @param {IData} data 数据
+     * @param {ISearchItem} item 搜索项
+     * @return {*}  {void}
      * @memberof GlobalSearchController
      */
-    openLinkView(data: IData, item?: ISearchItem): Promise<IModalData | undefined>;
+    openLinkView(data: IData, item: ISearchItem): void;
     /**
      * 根据实体获取搜索项
      *
-     * @param {string} appDataEntityId 实体标识
+     * @param {string} [appDataEntityId] 实体标识
      * @return {*}  {(ISearchItem | undefined)}
      * @memberof GlobalSearchController
      */
-    getSearchItemByEntity(appDataEntityId: string): ISearchItem | undefined;
+    getSearchItemByEntity(appDataEntityId?: string): ISearchItem | undefined;
 }

package/es/panel-component/global-search/global-search.controller.mjs

@@ -1,4 +1,6 @@
-import { PanelItemController, getDeACMode, getAcItemProvider, calcDeCodeNameById, OpenAppViewCommand } from '@ibiz-template/runtime';
+import { PanelItemController, getControl, getDeACMode, getAcItemProvider, calcDeCodeNameById, OpenAppViewCommand } from '@ibiz-template/runtime';
+import { notNilEmpty, createUUID } from 'qx-util';
+import { recursiveIterate } from '@ibiz-template/core';
 import { GlobalSearchState } from './global-search.state.mjs';
 
 "use strict";
@@ -12,27 +14,48 @@ class GlobalSearchController extends PanelItemController {
   constructor() {
     super(...arguments);
     /**
-     * 主键属性名称
-     *
+     * @description 主键属性名称
+     * @exposedoc
      * @type {string}
      * @memberof GlobalSearchController
      */
     __publicField(this, "keyName", "srfkey");
     /**
-     * 主文本属性名称
-     *
+     * @description 主文本属性名称
+     * @exposedoc
      * @type {string}
      * @memberof GlobalSearchController
      */
     __publicField(this, "textName", "srfmajortext");
     /**
-     * 搜索历史缓存标识
-     *
+     * @description 自定义参数
+     * @exposedoc
+     * @protected
+     * @type {IData}
+     * @memberof GlobalSearchController
+     */
+    __publicField(this, "rawItemParams", {});
+    /**
+     * @description 搜索历史缓存标识
      * @protected
      * @type {string}
      * @memberof GlobalSearchController
      */
-    __publicField(this, "historyCache", "global-search-history");
+    __publicField(this, "historyCacheKey", "global-search-history");
+    /**
+     * @description 最大历史记录，默认7条
+     * @protected
+     * @type {number}
+     * @memberof GlobalSearchController
+     */
+    __publicField(this, "maxHistory", 7);
+    /**
+     * @description 单次查询最大数量，默认100条
+     * @exposedoc
+     * @type {number}
+     * @memberof GlobalSearchController
+     */
+    __publicField(this, "size", 100);
   }
   /**
    * 创建全局搜索状态对象
@@ -54,9 +77,54 @@ class GlobalSearchController extends PanelItemController {
    */
   async onInit() {
     await super.onInit();
+    this.handleRawItemParams();
+    this.initParams();
     this.initHistory();
     await this.initGlobalSearchItem();
   }
+  /**
+   * 处理直接内容项参数
+   *
+   * @protected
+   * @memberof GlobalSearchController
+   */
+  handleRawItemParams() {
+    var _a;
+    let params = {};
+    const rawItemParams = (_a = this.model.rawItem) == null ? void 0 : _a.rawItemParams;
+    if (notNilEmpty(rawItemParams)) {
+      params = rawItemParams.reduce((param, item) => {
+        param[item.key.toLowerCase()] = item.value;
+        return param;
+      }, {});
+    }
+    Object.assign(this.rawItemParams, params);
+  }
+  /**
+   * 初始化参数
+   *
+   * @protected
+   * @memberof GlobalSearchController
+   */
+  initParams() {
+    if (this.rawItemParams.historycachekey)
+      this.historyCacheKey += this.rawItemParams.historycachekey;
+    if (this.rawItemParams.maxhistory)
+      this.maxHistory = Number(this.rawItemParams.maxhistory);
+    if (this.rawItemParams.size)
+      this.size = Number(this.rawItemParams.size);
+  }
+  /**
+   * 初始化历史记录
+   *
+   * @protected
+   * @memberof GlobalSearchController
+   */
+  initHistory() {
+    const cache = localStorage.getItem(this.historyCacheKey);
+    if (cache)
+      this.state.histories = JSON.parse(cache);
+  }
   /**
    * 初始化全局搜索项
    *
@@ -64,10 +132,24 @@ class GlobalSearchController extends PanelItemController {
    * @memberof GlobalSearchController
    */
   async initGlobalSearchItem() {
-    var _a;
-    const appFuncs = ((_a = ibiz.hub.getApp(this.model.appId).model.appFuncs) == null ? void 0 : _a.filter(
-      (func) => func.appFuncType === "SEARCH" && func.appDEACModeId && func.appDataEntityId
-    )) || [];
+    const appMenu = getControl(this.panel.view.model, "appmenu");
+    if (!appMenu)
+      return;
+    const appFuncs = [];
+    recursiveIterate(
+      appMenu,
+      (menuItem) => {
+        if (menuItem.appFuncId) {
+          const app = ibiz.hub.getApp(menuItem.appId);
+          const appFunc = app.getAppFunc(menuItem.appFuncId);
+          if (appFunc && appFunc.appFuncType === "SEARCH" && appFunc.appDEACModeId && appFunc.appDataEntityId)
+            appFuncs.push(appFunc);
+        }
+      },
+      {
+        childrenFields: ["appMenuItems"]
+      }
+    );
     await Promise.all(
       appFuncs.map(async (func) => {
         const deACMode = await getDeACMode(
@@ -89,85 +171,78 @@ class GlobalSearchController extends PanelItemController {
       })
     );
   }
-  /**
-   * 初始化历史记录
-   *
-   * @private
-   * @memberof GlobalSearchController
-   */
-  initHistory() {
-    const cache = localStorage.getItem(this.historyCache);
-    if (cache)
-      this.state.histories = JSON.parse(cache);
-  }
   /**
    * 添加历史
-   * - 最多5条记录
-   * @private
+   *
+   * @protected
    * @param {string} query
    * @memberof GlobalSearchController
    */
   addToHistory(query) {
     const histories = this.state.histories.filter((history) => history !== query);
     histories.push(query);
-    if (histories.length > 5)
+    if (histories.length > this.maxHistory)
       histories.shift();
     this.state.histories = histories;
     localStorage.setItem(
-      this.historyCache,
+      this.historyCacheKey,
       JSON.stringify(this.state.histories)
     );
   }
   /**
-   * 清除历史
+   * 获取查询参数
    *
+   * @protected
+   * @param {ISearchItem} item
+   * @return {*}  {IParams}
    * @memberof GlobalSearchController
    */
-  clearHistory() {
-    this.state.histories = [];
-    localStorage.setItem(
-      this.historyCache,
-      JSON.stringify(this.state.histories)
-    );
+  getFetchParams(item) {
+    const { deACMode } = item;
+    const { minorSortDir, minorSortAppDEFieldId } = deACMode;
+    const params = {
+      page: 0,
+      size: this.size,
+      query: this.state.query
+    };
+    if (minorSortDir && minorSortAppDEFieldId)
+      Object.assign(params, {
+        sort: "".concat(minorSortAppDEFieldId.toLowerCase(), ",").concat(minorSortDir.toLowerCase())
+      });
+    return params;
   }
   /**
-   * 搜索
+   * 处理响应头
    *
-   * @param {string} query
-   * @return {*}  {Promise<IData[]>}
+   * @protected
+   * @param {IHttpResponse} response
+   * @return {*}  {{
+   *     page: number;
+   *     total: number;
+   *   }}
    * @memberof GlobalSearchController
    */
-  async search(query) {
-    const result = [];
-    await Promise.all(
-      this.state.items.map(async (item) => {
-        const list = await this.loadByACMode(item, query);
-        result.push(...list);
-      })
-    );
-    this.addToHistory(query);
-    return result;
+  handleResponseHeader(response) {
+    return {
+      page: response.headers["x-page"] ? Number(response.headers["x-page"]) : 0,
+      total: response.headers["x-total"] ? Number(response.headers["x-total"]) : 0
+    };
   }
   /**
    * 通过AC模式加载数据
    *
+   * @protected
    * @param {ISearchItem} item
-   * @param {string} [query]
-   * @return {*}  {Promise<void>}
+   * @return {*}  {Promise<IData[]>}
    * @memberof GlobalSearchController
    */
-  async loadByACMode(item, query) {
+  async loadByACMode(item) {
+    let result = [];
     const { appDataEntityId, deACMode } = item;
-    const { minorSortDir, minorSortAppDEFieldId, appDEDataSetId } = deACMode;
+    const { appDEDataSetId } = deACMode;
     if (!appDEDataSetId)
-      return [];
-    const params = {};
-    if (minorSortDir && minorSortAppDEFieldId)
-      Object.assign(params, {
-        sort: "".concat(minorSortAppDEFieldId.toLowerCase(), ",").concat(minorSortDir.toLowerCase())
-      });
-    if (query)
-      Object.assign(params, { query });
+      return result;
+    const params = this.getFetchParams(item);
     const app = ibiz.hub.getApp(deACMode.appId);
     const response = await app.deService.exec(
       appDataEntityId,
@@ -175,21 +250,71 @@ class GlobalSearchController extends PanelItemController {
       this.panel.context,
       params
     );
-    if (response.ok && response.data)
-      return response.data;
-    return [];
+    if (response.ok && response.data) {
+      const { page, total } = this.handleResponseHeader(response);
+      const data = response.data;
+      if ((page + 1) * this.size < total)
+        data.push({
+          [this.textName]: "".concat(ibiz.i18n.t(
+            "panelComponent.globalSearch.moreTips",
+            {
+              total,
+              size: this.size
+            }
+          )),
+          [this.keyName]: createUUID()
+        });
+      result = data;
+    }
+    return result;
+  }
+  /**
+   * @description 清除历史
+   * @exposedoc
+   * @memberof GlobalSearchController
+   */
+  clearHistory() {
+    this.state.histories = [];
+    localStorage.setItem(
+      this.historyCacheKey,
+      JSON.stringify(this.state.histories)
+    );
+  }
+  /**
+   * @description 搜索
+   * @exposedoc
+   * @return {*}  {Promise<void>}
+   * @memberof GlobalSearchController
+   */
+  async search(value) {
+    this.state.query = value;
+    if (!this.state.query)
+      return;
+    this.state.list = [];
+    this.state.loading = true;
+    this.addToHistory(this.state.query);
+    try {
+      await Promise.all(
+        this.state.items.map(async (item) => {
+          const list = await this.loadByACMode(item);
+          this.state.list.push(...list);
+        })
+      );
+    } catch (error) {
+      ibiz.log.error(error);
+    } finally {
+      this.state.loading = false;
+    }
   }
   /**
    * 打开链接视图
    *
-   * @param {IData} data
-   * @param {ISearchItem} [item]
-   * @return {*}  {(Promise<IModalData | undefined>)}
+   * @param {IData} data 数据
+   * @param {ISearchItem} item 搜索项
+   * @return {*}  {void}
    * @memberof GlobalSearchController
    */
-  async openLinkView(data, item) {
-    if (!item)
-      return;
+  openLinkView(data, item) {
     const { appDataEntityId, deACMode } = item;
     const { linkAppViewId } = deACMode;
     if (!linkAppViewId)
@@ -197,23 +322,20 @@ class GlobalSearchController extends PanelItemController {
     const context = this.panel.context.clone();
     const deName = calcDeCodeNameById(appDataEntityId);
     Object.assign(context, { [deName]: data[this.keyName] });
-    return ibiz.commands.execute(
-      OpenAppViewCommand.TAG,
-      linkAppViewId,
-      context,
-      {}
-    );
+    ibiz.commands.execute(OpenAppViewCommand.TAG, linkAppViewId, context, {
+      noWaitRoute: true
+    });
   }
   /**
    * 根据实体获取搜索项
    *
-   * @param {string} appDataEntityId 实体标识
+   * @param {string} [appDataEntityId] 实体标识
    * @return {*}  {(ISearchItem | undefined)}
    * @memberof GlobalSearchController
    */
   getSearchItemByEntity(appDataEntityId) {
     return this.state.items.find(
-      (item) => calcDeCodeNameById(item.appDataEntityId) === appDataEntityId.toLowerCase()
+      (item) => calcDeCodeNameById(item.appDataEntityId) === (appDataEntityId == null ? void 0 : appDataEntityId.toLowerCase())
     );
   }
 }

package/es/panel-component/global-search/global-search.css

@@ -1 +1 @@
-.ibiz-global-search{width:100%}.ibiz-global-search__search .el-input__wrapper{width:240px}.ibiz-global-search__search .el-input__wrapper.is-focus{width:320px}.ibiz-global-search__search.is-search .el-input__wrapper{width:320px}.ibiz-global-search__content{display:flex;align-items:center;flex-direction:column}.ibiz-global-search__content--action-item{width:100%}.ibiz-global-search__content--action-item .el-button{width:100%}.ibiz-global-search__list{width:100%;max-height:280px;display:flex;overflow-y:auto;align-items:center;flex-direction:column}.ibiz-global-search__list--item{margin:0;width:100%;padding:0 20px;cursor:pointer;text-align:left;overflow:hidden;min-height:34px;line-height:34px;white-space:nowrap;text-overflow:ellipsis;color:var(--ibiz-color-text-0);font-size:var(--ibiz-font-size-regular)}.ibiz-global-search__list--item:hover{background-color:var(--ibiz-color-fill-1)}.ibiz-global-search__popper{min-width:320px!important;max-width:700px}
+.ibiz-global-search{width:100%}.ibiz-global-search__footer{width:100%;line-height:34px;text-align:center;color:var(--ibiz-color-primary-light-active)}.ibiz-global-search__footer.is-load-more{cursor:pointer}.ibiz-global-search__footer.is-load-more:hover{background-color:var(--ibiz-color-fill-1)}.ibiz-global-search__search .el-input__wrapper{width:240px}.ibiz-global-search__search .el-input__wrapper.is-focus{width:320px}.ibiz-global-search__search--enter-icon{cursor:pointer}.ibiz-global-search__search.is-search .el-input__wrapper{width:320px}.ibiz-global-search__content{display:flex;align-items:center;flex-direction:column}.ibiz-global-search__content--action-item{width:100%}.ibiz-global-search__content--action-item .el-button{width:100%;height:34px}.ibiz-global-search__list{width:100%;max-height:300px;display:flex;overflow-y:auto;align-items:center;flex-direction:column}.ibiz-global-search__list--item{margin:0;width:100%;padding:0 20px;cursor:pointer;text-align:left;overflow:hidden;min-height:34px;line-height:34px;white-space:nowrap;text-overflow:ellipsis;color:var(--ibiz-color-text-0);font-size:var(--ibiz-font-size-regular)}.ibiz-global-search__list--item:hover{background-color:var(--ibiz-color-fill-1)}.ibiz-global-search__popper{padding:0!important;min-width:320px!important}

package/es/panel-component/global-search/global-search.d.ts

@@ -2,11 +2,27 @@ import { PropType } from 'vue';
 import { IPanelRawItem } from '@ibiz/model-core';
 import { GlobalSearchController } from './global-search.controller';
 import './global-search.scss';
+/**
+ * 全局搜索
+ * @primary
+ * @description 全局搜索组件，监听快捷键Ctrl+K弹出搜索框，点击搜索时可查询应用信息。
+ * @panelitemparams {name:historyCacheKey,parameterType:string,defaultvalue:global-search-history,description:搜索历史缓存标识}
+ * @panelitemparams {name:maxhistory,parameterType:number,defaultvalue:7,description:最大历史记录，默认7条}
+ * @panelitemparams {name:size,parameterType:number,defaultvalue:100,description:单次查询最大数量，默认100条}
+ * @export
+ * @class GlobalSearch
+ */
 export declare const GlobalSearch: import("vue").DefineComponent<{
+    /**
+     * @description 全局搜索控件模型数据
+     */
     modelData: {
         type: PropType<IPanelRawItem>;
         required: true;
     };
+    /**
+     * @description 全局搜索控件控制器
+     */
     controller: {
         type: PropType<GlobalSearchController>;
         required: true;
@@ -14,21 +30,27 @@ export declare const GlobalSearch: import("vue").DefineComponent<{
 }, {
     c: GlobalSearchController;
     ns: import("@ibiz-template/core").Namespace;
-    list: import("vue").Ref<import("@ibiz-template/core").IApiData[]>;
-    visible: import("vue").Ref<boolean>;
+    visible: import("vue").ComputedRef<boolean>;
     editorRef: import("vue").Ref<any>;
-    handleClear: () => void;
+    searchValue: import("vue").Ref<string>;
+    handleFocus: (_evt: FocusEvent) => void;
     handleEnter: (event: KeyboardEvent) => void;
     renderAction: () => JSX.Element | undefined;
-    renderSearchList: () => JSX.Element;
+    renderFooter: () => JSX.Element | undefined;
+    renderSearchList: () => JSX.Element | undefined;
     renderHistoryList: () => JSX.Element;
-    handleInputClick: (event: MouseEvent) => void;
-    renderBlankPlaceholder: () => JSX.Element | undefined;
+    handleClearSearch: () => void;
 }, unknown, {}, {}, import("vue").ComponentOptionsMixin, import("vue").ComponentOptionsMixin, {}, string, import("vue").VNodeProps & import("vue").AllowedComponentProps & import("vue").ComponentCustomProps, Readonly<import("vue").ExtractPropTypes<{
+    /**
+     * @description 全局搜索控件模型数据
+     */
     modelData: {
         type: PropType<IPanelRawItem>;
         required: true;
     };
+    /**
+     * @description 全局搜索控件控制器
+     */
     controller: {
         type: PropType<GlobalSearchController>;
         required: true;