@ibiz-template/vue3-components 0.5.7-alpha.3 → 0.5.7-alpha.5

package/es/panel-component/user-message/internal-message/internal-message-tab/internal-message-tab.mjs

@@ -1,12 +1,17 @@
-import { ref, reactive, resolveComponent, h, createVNode, createTextVNode, defineComponent } from 'vue';
+import { ref, reactive, createVNode, createTextVNode, defineComponent } from 'vue';
 import { useNamespace } from '@ibiz-template/vue3-util';
 import { getInternalMessageProvider } from '@ibiz-template/runtime';
 import './internal-message-tab.css';
+import { clone } from 'ramda';
 
 "use strict";
 const InternalMessageTab = /* @__PURE__ */ defineComponent({
   name: "IBizInternalMessageTab",
   props: {
+    controller: {
+      type: Object,
+      required: true
+    },
     showPopover: {
       type: Boolean,
       required: true
@@ -22,38 +27,22 @@ const InternalMessageTab = /* @__PURE__ */ defineComponent({
     const hiddenPopover = () => {
       emit("hiddenPopover");
     };
+    const c = props.controller;
     const allItems = ref([]);
     const state = reactive({
       total: 0,
-      curPage: 0,
-      pageSize: 20
+      pageSize: 0
     });
-    const load = async (params) => {
-      const res = await ibiz.internalMessage.fetch({
-        page: 0,
-        size: state.pageSize,
-        ...params
-      });
-      if (res.ok) {
-        if (typeof res.total === "number") {
-          state.total = res.total;
-        }
-        if (typeof res.page === "number") {
-          state.curPage = res.page;
-        }
-        if (state.curPage === 0) {
-          allItems.value = res.data;
-        } else {
-          allItems.value.push(...res.data);
-        }
-      }
+    const updateData = () => {
+      allItems.value = clone(c.messages);
+      state.total = c.total;
+      state.pageSize = c.size;
     };
+    updateData();
+    c.evt.on("dataChange", updateData);
     const showMore = () => {
-      load({
-        page: state.curPage + 1
-      });
+      c.loadMore();
     };
-    load();
     return {
       ns,
       allItems,
@@ -74,15 +63,10 @@ const InternalMessageTab = /* @__PURE__ */ defineComponent({
         ibiz.log.error(error);
       }
       if (provider) {
-        return h(resolveComponent(provider.component), {
+        return provider.render({
           class: this.ns.e("item"),
-          onClick: (event) => {
-            const isClose = provider.onClick(msg, event);
-            if (isClose) {
-              this.hiddenPopover();
-            }
-          },
-          message: msg
+          message: msg,
+          onClose: this.hiddenPopover
         });
       }
       return createVNode("div", {

package/es/panel-component/user-message/user-message.d.ts

@@ -14,6 +14,7 @@ export declare const UserMessage: import("vue").DefineComponent<{
 }, {
     ns: import("@ibiz-template/core").Namespace;
     c: PanelItemController<import("@ibiz/model-core").IPanelItem>;
+    noticeController: import("@ibiz-template/runtime").INoticeController;
     noticeNum: import("vue").Ref<number>;
     popoverRef: import("vue").Ref<any>;
     showPopover: import("vue").Ref<boolean>;

package/es/panel-component/user-message/user-message.mjs

@@ -22,6 +22,7 @@ const UserMessage = /* @__PURE__ */ defineComponent({
   setup(props) {
     const ns = useNamespace("user-message");
     const c = props.controller;
+    const noticeController = ibiz.hub.notice;
     const showPopover = ref(false);
     const currentTab = ref("notification");
     const sysImage = props.modelData.sysImage || {
@@ -35,6 +36,7 @@ const UserMessage = /* @__PURE__ */ defineComponent({
     return {
       ns,
       c,
+      noticeController,
       noticeNum,
       popoverRef,
       showPopover,
@@ -78,6 +80,7 @@ const UserMessage = /* @__PURE__ */ defineComponent({
             "name": "notification"
           }, {
             default: () => [createVNode(InternalMessageTab, {
+              "controller": this.noticeController.internalMessage,
               "showPopover": this.showPopover,
               "onHiddenPopover": this.hiddenPopover
             }, null)]
@@ -86,6 +89,7 @@ const UserMessage = /* @__PURE__ */ defineComponent({
             "name": "async-action"
           }, {
             default: () => [createVNode(AsyncActionTab, {
+              "controller": this.noticeController.asyncAction,
               "showPopover": this.showPopover,
               "onHiddenPopover": this.hiddenPopover
             }, null)]

package/es/util/app-popover/app-popover-component.d.ts

@@ -1,7 +1,9 @@
+import { ComputePositionConfig } from '@floating-ui/dom';
 import { IPopoverOptions } from '@ibiz-template/runtime';
 import { OverlayPopoverContainer } from '@ibiz-template/vue3-util';
 import { VNode } from 'vue';
 import './app-popover-component.scss';
+export type FloatingUIConfig = Partial<ComputePositionConfig>;
 /**
  * 创建飘窗
  *
@@ -9,7 +11,7 @@ import './app-popover-component.scss';
  * @date 2022-12-29 15:12:59
  * @export
  * @param {() => VNode} render
- * @param {IPopoverOptions} [opts]
+ * @param {IPopoverOptions<FloatingUIConfig>} [opts]
  * @return {*}  {OverlayPopoverContainer}
  */
-export declare function createPopover(render: () => VNode, opts?: IPopoverOptions): OverlayPopoverContainer;
+export declare function createPopover(render: () => VNode, opts?: IPopoverOptions<FloatingUIConfig>): OverlayPopoverContainer;

package/es/util/app-popover/app-popover-component.mjs

@@ -12,11 +12,15 @@ async function computePos(element, el, arrEl, opts) {
       element: arrEl
     }));
   }
-  const options = await computePosition(element, el, {
+  const config = {
     placement: opts.placement,
     strategy: "absolute",
     middleware: middlewareArr
-  });
+  };
+  if (opts.options) {
+    Object.assign(config, opts.options);
+  }
+  const options = await computePosition(element, el, config);
   {
     const {
       x,

package/es/util/index.d.ts

@@ -6,3 +6,4 @@ export { NotificationUtil } from './notification-util/notification-util';
 export { OpenViewUtil } from './open-view-util/open-view-util';
 export { OverlayController } from './overlay-controller/overlay-controller';
 export { usePagination } from './pagination/use-pagination';
+export { NoticeUtil } from './notice-util/notice-util';

package/es/util/index.mjs

@@ -6,5 +6,6 @@ export { NotificationUtil } from './notification-util/notification-util.mjs';
 export { OpenViewUtil } from './open-view-util/open-view-util.mjs';
 export { OverlayController } from './overlay-controller/overlay-controller.mjs';
 export { usePagination } from './pagination/use-pagination.mjs';
+export { NoticeUtil } from './notice-util/notice-util.mjs';
 
 "use strict";

package/es/util/notice-util/notice-util.d.ts

@@ -0,0 +1,13 @@
+import { IPortalAsyncAction } from '@ibiz-template/core';
+import { INoticeUtil } from '@ibiz-template/runtime';
+export declare class NoticeUtil implements INoticeUtil {
+    doingNotice?: {
+        info: IData;
+        close: () => void;
+    };
+    showAsyncAction(asyncAction: IPortalAsyncAction): Promise<void>;
+    showDoingNotice(info: {
+        num: number;
+    }): void;
+    closeDoingNotice(): void;
+}

package/es/util/notice-util/notice-util.mjs

@@ -0,0 +1,62 @@
+import { getAsyncActionProvider } from '@ibiz-template/runtime';
+import { ElNotification } from 'element-plus';
+import { reactive, h } from 'vue';
+import { useNamespace } from '@ibiz-template/vue3-util';
+import '../../common/index.mjs';
+import { DoingNotice } from '../../common/doing-notice/doing-notice.mjs';
+
+"use strict";
+var __defProp = Object.defineProperty;
+var __defNormalProp = (obj, key, value) => key in obj ? __defProp(obj, key, { enumerable: true, configurable: true, writable: true, value }) : obj[key] = value;
+var __publicField = (obj, key, value) => {
+  __defNormalProp(obj, typeof key !== "symbol" ? key + "" : key, value);
+  return value;
+};
+class NoticeUtil {
+  constructor() {
+    __publicField(this, "doingNotice");
+  }
+  async showAsyncAction(asyncAction) {
+    const ns = useNamespace("async-action-notice");
+    const porvider = await getAsyncActionProvider(asyncAction);
+    if (porvider.render) {
+      const ins = ElNotification({
+        customClass: ns.b(),
+        message: porvider.render({
+          action: asyncAction,
+          onClose: () => {
+            ins.close();
+          }
+        }),
+        position: "bottom-right",
+        duration: 0
+      });
+    }
+  }
+  showDoingNotice(info) {
+    if (!this.doingNotice) {
+      const reactiveInfo = reactive(info);
+      const ins = ElNotification({
+        message: h(DoingNotice, {
+          info: reactiveInfo
+        }),
+        onClose: () => {
+          this.closeDoingNotice();
+        },
+        position: "bottom-right",
+        duration: 0
+      });
+      this.doingNotice = { info: reactiveInfo, close: () => ins.close() };
+    } else {
+      Object.assign(this.doingNotice.info, info);
+    }
+  }
+  closeDoingNotice() {
+    if (this.doingNotice) {
+      this.doingNotice.close();
+      this.doingNotice = void 0;
+    }
+  }
+}
+
+export { NoticeUtil };

package/es/util/open-view-util/open-view-util.d.ts

@@ -1,5 +1,6 @@
-import { IModalData, IOpenViewUtil } from '@ibiz-template/runtime';
+import { IModalData, IOpenViewUtil, IPopoverOptions } from '@ibiz-template/runtime';
 import { Router } from 'vue-router';
+import { FloatingUIConfig } from '../app-popover/app-popover-component';
 /**
  * 打开视图方式工具类
  *
@@ -22,22 +23,22 @@ export declare class OpenViewUtil implements IOpenViewUtil {
      * @author lxm
      * @date 2022-09-12 01:09:06
      * @param {string} appViewId
-     * @param {(IContext | undefined)} [context]
-     * @param {(IParams | undefined)} [params]
+     * @param {(IContext)} [context]
+     * @param {(IParams)} [params]
      * @returns {*}  {Promise<IModalData>}
      */
-    modal(appViewId: string, context: IContext, params?: IParams | undefined): Promise<IModalData>;
-    popover(appViewId: string, event: MouseEvent, context: IContext, params?: IParams | undefined): Promise<IModalData>;
+    modal(appViewId: string, context: IContext, params?: IParams): Promise<IModalData>;
+    popover(appViewId: string, event: MouseEvent, context: IContext, params?: IParams, options?: IPopoverOptions<FloatingUIConfig>): Promise<IModalData>;
     /**
      * 抽屉打开视图
      *
      * @author lxm
      * @date 2022-09-15 15:09:50
      * @param {string} appViewId
-     * @param {(IContext | undefined)} [context]
-     * @param {(IParams | undefined)} [params]
+     * @param {(IContext)} [context]
+     * @param {(IParams)} [params]
      * @returns {*}  {Promise<IModalData>}
      */
-    drawer(appViewId: string, context: IContext, params?: IParams | undefined): Promise<IModalData>;
-    custom(appViewId: string, context: IContext, params?: IParams | undefined): Promise<IModalData>;
+    drawer(appViewId: string, context: IContext, params?: IParams): Promise<IModalData>;
+    custom(appViewId: string, context: IContext, params?: IParams): Promise<IModalData>;
 }

package/es/util/open-view-util/open-view-util.mjs

@@ -35,8 +35,8 @@ class OpenViewUtil {
    * @author lxm
    * @date 2022-09-12 01:09:06
    * @param {string} appViewId
-   * @param {(IContext | undefined)} [context]
-   * @param {(IParams | undefined)} [params]
+   * @param {(IContext)} [context]
+   * @param {(IParams)} [params]
    * @returns {*}  {Promise<IModalData>}
    */
   async modal(appViewId, context, params) {
@@ -55,7 +55,7 @@ class OpenViewUtil {
       opts
     );
   }
-  async popover(appViewId, event, context, params) {
+  async popover(appViewId, event, context, params, options = {}) {
     const appView = await ibiz.hub.config.view.get(appViewId);
     return openViewPopover(
       event,
@@ -64,7 +64,7 @@ class OpenViewUtil {
         params,
         viewId: appView.id
       },
-      { autoClose: true, placement: "bottom" }
+      { autoClose: true, placement: "bottom", ...options }
     );
   }
   /**
@@ -73,8 +73,8 @@ class OpenViewUtil {
    * @author lxm
    * @date 2022-09-15 15:09:50
    * @param {string} appViewId
-   * @param {(IContext | undefined)} [context]
-   * @param {(IParams | undefined)} [params]
+   * @param {(IContext)} [context]
+   * @param {(IParams)} [params]
    * @returns {*}  {Promise<IModalData>}
    */
   async drawer(appViewId, context, params) {

package/es/util/overlay-controller/overlay-controller.d.ts

@@ -1,4 +1,5 @@
 import { IOverlayController, IDrawerOptions, IPopoverOptions, IModalOptions, IOverlayContainer, IOverlayPopoverContainer, IFloatWindowOptions } from '@ibiz-template/runtime';
+import { FloatingUIConfig } from '../app-popover/app-popover-component';
 /**
  * 用不同呈现方式绘制组件的通用工具类
  *
@@ -9,8 +10,8 @@ import { IOverlayController, IDrawerOptions, IPopoverOptions, IModalOptions, IOv
  * @implements {IOverlayController}
  */
 export declare class OverlayController implements IOverlayController {
-    popover<T = void>(element: HTMLElement, component: unknown, props?: IParams, opts?: IPopoverOptions): Promise<T>;
-    createPopover(component: unknown, props?: IParams, opts?: IPopoverOptions): IOverlayPopoverContainer;
+    popover<T = void>(element: HTMLElement, component: unknown, props?: IParams, opts?: IPopoverOptions<FloatingUIConfig>): Promise<T>;
+    createPopover(component: unknown, props?: IParams, opts?: IPopoverOptions<FloatingUIConfig>): IOverlayPopoverContainer;
     drawer<T = void>(component: unknown, props?: IParams, opts?: IDrawerOptions): Promise<T>;
     createDrawer(component: unknown, props?: IParams, opts?: IDrawerOptions): IOverlayContainer;
     modal<T = void>(component: unknown, props?: IParams, opts?: IModalOptions): Promise<T>;

package/lib/common/data-import2/data-import2.cjs

@@ -282,7 +282,13 @@ const DataImport2 = /* @__PURE__ */ vue.defineComponent({
       Authorization: "Bearer ".concat(qxUtil.getCookie(core.CoreConst.TOKEN))
     });
     const UploadUrl = vue.computed(() => {
-      let uploadUrl = "".concat(ibiz.env.baseUrl, "/").concat(ibiz.env.appId).concat(ibiz.env.uploadFileUrl, "/temp");
+      let uploadFileUrl;
+      if (ibiz.env.uploadFileUrl.indexOf("{cat}") !== -1) {
+        uploadFileUrl = ibiz.env.uploadFileUrl.replace("/{cat}", "/temp");
+      } else {
+        uploadFileUrl = "".concat(ibiz.env.uploadFileUrl, "/temp");
+      }
+      let uploadUrl = "".concat(ibiz.env.baseUrl, "/").concat(ibiz.env.appId).concat(uploadFileUrl);
       uploadUrl += qs.stringify({
         preview: true
       }, {

package/lib/common/doing-notice/doing-notice.cjs

@@ -0,0 +1,40 @@
+'use strict';
+
+var vue = require('vue');
+var vue3Util = require('@ibiz-template/vue3-util');
+require('./doing-notice.css');
+
+"use strict";
+const DoingNotice = /* @__PURE__ */ vue.defineComponent({
+  name: "DoingNotice",
+  props: {
+    info: {
+      type: Object,
+      required: true
+    }
+  },
+  setup() {
+    const ns = vue3Util.useNamespace("doing-notice");
+    return {
+      ns
+    };
+  },
+  render() {
+    return vue.createVNode("div", {
+      "class": [this.ns.b()]
+    }, [vue.createVNode("span", {
+      "class": this.ns.e("text")
+    }, [vue.createTextVNode("\u6709"), vue.createVNode("span", {
+      "class": this.ns.e("num")
+    }, [this.info.num]), vue.createTextVNode("\u4E2A\u5F02\u6B65\u64CD\u4F5C\u6B63\u5728\u6267\u884C\uFF0C\u8BF7\u7A0D\u540E")]), vue.createVNode("svg", {
+      "class": this.ns.e("loading-icon"),
+      "viewBox": "-10, -10, 50, 50"
+    }, [vue.createVNode("path", {
+      "class": "path",
+      "d": "M 30 15 L 28 17 M 25.61 25.61 A 15 15, 0, 0, 1, 15 30 A 15 15, 0, 1, 1, 27.99 7.5 L 15 15",
+      "style": "stroke-width: 4px; fill: rgba(0, 0, 0, 0)"
+    }, null)])]);
+  }
+});
+
+exports.DoingNotice = DoingNotice;

package/lib/common/doing-notice/doing-notice.css

@@ -0,0 +1 @@
+.ibiz-async-action-notice.el-notification{width:auto}.ibiz-async-action-notice.el-notification .el-notification__group{margin:0}.ibiz-async-action-notice.el-notification .el-notification__closeBtn{top:5px;right:5px}.ibiz-doing-notice__text{margin-right:8px}.ibiz-doing-notice__num{margin:0 8px;font-size:18px;font-weight:700;color:var(--ibiz-color-danger)}.ibiz-doing-notice__loading-icon{width:18px;height:18px;margin-right:6px;vertical-align:middle;animation:loading-rotate 2s linear infinite}.ibiz-doing-notice__loading-icon .path{stroke:var(--ibiz-color-primary);stroke-dasharray:90,150;stroke-dashoffset:0;stroke-linecap:round;stroke-width:2;animation:loading-dash 1.5s ease-in-out infinite}

package/lib/common/index.cjs

@@ -20,12 +20,14 @@ var dataImport2 = require('./data-import2/data-import2.cjs');
 var dataImport2Table = require('./data-import2-table/data-import2-table.cjs');
 var dataImport2Select = require('./data-import2-select/data-import2-select.cjs');
 var gridSetting = require('./grid-setting/grid-setting.cjs');
+var doingNotice = require('./doing-notice/doing-notice.cjs');
 
 "use strict";
 const IBizCommonComponents = {
   install: (v) => {
     v.component(vue3Util.IBizControlBase.name, vue3Util.IBizControlBase);
     v.component(vue3Util.IBizIcon.name, vue3Util.IBizIcon);
+    v.component(doingNotice.DoingNotice.name, doingNotice.DoingNotice);
     v.component(row.IBizRow.name, row.IBizRow);
     v.component(col.IBizCol.name, col.IBizCol);
     v.component(vue3Util.IBizRouterView.name, vue3Util.IBizRouterView);
@@ -63,5 +65,6 @@ exports.IBizRawItem = rawitem.IBizRawItem;
 exports.IBizSplit = split.IBizSplit;
 exports.IBizSplitTrigger = splitTrigger.IBizSplitTrigger;
 exports.IBizSortBar = sortBar.IBizSortBar;
+exports.DoingNotice = doingNotice.DoingNotice;
 exports.IBizCommonComponents = IBizCommonComponents;
 exports.default = IBizCommonComponents;

package/lib/control/form/form-detail/form-button/form-button.cjs

@@ -47,7 +47,8 @@ const FormButton = /* @__PURE__ */ vue.defineComponent({
       "sime": "small",
       "onClick": this.controller.onClick.bind(this.controller),
       "loading": this.controller.state.loading,
-      "disabled": this.controller.state.disabled
+      "disabled": this.controller.state.disabled,
+      "title": this.modelData.tooltip
     }, {
       default: () => [vue.createVNode("div", {
         "class": this.ns.b("content")

package/lib/control/grid/grid/grid-control.util.cjs

@@ -58,6 +58,10 @@ function useITableEvent(c) {
     } else if (order === "descending") {
       order1 = "desc";
     }
+    const sortQuery = "".concat(fieldName, ",").concat(order1);
+    if (sortQuery === c.state.sortQuery) {
+      return;
+    }
     c.setSort(fieldName, order1);
     c.load();
   }

package/lib/control/search-bar/filter-tree/filter-tree.cjs

@@ -52,23 +52,41 @@ const FilterModes = [{
 const FilterTreeControl = /* @__PURE__ */ vue.defineComponent({
   name: "IBizFilterTreeControl",
   props: {
-    controller: {
-      type: Object,
+    /**
+     * 过滤项控制器集合
+     */
+    filterControllers: {
+      type: Array,
       required: true
     },
-    provider: {
-      type: Object
+    /**
+     * 过滤项树节点数据集合
+     */
+    filterNodes: {
+      type: Array,
+      required: true
+    },
+    /**
+     * 父容器
+     */
+    parent: {
+      type: String,
+      required: true
     }
   },
-  emits: {
-    close: () => true
-  },
+  emits: ["confirm", "cancel", "change"],
   setup(props, {
     emit
   }) {
     const ns = vue3Util.useNamespace("filter-tree");
+    const isInSearchBar = vue.computed(() => {
+      return props.parent === "search-bar";
+    });
+    const UiFilterNodes = vue.computed(() => {
+      return props.filterNodes;
+    });
     const findFilterController = (fieldName, valueOP) => {
-      return props.controller.filterControllers.find((item) => {
+      return props.filterControllers.find((item) => {
         if (item.fieldName === fieldName) {
           return item.valueOP ? item.valueOP === valueOP : true;
         }
@@ -86,7 +104,7 @@ const FilterTreeControl = /* @__PURE__ */ vue.defineComponent({
       }
       return field.valueOPs;
     };
-    props.controller.filterControllers.forEach((filterC) => {
+    props.filterControllers.forEach((filterC) => {
       let find = allFields.find((x) => x.name === filterC.fieldName);
       if (find === void 0) {
         find = {
@@ -141,6 +159,7 @@ const FilterTreeControl = /* @__PURE__ */ vue.defineComponent({
         editor = vue.h(component, {
           value: node.value,
           controller: filterC.editor,
+          data: {},
           onChange: (val) => {
             node.value = val;
           }
@@ -240,23 +259,26 @@ const FilterTreeControl = /* @__PURE__ */ vue.defineComponent({
         }, null)]);
       })])]);
     };
-    const onClose = () => {
-      emit("close");
+    const onConfirm = () => {
+      emit("confirm");
+    };
+    const onCancel = () => {
+      emit("cancel");
     };
     return {
       ns,
       renderFilterGroup,
       renderFilterItem,
-      onClose
+      onConfirm,
+      onCancel,
+      isInSearchBar,
+      UiFilterNodes
     };
   },
   render() {
-    const {
-      state
-    } = this.controller;
     return vue.createVNode("div", {
       "class": [this.ns.b()]
-    }, [state.filterNodes.length > 0 && state.filterNodes.map((node) => {
+    }, [this.UiFilterNodes.length > 0 && this.UiFilterNodes.map((node) => {
       if (node.leaf) {
         return this.renderFilterItem(node);
       }
@@ -265,14 +287,13 @@ const FilterTreeControl = /* @__PURE__ */ vue.defineComponent({
       "class": this.ns.b("footer")
     }, [vue.createVNode(vue.resolveComponent("el-button"), {
       "onClick": () => {
-        this.controller.onSearch();
-        this.onClose();
+        this.onConfirm();
       }
     }, {
-      default: () => [vue.createTextVNode("\u641C\u7D22")]
+      default: () => [this.isInSearchBar ? "\u641C\u7D22" : "\u786E\u5B9A"]
     }), vue.createVNode(vue.resolveComponent("el-button"), {
       "onClick": () => {
-        this.controller.resetFilter();
+        this.onCancel();
       }
     }, {
       default: () => [vue.createTextVNode("\u91CD\u7F6E")]

package/lib/control/search-bar/search-bar.cjs

@@ -57,12 +57,18 @@ const SearchBarControl = /* @__PURE__ */ vue.defineComponent({
     const showFilter = async () => {
       popover = ibiz.overlay.createPopover(() => {
         return vue.createVNode(vue.resolveComponent("iBizFilterTreeControl"), {
-          "onClose": () => {
+          "filterControllers": c.filterControllers,
+          "filterNodes": c.state.filterNodes,
+          "parent": "search-bar",
+          "onConfirm": () => {
+            c.onSearch();
             if (popover) {
               popover.dismiss();
             }
           },
-          "controller": c
+          "onCancel": () => {
+            c.resetFilter();
+          }
         }, null);
       }, void 0, {
         placement: "bottom-end",