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

package/es/panel-component/user-message/internal-message/internal-message-json/internal-message-json.provider.d.ts

@@ -0,0 +1,40 @@
+import { IInternalMessage } from '@ibiz-template/core/src/interface';
+import { IInternalMessageProvider } from '@ibiz-template/runtime';
+import { VNode } from 'vue';
+export declare class InternalMessageJSONtProvider implements IInternalMessageProvider {
+    component: import("vue").DefineComponent<{
+        message: {
+            type: import("vue").PropType<import("@ibiz-template/core").IInternalMessage>;
+            required: true;
+        };
+        provider: {
+            type: import("vue").PropType<IInternalMessageProvider>;
+            required: true;
+        };
+    }, {
+        ns: import("@ibiz-template/core").Namespace;
+        clickable: import("vue").ComputedRef<boolean>;
+        jsonContent: import("vue").ComputedRef<{
+            html?: string | undefined;
+            redirecturl?: string | undefined;
+        } | null>;
+        onClick: (event: MouseEvent) => Promise<void>;
+    }, unknown, {}, {}, import("vue").ComponentOptionsMixin, import("vue").ComponentOptionsMixin, {
+        close: () => true;
+    }, string, import("vue").VNodeProps & import("vue").AllowedComponentProps & import("vue").ComponentCustomProps, Readonly<import("vue").ExtractPropTypes<{
+        message: {
+            type: import("vue").PropType<import("@ibiz-template/core").IInternalMessage>;
+            required: true;
+        };
+        provider: {
+            type: import("vue").PropType<IInternalMessageProvider>;
+            required: true;
+        };
+    }>> & {
+        onClose?: (() => any) | undefined;
+    }, {}, {}>;
+    render(props: IData & {
+        message: IInternalMessage;
+    }): VNode;
+    onClick(msg: IInternalMessage, _event: MouseEvent): Promise<boolean>;
+}

package/es/panel-component/user-message/internal-message/internal-message-json/internal-message-json.provider.mjs

@@ -0,0 +1,55 @@
+import { IBizContext } from '@ibiz-template/core';
+import { OpenAppViewCommand } from '@ibiz-template/runtime';
+import { h } from 'vue';
+import { InternalMessageJSON } from './internal-message-json.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 InternalMessageJSONtProvider {
+  constructor() {
+    __publicField(this, "component", InternalMessageJSON);
+  }
+  render(props) {
+    return h(this.component, {
+      provider: this,
+      ...props
+    });
+  }
+  async onClick(msg, _event) {
+    if (msg.content_type === "JSON" && msg.short_content) {
+      const json = JSON.parse(msg.short_content);
+      if (json.redirecturl) {
+        let viewId = "";
+        const params = {};
+        const url = new URL(json.redirecturl);
+        if (url.searchParams.size > 0) {
+          url.searchParams.forEach((value, _key) => {
+            params[_key] = value;
+          });
+        }
+        const rdTagItems = url.pathname.replace("//", "").split("/");
+        const [appOrViewTag, viewTag] = rdTagItems;
+        if (viewTag) {
+          viewId = viewTag;
+        } else {
+          viewId = appOrViewTag;
+        }
+        ibiz.commands.execute(
+          OpenAppViewCommand.TAG,
+          viewId,
+          IBizContext.create({}),
+          params
+        );
+        return true;
+      }
+    }
+    return false;
+  }
+}
+
+export { InternalMessageJSONtProvider };

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

@@ -1 +1 @@
-.ibiz-internal-message-tab{--ibiz-internal-message-tab-load-more-height:30px;width:100%;height:100%}.ibiz-internal-message-tab__item{min-height:60px;padding:6px 0}.ibiz-internal-message-tab__nodata{display:flex;align-items:center;justify-content:center;height:calc(100% - var(--ibiz-internal-message-tab-load-more-height))}.ibiz-internal-message-tab__load-more{height:var(--ibiz-internal-message-tab-load-more-height);line-height:var(--ibiz-internal-message-tab-load-more-height);text-align:center}.ibiz-internal-message-tab__load-more:hover{color:var(--ibiz-color-primary-hover);cursor:pointer}
+.ibiz-internal-message-tab{--ibiz-internal-message-tab-load-more-height:30px;width:100%;height:100%}.ibiz-internal-message-tab__item{min-height:60px;padding:var(--ibiz-spacing-tight)}.ibiz-internal-message-tab__item:hover{background-color:var(--ibiz-color-fill-1)}.ibiz-internal-message-tab__nodata{display:flex;align-items:center;justify-content:center;height:calc(100% - var(--ibiz-internal-message-tab-load-more-height))}.ibiz-internal-message-tab__load-more{height:var(--ibiz-internal-message-tab-load-more-height);line-height:var(--ibiz-internal-message-tab-load-more-height);text-align:center}.ibiz-internal-message-tab__load-more:hover{color:var(--ibiz-color-primary-hover);cursor:pointer}

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

