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

package/es/common/data-import2/data-import2.mjs

@@ -280,7 +280,13 @@ const DataImport2 = /* @__PURE__ */ defineComponent({
       Authorization: "Bearer ".concat(getCookie(CoreConst.TOKEN))
     });
     const UploadUrl = 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/es/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/es/common/doing-notice/doing-notice.d.ts

@@ -0,0 +1,19 @@
+import { PropType } from 'vue';
+import './doing-notice.scss';
+export declare const DoingNotice: import("vue").DefineComponent<{
+    info: {
+        type: PropType<{
+            num: number;
+        }>;
+        required: true;
+    };
+}, {
+    ns: import("@ibiz-template/core").Namespace;
+}, unknown, {}, {}, import("vue").ComponentOptionsMixin, import("vue").ComponentOptionsMixin, {}, string, import("vue").VNodeProps & import("vue").AllowedComponentProps & import("vue").ComponentCustomProps, Readonly<import("vue").ExtractPropTypes<{
+    info: {
+        type: PropType<{
+            num: number;
+        }>;
+        required: true;
+    };
+}>>, {}, {}>;

package/es/common/doing-notice/doing-notice.mjs

@@ -0,0 +1,38 @@
+import { createTextVNode, createVNode, defineComponent } from 'vue';
+import { useNamespace } from '@ibiz-template/vue3-util';
+import './doing-notice.css';
+
+"use strict";
+const DoingNotice = /* @__PURE__ */ defineComponent({
+  name: "DoingNotice",
+  props: {
+    info: {
+      type: Object,
+      required: true
+    }
+  },
+  setup() {
+    const ns = useNamespace("doing-notice");
+    return {
+      ns
+    };
+  },
+  render() {
+    return createVNode("div", {
+      "class": [this.ns.b()]
+    }, [createVNode("span", {
+      "class": this.ns.e("text")
+    }, [createTextVNode("\u6709"), createVNode("span", {
+      "class": this.ns.e("num")
+    }, [this.info.num]), createTextVNode("\u4E2A\u5F02\u6B65\u64CD\u4F5C\u6B63\u5728\u6267\u884C\uFF0C\u8BF7\u7A0D\u540E")]), createVNode("svg", {
+      "class": this.ns.e("loading-icon"),
+      "viewBox": "-10, -10, 50, 50"
+    }, [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)])]);
+  }
+});
+
+export { DoingNotice };

package/es/common/index.d.ts

@@ -7,6 +7,7 @@ export * from './split/split';
 export * from './split-trigger/split-trigger';
 export * from './sort-bar/sort-bar';
 export type { MapOptions } from './map-chart/map-chart.util';
+export { DoingNotice } from './doing-notice/doing-notice';
 export declare const IBizCommonComponents: {
     install: (v: App) => void;
 };

package/es/common/index.mjs

@@ -16,12 +16,14 @@ import { DataImport2 } from './data-import2/data-import2.mjs';
 import { DataImport2Table } from './data-import2-table/data-import2-table.mjs';
 import { DataImport2Select } from './data-import2-select/data-import2-select.mjs';
 import { IBizGridSetting } from './grid-setting/grid-setting.mjs';
