cnhis-design-vue 3.1.31-beta.0 → 3.1.31-beta.10

package/es/components/button-print/src/{ButtonPrint.vue_vue_type_script_setup_true_lang.js → ButtonPrint.vue2.js}

@@ -3,8 +3,8 @@ import { isObject } from '@vue/shared';
 import { useMessage, NDropdown, NButton, NIcon } from 'naive-ui';
 import { ChevronDown } from '@vicons/ionicons5';
 import { Print } from './utils/print.js';
-import { useBrowserPrint } from './utils/browserPrint.js';
-import IdentityVerification from './components/IdentityVerification.js';
+import { isIReport } from './utils/browserPrint.js';
+import IdentityVerification from './components/IdentityVerification.vue.js';
 import { format } from 'date-fns';
 
 var _sfc_main = /* @__PURE__ */ defineComponent({
@@ -67,10 +67,6 @@ var _sfc_main = /* @__PURE__ */ defineComponent({
     printdlgshow: {
       default: "0",
       type: String
-    },
-    queryPrintFile: {
-      type: Function,
-      default: () => Promise.resolve({})
     }
   },
   emits: ["success", "error", "clickoutside"],
@@ -92,8 +88,7 @@ var _sfc_main = /* @__PURE__ */ defineComponent({
       },
       isInited: false,
       watchPrintParamsReformatFn: null,
-      spinTimer: null,
-      fileObject: null
+      spinTimer: null
     });
     const options = reactive([{
       label: props.printText,
@@ -179,21 +174,6 @@ var _sfc_main = /* @__PURE__ */ defineComponent({
       params = Object.assign({}, JSON.parse(getPrintParams(0)), obj);
       return JSON.stringify(params);
     };
-    const browserPrint = async (mode) => {
-      if (state.fileObject) {
-        useBrowserPrint(state.fileObject, mode);
-      } else {
-        const queryParams = {
-          formatId: state.currentFormatId,
-          params: getOnceParams()
-        };
-        const {
-          data
-        } = await props.queryPrintFile(queryParams) || {};
-        state.fileObject = data;
-        useBrowserPrint(data, mode);
-      }
-    };
     const handleClickPrint = () => {
       let len = state.printParams.length;
       const callLocalServicesSuccessCbTmp = async (data) => {
@@ -208,31 +188,26 @@ var _sfc_main = /* @__PURE__ */ defineComponent({
       props.prevFn().catch(() => {
         prevFnError();
         return Promise.reject();
-      }).then(async () => {
-        var _a;
-        if (((_a = currentFormatItem.value) == null ? void 0 : _a.printType) == 0) {
-          browserPrint("printDirect");
-        } else {
-          const queryParams = {
-            formatId: state.currentFormatId,
-            templateId: getTemplateIdByFormatId.value,
-            printdlgshow: props.printdlgshow
-          };
-          if (props.strategy === "MULTI") {
-            for (let i = 0; i < state.printParams.length; i++) {
-              printInstance.printDirect({
-                ...queryParams,
-                params: getPrintParams(i)
-              }, callLocalServicesSuccessCbTmp, callLocalServicesErrorCb);
-            }
-          } else {
+      }).then(() => {
+        const queryParams = {
+          formatId: state.currentFormatId,
+          templateId: getTemplateIdByFormatId.value,
+          printdlgshow: props.printdlgshow
+        };
+        if (props.strategy === "MULTI") {
+          for (let i = 0; i < state.printParams.length; i++) {
             printInstance.printDirect({
               ...queryParams,
-              params: getOnceParams()
-            }, (res) => {
-              callLocalServicesSuccessCb(res, "print");
-            }, callLocalServicesErrorCb);
+              params: getPrintParams(i)
+            }, callLocalServicesSuccessCbTmp, callLocalServicesErrorCb);
           }
+        } else {
+          printInstance.printDirect({
+            ...queryParams,
+            params: getOnceParams()
+          }, (res) => {
+            callLocalServicesSuccessCb(res, "print");
+          }, callLocalServicesErrorCb);
         }
       }).finally(() => {
         state.visible = false;
@@ -242,21 +217,16 @@ var _sfc_main = /* @__PURE__ */ defineComponent({
       props.prevFn().catch(() => {
         prevFnError();
         return Promise.reject();
-      }).then(async () => {
-        var _a;
-        if (((_a = currentFormatItem.value) == null ? void 0 : _a.printType) == 0) {
-          browserPrint("preview");
-        } else {
-          const params = props.strategy === "MULTI" ? getPrintParams() : getOnceParams();
-          const queryParams = {
-            formatId: state.currentFormatId,
-            templateId: getTemplateIdByFormatId.value,
-            params
-          };
-          printInstance.preview(queryParams, (res) => {
-            callLocalServicesSuccessCb(res, "preview");
-          }, callLocalServicesErrorCb);
-        }
+      }).then(() => {
+        const params = props.strategy === "MULTI" ? getPrintParams() : getOnceParams();
+        const queryParams = {
+          formatId: state.currentFormatId,
+          templateId: getTemplateIdByFormatId.value,
+          params
+        };
+        printInstance.preview(queryParams, (res) => {
+          callLocalServicesSuccessCb(res, "preview");
+        }, callLocalServicesErrorCb);
       }).finally(() => {
         state.visible = false;
       });
@@ -265,23 +235,18 @@ var _sfc_main = /* @__PURE__ */ defineComponent({
       props.prevFn().catch(() => {
         prevFnError();
         return Promise.reject();
-      }).then(async () => {
-        var _a;
-        if (((_a = currentFormatItem.value) == null ? void 0 : _a.printType) == 0) {
-          browserPrint("downloadPDF");
-        } else {
-          const params = props.strategy === "MULTI" ? getPrintParams() : getOnceParams();
-          const queryParams = {
-            formatId: state.currentFormatId,
-            templateId: getTemplateIdByFormatId.value,
-            print: {
-              print: "1",
-              type: "1"
-            },
-            params
-          };
-          printInstance.downloadPDF(queryParams, (res) => callLocalServicesSuccessCb(res, "preview"), callLocalServicesErrorCb);
-        }
+      }).then(() => {
+        const params = props.strategy === "MULTI" ? getPrintParams() : getOnceParams();
+        const queryParams = {
+          formatId: state.currentFormatId,
+          templateId: getTemplateIdByFormatId.value,
+          print: {
+            print: "1",
+            type: "1"
+          },
+          params
+        };
+        printInstance.downloadPDF(queryParams, (res) => callLocalServicesSuccessCb(res, "preview"), callLocalServicesErrorCb);
       }).finally(() => {
         state.visible = false;
       });
@@ -312,7 +277,6 @@ var _sfc_main = /* @__PURE__ */ defineComponent({
           break;
         default:
           state.currentFormatId = key;
-          state.fileObject = null;
           state.visible = false;
           break;
       }
@@ -406,7 +370,6 @@ var _sfc_main = /* @__PURE__ */ defineComponent({
       var _a;
       state.formatList = formatListResult ? formatFormatList(formatListResult.obj) : [];
       state.currentFormatId = getDefaultFormatId(state.formatList, "defaultFlag");
-      state.fileObject = null;
       if (!state.currentFormatId) {
         $message.error("\u83B7\u53D6\u6253\u5370\u683C\u5F0F\u5931\u8D25\uFF0C\u8BF7\u8054\u7CFB\u7BA1\u7406\u5458\uFF01");
         return requestError();
@@ -461,10 +424,9 @@ var _sfc_main = /* @__PURE__ */ defineComponent({
       state.printParams = formatParams(state.templateParams, props.params);
     };
     const verifiySuccess = (token) => {
-      var _a;
       state.identityVerification.visible = false;
-      if (((_a = currentFormatItem.value) == null ? void 0 : _a.printType) == 0)
-        return;
+      if (isIReport(state.currentFormatId))
+        return callLocalServicesSuccessCb(null, "edit");
       const queryParams = {
         formatId: state.currentFormatId,
         templateId: getTemplateIdByFormatId.value,
@@ -489,7 +451,6 @@ var _sfc_main = /* @__PURE__ */ defineComponent({
       deep: true
     });
     return (_ctx, _cache) => {
-      var _a;
       return openBlock(), createElementBlock(Fragment, null, [createVNode(unref(NDropdown), {
         class: "c-dropdown",
         placement: "bottom-start",
@@ -518,9 +479,10 @@ var _sfc_main = /* @__PURE__ */ defineComponent({
       }, 8, ["show", "options"]), createVNode(IdentityVerification, mergeProps(_ctx.$attrs, {
         modelValue: state.identityVerification.visible,
         "onUpdate:modelValue": _cache[0] || (_cache[0] = ($event) => state.identityVerification.visible = $event),
-        printType: (_a = unref(currentFormatItem)) == null ? void 0 : _a.printType,
+        formatId: state.currentFormatId,
+        templateId: unref(getTemplateIdByFormatId),
         onSuccess: verifiySuccess
-      }), null, 16, ["modelValue", "printType"])], 64);
+      }), null, 16, ["modelValue", "formatId", "templateId"])], 64);
     };
   }
 });

package/es/components/button-print/src/components/{edit.vue.d.ts → EditFormat.vue.d.ts}

@@ -1,63 +1,69 @@
 /// <reference types="node" />
 import { UploadFileInfo } from 'naive-ui';
+import { AnyObject } from '../../../../../es/shared/types';
 declare const _default: import("vue").DefineComponent<{
-    saveIReportFormat: {
-        type: FunctionConstructor;
+    formatId: {
+        type: StringConstructor;
+        required: false;
+    };
+    token: {
+        type: StringConstructor;
         required: true;
-        default: () => Promise<void>;
     };
 }, {
+    PROTOCOL: string;
+    HOST: string;
+    BASEURL: string;
+    SAVEIREPORT: string;
+    QUERYFILELIST: string;
+    DELETEFILE: string;
+    instance: import("axios").AxiosInstance;
     $message: import("naive-ui").MessageApi;
     props: {
-        saveIReportFormat: Function;
+        formatId?: string | undefined;
+        token: string;
     };
     fileList: import("vue").Ref<{
-        key: string;
-        value: {
-            id: string;
-            name: string;
-            batchId?: string | null | undefined;
-            percentage?: number | null | undefined;
-            status: "error" | "pending" | "uploading" | "finished" | "removed";
-            url?: string | null | undefined;
-            file?: {
-                readonly lastModified: number;
-                readonly name: string;
-                readonly webkitRelativePath: string;
-                readonly size: number;
-                readonly type: string;
-                arrayBuffer: {
-                    (): Promise<ArrayBuffer>;
-                    (): Promise<ArrayBuffer>;
-                };
-                slice: {
-                    (start?: number | undefined, end?: number | undefined, contentType?: string | undefined): Blob;
-                    (start?: number | undefined, end?: number | undefined, contentType?: string | undefined): Blob;
-                };
-                stream: {
-                    (): ReadableStream<Uint8Array>;
-                    (): NodeJS.ReadableStream;
-                };
-                text: {
-                    (): Promise<string>;
-                    (): Promise<string>;
-                };
-            } | null | undefined;
-            thumbnailUrl?: string | null | undefined;
-            type?: string | null | undefined;
-            fullPath?: string | null | undefined;
-        }[];
+        id: string;
+        name: string;
+        batchId?: string | null | undefined;
+        percentage?: number | null | undefined;
+        status: "error" | "pending" | "uploading" | "finished" | "removed";
+        url?: string | null | undefined;
+        file?: {
+            readonly lastModified: number;
+            readonly name: string;
+            readonly webkitRelativePath: string;
+            readonly size: number;
+            readonly type: string;
+            arrayBuffer: {
+                (): Promise<ArrayBuffer>;
+                (): Promise<ArrayBuffer>;
+            };
+            slice: {
+                (start?: number | undefined, end?: number | undefined, contentType?: string | undefined): Blob;
+                (start?: number | undefined, end?: number | undefined, contentType?: string | undefined): Blob;
+            };
+            stream: {
+                (): ReadableStream<Uint8Array>;
+                (): NodeJS.ReadableStream;
+            };
+            text: {
+                (): Promise<string>;
+                (): Promise<string>;
+            };
+        } | null | undefined;
+        thumbnailUrl?: string | null | undefined;
+        type?: string | null | undefined;
+        fullPath?: string | null | undefined;
     }[]>;
-    submit: (token: string) => Promise<unknown>;
-    onChange: (data: {
-        file: UploadFileInfo;
-        fileList: UploadFileInfo[];
-    }, index: number) => void;
-    onBeforeUpload: (data: {
+    queryFileList: () => void;
+    onRemove: (options: {
         file: UploadFileInfo;
-        fileList: UploadFileInfo[];
-    }) => Promise<boolean>;
-    validateFormat: (file: UploadFileInfo, format: string) => boolean;
+        fileList: Array<UploadFileInfo>;
+    }) => Promise<unknown>;
+    submit: (datas: AnyObject) => Promise<unknown>;
+    validateFormat: () => boolean;
     NForm: any;
     NFormItem: import("vue").DefineComponent<{
         readonly label: StringConstructor;
@@ -1226,12 +1232,13 @@ declare const _default: import("vue").DefineComponent<{
     NSpace: any;
     Archive: import("vue").DefineComponent<{}, {}, {}, {}, {}, import("vue").ComponentOptionsMixin, import("vue").ComponentOptionsMixin, import("vue").EmitsOptions, string, import("vue").VNodeProps & import("vue").AllowedComponentProps & import("vue").ComponentCustomProps, Readonly<import("vue").ExtractPropTypes<{}>>, {}>;
 }, unknown, {}, {}, import("vue").ComponentOptionsMixin, import("vue").ComponentOptionsMixin, {}, string, import("vue").VNodeProps & import("vue").AllowedComponentProps & import("vue").ComponentCustomProps, Readonly<import("vue").ExtractPropTypes<{
-    saveIReportFormat: {
-        type: FunctionConstructor;
+    formatId: {
+        type: StringConstructor;
+        required: false;
+    };
+    token: {
+        type: StringConstructor;
         required: true;
-        default: () => Promise<void>;
     };
-}>>, {
-    saveIReportFormat: Function;
-}>;
+}>>, {}>;
 export default _default;

package/es/components/button-print/src/components/EditFormat.vue.js

@@ -0,0 +1,173 @@
+import { defineComponent, ref, openBlock, createBlock, unref, withCtx, createVNode, createElementVNode, createTextVNode } from 'vue';
+import { useMessage, NForm, NFormItem, NSpace, NUpload, NUploadDragger, NIcon, NText, NP } from 'naive-ui';
+import { Archive } from '@vicons/ionicons5';
+import axios from 'axios';
+import _export_sfc from '../../../../_virtual/plugin-vue_export-helper.js';
+
+const _hoisted_1 = { style: { "margin-bottom": "12px" } };
+const _sfc_main = /* @__PURE__ */ defineComponent({
+  __name: "EditFormat",
+  props: {
+    formatId: null,
+    token: null
+  },
+  setup(__props, { expose }) {
+    const props = __props;
+    const PROTOCOL = window.location.protocol;
+    const HOST = window.location.host;
+    const BASEURL = `${PROTOCOL}//${HOST}/bi-api`;
+    const SAVEIREPORT = `${BASEURL}/reprot/print/open/client/saveIReportFormat`;
+    const QUERYFILELIST = `${BASEURL}/reprot/print/open/client/getIReportFiles`;
+    const DELETEFILE = `${BASEURL}/reprot/print/open/client/delIReportFiles`;
+    const instance = axios.create({});
+    const $message = useMessage();
+    const fileList = ref([]);
+    queryFileList();
+    function queryFileList() {
+      var _a;
+      instance.get(`${QUERYFILELIST}?formatId=${(_a = props.formatId) == null ? void 0 : _a.split("_")[1]}&authorizationKey=${props.token}`).then(({ data }) => {
+        (data.list || []).forEach((file) => {
+          fileList.value.push({
+            id: Date.now().toString(),
+            name: file,
+            status: "finished"
+          });
+        });
+      });
+    }
+    function onRemove(options) {
+      return new Promise((resolve, reject) => {
+        var _a;
+        instance.get(
+          `${DELETEFILE}?formatId=${(_a = props.formatId) == null ? void 0 : _a.split("_")[1]}&authorizationKey=${props.token}&fileName=${options.file.name}`
+        ).then(({ data }) => {
+          if ((data == null ? void 0 : data.result) !== "SUCCESS") {
+            $message.error((data == null ? void 0 : data.resultMsg) || "\u5220\u9664\u6587\u4EF6\u5931\u8D25\uFF0C\u8BF7\u91CD\u8BD5\uFF01");
+            reject();
+          } else {
+            $message.success("\u5220\u9664\u6587\u4EF6\u6210\u529F\uFF01");
+            resolve("SUCCESS");
+          }
+        });
+      });
+    }
+    function submit(datas) {
+      return new Promise((resolve, reject) => {
+        if (!validateFormat()) {
+          $message.warning("\u8BF7\u81F3\u5C11\u4E0A\u4F20\u4E00\u4E2Ajrxml\u6587\u4EF6\u548C\u4E00\u4E2Ajasper\u6587\u4EF6\uFF01");
+          return;
+        }
+        const files = fileList.value.filter((file) => file.file);
+        if (files.length === 0) {
+          $message.warning("\u672C\u6B21\u65E0\u65B0\u6587\u4EF6\u589E\u52A0\uFF0C\u8BF7\u5148\u6DFB\u52A0\u65B0\u6587\u4EF6\uFF01");
+          return;
+        }
+        const params = new FormData();
+        Object.keys(datas).forEach((v) => {
+          params.append(v, datas[v]);
+        });
+        fileList.value.forEach((file) => {
+          file.file && params.append("files", file.file);
+        });
+        instance.post(SAVEIREPORT, params, {
+          headers: {
+            "Content-Type": "application/x-www-form-urlencoded"
+          }
+        }).then(({ data }) => {
+          if ((data == null ? void 0 : data.result) !== "SUCCESS") {
+            $message.error((data == null ? void 0 : data.resultMsg) || "\u4E0A\u4F20\u6587\u4EF6\u5931\u8D25\uFF0C\u8BF7\u91CD\u8BD5\uFF01");
+            reject();
+          } else {
+            resolve("SUCCESS");
+          }
+        });
+      });
+    }
+    function validateFormat() {
+      if (fileList.value.length < 2)
+        return false;
+      let isJrxml = false;
+      let isJasper = false;
+      const rExt = /\.([^.]+)$/;
+      fileList.value.forEach((file) => {
+        var _a;
+        const name = ((_a = file.file) == null ? void 0 : _a.name) || file.name || "";
+        const ext = rExt.exec(name) ? RegExp.$1.toLowerCase() : "";
+        if (ext && ".jrxml".includes(ext))
+          isJrxml = true;
+        if (ext && ".jasper".includes(ext))
+          isJasper = true;
+      });
+      if (isJrxml && isJasper)
+        return true;
+      return false;
+    }
+    expose({
+      submit
+    });
+    return (_ctx, _cache) => {
+      return openBlock(), createBlock(unref(NForm), {
+        "label-placement": "left",
+        "label-width": 75
+      }, {
+        default: withCtx(() => [
+          createVNode(unref(NFormItem), {
+            label: "\u683C\u5F0F\u6587\u4EF6:",
+            path: "file"
+          }, {
+            default: withCtx(() => [
+              createVNode(unref(NSpace), { vertical: "" }, {
+                default: withCtx(() => [
+                  createVNode(unref(NUpload), {
+                    multiple: "",
+                    "directory-dnd": "",
+                    "file-list": fileList.value,
+                    "onUpdate:file-list": _cache[0] || (_cache[0] = ($event) => fileList.value = $event),
+                    onRemove
+                  }, {
+                    default: withCtx(() => [
+                      createVNode(unref(NUploadDragger), null, {
+                        default: withCtx(() => [
+                          createElementVNode("div", _hoisted_1, [
+                            createVNode(unref(NIcon), {
+                              size: "36",
+                              depth: 3,
+                              component: unref(Archive)
+                            }, null, 8, ["component"])
+                          ]),
+                          createVNode(unref(NText), { style: { "font-size": "12px" } }, {
+                            default: withCtx(() => [
+                              createTextVNode("\u70B9\u51FB\u6216\u8005\u62D6\u52A8\u6587\u4EF6\u5230\u8BE5\u533A\u57DF\u6765\u4E0A\u4F20")
+                            ]),
+                            _: 1
+                          }),
+                          createVNode(unref(NP), {
+                            depth: "3",
+                            style: { "margin": "5px 0 0 0", "font-size": "13px" }
+                          }, {
+                            default: withCtx(() => [
+                              createTextVNode("\u81F3\u5C11\u5305\u542B\u4E00\u4E2Ajxml\u6587\u4EF6\u548C\u4E00\u4E2Ajasper\u6587\u4EF6")
+                            ]),
+                            _: 1
+                          })
+                        ]),
+                        _: 1
+                      })
+                    ]),
+                    _: 1
+                  }, 8, ["file-list"])
+                ]),
+                _: 1
+              })
+            ]),
+            _: 1
+          })
+        ]),
+        _: 1
+      });
+    };
+  }
+});
+var EditFormat = /* @__PURE__ */ _export_sfc(_sfc_main, [["__file", "EditFormat.vue"]]);
+
+export { EditFormat as default };