@@ -1,5 +1,11 @@
+import { PropType } from 'vue';
+import { IInternalMessageController } from '@ibiz-template/runtime';
 import './internal-message-tab.scss';
 export declare const InternalMessageTab: import("vue").DefineComponent<{
+    controller: {
+        type: PropType<IInternalMessageController>;
+        required: true;
+    };
     showPopover: {
         type: BooleanConstructor;
         required: true;
@@ -25,7 +31,6 @@ export declare const InternalMessageTab: import("vue").DefineComponent<{
     }[]>;
     state: {
         total: number;
-        curPage: number;
         pageSize: number;
     };
     hiddenPopover: () => void;
@@ -33,6 +38,10 @@ export declare const InternalMessageTab: import("vue").DefineComponent<{
 }, unknown, {}, {}, import("vue").ComponentOptionsMixin, import("vue").ComponentOptionsMixin, {
     hiddenPopover: () => true;
 }, string, import("vue").VNodeProps & import("vue").AllowedComponentProps & import("vue").ComponentCustomProps, Readonly<import("vue").ExtractPropTypes<{
+    controller: {
+        type: PropType<IInternalMessageController>;
+        required: true;
+    };
     showPopover: {
         type: BooleanConstructor;
         required: true;

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/editor/html/html-editor.controller.cjs

@@ -1,8 +1,6 @@
 'use strict';
 
-var core = require('@ibiz-template/core');
 var runtime = require('@ibiz-template/runtime');
-var qs = require('qs');
 
 "use strict";
 var __defProp = Object.defineProperty;
@@ -51,67 +49,6 @@ class HtmlEditorController extends runtime.EditorController {
       }
     }
   }
-  /**
-   * 计算文件的上传路径和下载路径
-   * 下载路径文件id用%fileId%占位，替换即可
-   * 配置编辑器参数uploadParams和exportParams时，会像导航参数一样动态添加对应的参数到url上
-   *
-   * @author lxm
-   * @date 2022-11-17 13:11:43
-   * @param {IData} data
-   * @returns {*}  {{ uploadUrl: string; downloadUrl: string }}
-   */
-  calcBaseUrl(data) {
-    let uploadUrl = "".concat(ibiz.env.baseUrl, "/").concat(ibiz.env.appId).concat(ibiz.env.uploadFileUrl);
-    let downloadUrl = "".concat(ibiz.env.baseUrl, "/").concat(ibiz.env.appId).concat(ibiz.env.downloadFileUrl, "/%fileId%");
-    let uploadParams = {};
-    let exportParams = {};
-    if (this.uploadParams) {
-      uploadParams = runtime.convertNavData(
-        this.uploadParams,
-        data,
-        this.params,
-        this.context
-      );
-    }
-    if (this.exportParams) {
-      exportParams = runtime.convertNavData(
-        this.exportParams,
-        data,
-        this.params,
-        this.context
-      );
-    }
-    uploadUrl += qs.stringify(uploadParams, { addQueryPrefix: true });
-    downloadUrl += qs.stringify(exportParams, { addQueryPrefix: true });
-    return { uploadUrl, downloadUrl };
-  }
-  /**
-   * 请求url获取文件流，并用JS触发文件下载
-   *
-   * @author lxm
-   * @date 2022-11-17 14:11:09
-   * @param {string} url
-   * @param {IData} file
-   */
-  fileDownload(file) {
-    ibiz.net.request(file.url, {
-      method: "get",
-      responseType: "blob",
-      baseURL: ""
-      // 已经有baseURL了，这里无需再写
-    }).then((response) => {
-      if (response.status !== 200) {
-        throw new core.RuntimeError("\u4E0B\u8F7D\u6587\u4EF6\u5931\u8D25");
-      }
-      if (!response.data) {
-        throw new core.RuntimeError("\u6587\u4EF6\u6D41\u6570\u636E\u4E0D\u5B58\u5728");
-      } else {
-        const fileName = file.name;
-        core.downloadFileFromBlob(response.data, fileName);
-      }
-    });
-  }
 }
 
 exports.HtmlEditorController = HtmlEditorController;

package/lib/editor/html/wang-editor/wang-editor.cjs

@@ -51,7 +51,7 @@ const IBizHtml = /* @__PURE__ */ vue.defineComponent({
     }
     vue.watch(() => props.data, (newVal) => {
       if (newVal) {
-        const urls = c.calcBaseUrl(newVal);
+        const urls = ibiz.util.file.calcFileUpDownUrl(c.context, c.params, newVal, c.editorParams);
         uploadUrl.value = urls.uploadUrl;
         downloadUrl.value = urls.downloadUrl;
       }