+import { DoingNotice } from './doing-notice/doing-notice.mjs';
 
 "use strict";
 const IBizCommonComponents = {
   install: (v) => {
     v.component(IBizControlBase.name, IBizControlBase);
     v.component(IBizIcon.name, IBizIcon);
+    v.component(DoingNotice.name, DoingNotice);
     v.component(IBizRow.name, IBizRow);
     v.component(IBizCol.name, IBizCol);
     v.component(IBizRouterView.name, IBizRouterView);
@@ -52,4 +54,4 @@ const IBizCommonComponents = {
   }
 };
 
-export { IBizActionToolbar, IBizCol, IBizCommonComponents, IBizRawItem, IBizRow, IBizSortBar, IBizSplit, IBizSplitTrigger, IBizCommonComponents as default };
+export { DoingNotice, IBizActionToolbar, IBizCol, IBizCommonComponents, IBizRawItem, IBizRow, IBizSortBar, IBizSplit, IBizSplitTrigger, IBizCommonComponents as default };

package/es/editor/html/html-editor.controller.d.ts

@@ -17,30 +17,4 @@ export declare class HtmlEditorController extends EditorController<IHtml> {
      */
     exportParams?: IParams;
     protected onInit(): Promise<void>;
-    /**
-     * 计算文件的上传路径和下载路径
-     * 下载路径文件id用%fileId%占位，替换即可
-     * 配置编辑器参数uploadParams和exportParams时，会像导航参数一样动态添加对应的参数到url上
-     *
-     * @author lxm
-     * @date 2022-11-17 13:11:43
-     * @param {IData} data
-     * @returns {*}  {{ uploadUrl: string; downloadUrl: string }}
-     */
-    calcBaseUrl(data: IData): {
-        uploadUrl: string;
-        downloadUrl: string;
-    };
-    /**
-     * 请求url获取文件流，并用JS触发文件下载
-     *
-     * @author lxm
-     * @date 2022-11-17 14:11:09
-     * @param {string} url
-     * @param {IData} file
-     */
-    fileDownload(file: {
-        url: string;
-        name: string;
-    }): void;
 }

package/es/editor/html/html-editor.controller.mjs

@@ -1,6 +1,4 @@
-import { RuntimeError, downloadFileFromBlob } from '@ibiz-template/core';
-import { EditorController, convertNavData } from '@ibiz-template/runtime';
-import qs from 'qs';
+import { EditorController } from '@ibiz-template/runtime';
 
 "use strict";
 var __defProp = Object.defineProperty;
@@ -49,67 +47,6 @@ class HtmlEditorController extends 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 = convertNavData(
-        this.uploadParams,
-        data,
-        this.params,
-        this.context
-      );
-    }
-    if (this.exportParams) {
-      exportParams = 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 RuntimeError("\u4E0B\u8F7D\u6587\u4EF6\u5931\u8D25");
-      }
-      if (!response.data) {
-        throw new RuntimeError("\u6587\u4EF6\u6D41\u6570\u636E\u4E0D\u5B58\u5728");
-      } else {
-        const fileName = file.name;
-        downloadFileFromBlob(response.data, fileName);
-      }
-    });
-  }
 }
 
 export { HtmlEditorController };

package/es/editor/html/wang-editor/wang-editor.mjs

@@ -47,7 +47,7 @@ const IBizHtml = /* @__PURE__ */ defineComponent({
     }
     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;
       }

package/es/editor/markdown/ibiz-markdown-editor/ibiz-markdown-editor.mjs

@@ -33,7 +33,7 @@ const IBizMarkDown = /* @__PURE__ */ defineComponent({
     const cssVars = ref({});
     watch(() => props.data, (newVal) => {
       if (newVal && c) {
-        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;
       }
@@ -42,22 +42,10 @@ const IBizMarkDown = /* @__PURE__ */ defineComponent({
       deep: true
     });
     const markDownBox = ref();
-    const fileUpload = (file, callback) => {
-      const formData = new FormData();
-      formData.append("file", file);
-      ibiz.net.axios({
-        url: uploadUrl.value,
-        method: "post",
-        headers: headers.value,
-        data: formData
-      }).then((res) => {
-        if (res.status === 200 && res.data.fileid) {
-          const url = downloadUrl.value.replace("%fileId%", res.data.fileid);
-          callback(url);
-        }
-      }).catch((error) => {
-        ibiz.log.error("\u4E0A\u4F20\u51FA\u9519", error);
-      });
+    const fileUpload = async (file, callback) => {
+      const data = await ibiz.util.file.fileUpload(uploadUrl.value, file, headers.value);
+      const url = downloadUrl.value.replace("%fileId%", data.fileid);
+      callback(url);
     };
     const getCherryHtml = () => {
       var _a;

package/es/editor/markdown/markdown-editor.controller.d.ts

@@ -73,30 +73,4 @@ export declare class MarkDownEditorController extends EditorController<IMarkdown
      */
     chatCompletion: boolean;
     protected onInit(): Promise<void>;
-    /**
-     * 计算文件的上传路径和下载路径
-     * 下载路径文件id用%fileId%占位，替换即可
-     * 配置编辑器参数uploadParams和exportParams时，会像导航参数一样动态添加对应的参数到url上
-     *
-     * @author lxm
-     * @date 2022-11-17 13:11:43
-     * @param {IData} data
-     * @returns {*}  {{ uploadUrl: string; downloadUrl: string }}
-     */
-    calcBaseUrl(data: IData): {
-        uploadUrl: string;
-        downloadUrl: string;
-    };
-    /**
-     * 请求url获取文件流，并用JS触发文件下载
-     *
-     * @author lxm
-     * @date 2022-11-17 14:11:09
-     * @param {string} url
-     * @param {IData} file
-     */
-    fileDownload(file: {
-        url: string;
-        name: string;
-    }): void;
 }

package/es/editor/markdown/markdown-editor.controller.mjs

@@ -1,6 +1,5 @@
-import { RuntimeModelError, RuntimeError, downloadFileFromBlob } from '@ibiz-template/core';
-import { EditorController, getDeACMode, convertNavData } from '@ibiz-template/runtime';
-import qs from 'qs';
+import { RuntimeModelError } from '@ibiz-template/core';
+import { EditorController, getDeACMode } from '@ibiz-template/runtime';
 
 "use strict";
 var __defProp = Object.defineProperty;
@@ -142,67 +141,6 @@ class MarkDownEditorController extends 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 = convertNavData(
-        this.uploadParams,
-        data,
-        this.params,
-        this.context
-      );
-    }
-    if (this.exportParams) {
-      exportParams = 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 RuntimeError("\u4E0B\u8F7D\u6587\u4EF6\u5931\u8D25");
-      }
-      if (!response.data) {
-        throw new RuntimeError("\u6587\u4EF6\u6D41\u6570\u636E\u4E0D\u5B58\u5728");
-      } else {
-        const fileName = file.name;
-        downloadFileFromBlob(response.data, fileName);
-      }
-    });
-  }
 }
 
 export { MarkDownEditorController };

package/es/editor/upload/upload-editor.controller.d.ts

@@ -28,30 +28,4 @@ export declare class UploadEditorController extends EditorController<IFileUpload
      */
     exportParams?: IParams;
     protected onInit(): Promise<void>;
-    /**
-     * 计算文件的上传路径和下载路径
-     * 下载路径文件id用%fileId%占位，替换即可
-     * 配置编辑器参数uploadParams和exportParams时，会像导航参数一样动态添加对应的参数到url上
-     *
-     * @author lxm
-     * @date 2022-11-17 13:11:43
-     * @param {IData} data
-     * @returns {*}  {{ uploadUrl: string; downloadUrl: string }}
-     */
-    calcBaseUrl(data: IData): {
-        uploadUrl: string;
-        downloadUrl: string;
-    };
-    /**
-     * 请求url获取文件流，并用JS触发文件下载
-     *
-     * @author lxm
-     * @date 2022-11-17 14:11:09
-     * @param {string} url
-     * @param {IData} file
-     */
-    fileDownload(file: {
-        url: string;
-        name: string;
-    }): void;
 }

package/es/editor/upload/upload-editor.controller.mjs

@@ -1,6 +1,5 @@
-import { RuntimeModelError, RuntimeError, downloadFileFromBlob } from '@ibiz-template/core';
-import { EditorController, convertNavData } from '@ibiz-template/runtime';
-import qs from 'qs';
+import { RuntimeModelError } from '@ibiz-template/core';
+import { EditorController } from '@ibiz-template/runtime';
 
 "use strict";
 var __defProp = Object.defineProperty;
@@ -77,67 +76,6 @@ class UploadEditorController extends 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 = convertNavData(
-        this.uploadParams,
-        data,
-        this.params,
-        this.context
-      );
-    }
-    if (this.exportParams) {
-      exportParams = 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 RuntimeError("\u4E0B\u8F7D\u6587\u4EF6\u5931\u8D25");
-      }
-      if (!response.data) {
-        throw new RuntimeError("\u6587\u4EF6\u6D41\u6570\u636E\u4E0D\u5B58\u5728");
-      } else {
-        const fileName = file.name;
-        downloadFileFromBlob(response.data, fileName);
-      }
-    });
-  }
 }
 
 export { UploadEditorController };

package/es/editor/upload/use/use-ibiz-upload.mjs

@@ -23,7 +23,12 @@ function useIBizUploadInit(props) {
     props.data,
     (newVal) => {
       if (newVal) {
-        const urls = props.controller.value.calcBaseUrl(newVal);
+        const urls = ibiz.util.file.calcFileUpDownUrl(
+          props.controller.value.context,
+          props.controller.value.params,
+          newVal,
+          props.controller.value.editorParams
+        );
         uploadUrl.value = urls.uploadUrl;
         downloadUrl.value = urls.downloadUrl;
       }

package/es/editor/upload/use/use-iview-upload.mjs

@@ -26,7 +26,12 @@ function useIViewUpload(props, valueChange, c) {
     () => 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;
       }
@@ -96,7 +101,7 @@ function useIViewUpload(props, valueChange, c) {
   };
   const onDownload = (file) => {
     const url = file.url || downloadUrl.value.replace("%fileId%", file.id);
-    c.fileDownload({ url, name: file.name });
+    ibiz.util.file.fileDownload(url, file.name);
   };
   const limit = computed(() => {
     return c.multiple ? 9999 : 1;

package/es/index.mjs

@@ -45,6 +45,7 @@ import { IBizMapControl } from './control/map/index.mjs';
 import { IBizReportPanelControl } from './control/report-panel/index.mjs';
 import { IBizGanttControl } from './control/gantt/index.mjs';
 import { IBizContextMenuControl } from './control/context-menu/index.mjs';
+export { DoingNotice } from './common/doing-notice/doing-notice.mjs';
 export { IBizCol } from './common/col/col.mjs';
 export { IBizRow } from './common/row/row.mjs';
 export { IBizActionToolbar } from './common/action-toolbar/action-toolbar.mjs';
@@ -117,6 +118,7 @@ export { NotificationUtil } from './util/notification-util/notification-util.mjs
 export { OpenViewUtil } from './util/open-view-util/open-view-util.mjs';
 export { OverlayController } from './util/overlay-controller/overlay-controller.mjs';
 export { usePagination } from './util/pagination/use-pagination.mjs';
+export { NoticeUtil } from './util/notice-util/notice-util.mjs';
 
 "use strict";
 var index = {

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

@@ -1,20 +1,34 @@
 import { PropType } from 'vue';
 import { IPortalAsyncAction } from '@ibiz-template/core';
 import './async-action.scss';
+import { IAsyncActionProvider } from '@ibiz-template/runtime';
 export declare const AsyncAction: import("vue").DefineComponent<{
-    message: {
+    action: {
         type: PropType<IPortalAsyncAction>;
         required: true;
     };
+    provider: {
+        type: PropType<IAsyncActionProvider>;
+        required: true;
+    };
 }, {
     ns: import("@ibiz-template/core").Namespace;
     showErrorInfo: import("vue").ComputedRef<boolean | "">;
     clickable: import("vue").ComputedRef<boolean>;
     actionstate: import("vue").ComputedRef<10 | 20 | 30 | 40>;
     progressText: import("vue").ComputedRef<string>;
-}, unknown, {}, {}, import("vue").ComponentOptionsMixin, import("vue").ComponentOptionsMixin, {}, string, import("vue").VNodeProps & import("vue").AllowedComponentProps & import("vue").ComponentCustomProps, Readonly<import("vue").ExtractPropTypes<{
-    message: {
+    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<{
+    action: {
         type: PropType<IPortalAsyncAction>;
         required: true;
     };
-}>>, {}, {}>;
+    provider: {
+        type: PropType<IAsyncActionProvider>;
+        required: true;
+    };
+}>> & {
+    onClose?: (() => any) | undefined;
+}, {}, {}>;