cnhis-design-vue 3.1.13-beta.0 → 3.1.13-beta.11

package/es/packages/button-print/src/ButtonPrint.vue_vue_type_script_setup_true_lang.js

@@ -1,7 +1,7 @@
-import { defineComponent, reactive, computed, onMounted, watch, openBlock, createElementBlock, Fragment, createVNode, unref, withCtx, renderSlot, withModifiers, createCommentVNode, createTextVNode, toDisplayString, mergeProps } from 'vue';
+import { defineComponent, reactive, computed, onMounted, onUnmounted, watch, openBlock, createElementBlock, Fragment, createVNode, unref, withCtx, renderSlot, withModifiers, createCommentVNode, createTextVNode, toDisplayString, mergeProps } from 'vue';
 import { useMessage, NDropdown, NButton, NIcon } from 'naive-ui';
 import { ChevronDown } from '@vicons/ionicons5';
-import Yi from './utils/print.es.min.js';
+import Print from './utils/print.js';
 import './components/IdentityVerification.js';
 import moment from 'moment';
 import script$1 from './components/IdentityVerification.vue_vue_type_script_setup_true_lang.js';
@@ -28,6 +28,10 @@ var script = /* @__PURE__ */ defineComponent({
       default: "\u6253\u5370\u9884\u89C8",
       type: String
     },
+    pdfLoadText: {
+      default: "\u4E0B\u8F7Dpdf",
+      type: String
+    },
     formatEditText: {
       default: "\u683C\u5F0F\u7F16\u8F91",
       type: String
@@ -63,7 +67,7 @@ var script = /* @__PURE__ */ defineComponent({
   }) {
     const props = __props;
     const $message = useMessage();
-    let printInstance = null;
+    let printInstance;
     const state = reactive({
       spinning: false,
       visible: false,
@@ -84,6 +88,9 @@ var script = /* @__PURE__ */ defineComponent({
     }, {
       label: props.previewText,
       key: "previewText"
+    }, {
+      label: props.pdfLoadText,
+      key: "downloadPdf"
     }, {
       label: props.formatEditText,
       key: "formatEditText"
@@ -207,6 +214,28 @@ var script = /* @__PURE__ */ defineComponent({
         state.visible = false;
       });
     };
+    const handleClickPdf = async () => {
+      props.prevFn().catch(() => {
+        prevFnError();
+        return Promise.reject();
+      }).then(() => {
+        const params = props.strategy === "MULTI" ? getPrintParams() : getOnceParams();
+        const queryParams = {
+          formatId: state.currentFormatId,
+          templateId: getTemplateIdByFormatId(state.currentFormatId),
+          print: {
+            print: "1",
+            type: "1"
+          },
+          params
+        };
+        printInstance.printDirect(queryParams, (res) => {
+          callLocalServicesSuccessCb(res, "preview");
+        }, callLocalServicesErrorCb);
+      }).finally(() => {
+        state.visible = false;
+      });
+    };
     const handleClickEdit = () => {
       props.prevFn().catch(() => {
         prevFnError();
@@ -228,6 +257,9 @@ var script = /* @__PURE__ */ defineComponent({
         case "formatEditText":
           handleClickEdit();
           break;
+        case "downloadPdf":
+          handleClickPdf();
+          break;
         default:
           state.currentFormatId = key;
           state.visible = false;
@@ -241,7 +273,7 @@ var script = /* @__PURE__ */ defineComponent({
     const instantiatePrintSDK = () => {
       if (printInstance)
         return false;
-      printInstance = new Yi();
+      printInstance = new Print();
     };
     const getDefaultFormatId = (list, key) => {
       if (!(list == null ? void 0 : list.length))
@@ -395,6 +427,9 @@ var script = /* @__PURE__ */ defineComponent({
     onMounted(() => {
       state.isInited = false;
     });
+    onUnmounted(() => {
+      printInstance == null ? void 0 : printInstance.destroy();
+    });
     watch(() => props.params, (val) => {
       if (!(val == null ? void 0 : val.length))
         return false;

package/es/packages/button-print/src/utils/print.d.ts

@@ -0,0 +1,41 @@
+import { AnyObject, Func } from '../../../../../es/src/types';
+export default class Print {
+    private readonly webview;
+    private currentMessageHandler?;
+    constructor();
+    private readonly messageHandlerStack;
+    private messageHandler;
+    private postMessage;
+    destroy(): void;
+    _testConnection(): Promise<unknown>;
+    _queryServicesPrint(params: AnyObject): Promise<any>;
+    _callPrintWithFile(queryParams: AnyObject): Promise<any>;
+    _handleResult(data: AnyObject, errorCallbackFn?: Func): false | AnyObject;
+    _handleResultTest(result: any, errorCallbackFn?: Func): boolean;
+    _handleEventQueryPrintData(templateId: string, formatId: string, params: AnyObject, errorCallbackFn?: Func): Promise<false | {
+        file: any;
+        printerName: any;
+        pageCount: any;
+        formatId: string;
+    }>;
+    _handleQueryPrintDataResult(printData: AnyObject, formatId: string, errorCallbackFn?: Func): false | {
+        file: any;
+        printerName: any;
+        pageCount: any;
+        formatId: string;
+    };
+    _handleEventDirect({ templateId, formatId, params, cmdid, print, printdlgshow, nobillnode }: AnyObject): Promise<any>;
+    _handleEventEditFormat({ templateId, formatId, params, token }: AnyObject): Promise<any>;
+    preview({ templateId, formatId, params }: AnyObject, successCallbackFn?: Func, errorCallbackFn?: Func): Promise<false | undefined>;
+    printDirect({ templateId, formatId, params, print, printdlgshow, nobillnode }: AnyObject, successCallbackFn: Func, errorCallbackFn: Func): Promise<false | undefined>;
+    print({ templateId, formatId, params }: AnyObject, successCallbackFn?: Func, errorCallbackFn?: Func): Promise<false | undefined>;
+    queryPrintData({ templateId, formatId, params }: AnyObject, successCallbackFn?: Func, errorCallbackFn?: Func): Promise<false | {
+        file: any;
+        printerName: any;
+        pageCount: any;
+        formatId: string;
+    }>;
+    printFileData({ formatId, file, printerName }: AnyObject, successCallbackFn?: Func, errorCallbackFn?: Func): Promise<false | AnyObject>;
+    editPrintFormat({ templateId, formatId, params, token }: AnyObject, successCallbackFn?: Func, errorCallbackFn?: Func): Promise<false | undefined>;
+    addPrintFormat({ templateId, params, token }: AnyObject, successCallbackFn?: Func, errorCallbackFn?: Func): Promise<false | undefined>;
+}

package/es/packages/button-print/src/utils/print.js

@@ -0,0 +1,325 @@
+import axios from 'axios';
+
+const PRINT_ORIGIN = "http://127.0.0.1:11111";
+const EDIT_LOCAL_URL = `${PRINT_ORIGIN}/services/print`;
+const PRINT_URL = `${PRINT_ORIGIN}/PrintLocal`;
+const PRINT_CMD_ID = "7";
+const PREVIEW_CMD_ID = "8";
+const PRINTER_NAME_DEFAULT = "Default";
+const testHttpFn = axios.create({
+  timeout: 1e3,
+  withCredentials: false
+});
+const httpFn = axios.create({ withCredentials: false });
+class Print {
+  constructor() {
+    this.messageHandlerStack = [];
+    var _a;
+    const _window = window;
+    this.webview = (_a = _window.chrome) == null ? void 0 : _a.webview;
+    if (!this.webview)
+      return;
+    this.currentMessageHandler = this.messageHandler.bind(this);
+    this.webview.addEventListener("message", this.currentMessageHandler);
+  }
+  messageHandler(e) {
+    const handler = this.messageHandlerStack.pop();
+    if (!handler)
+      return console.log("\u5F53\u524D\u56DE\u6267", e, "\u6CA1\u6709\u53EF\u7528\u7684handler");
+    const { resolve, reject } = handler;
+    try {
+      console.log(e);
+      resolve(JSON.parse(e.data));
+    } catch (e2) {
+      reject(e2);
+    }
+  }
+  async postMessage(data) {
+    if (!this.webview)
+      return Promise.reject();
+    return new Promise((resolve, reject) => {
+      this.messageHandlerStack.push({ resolve, reject });
+      this.webview.postMessage(data);
+    });
+  }
+  destroy() {
+    if (this.webview && this.currentMessageHandler) {
+      this.webview.removeEventListener("message", this.currentMessageHandler);
+      this.currentMessageHandler = void 0;
+    }
+  }
+  _testConnection() {
+    if (this.webview)
+      return Promise.resolve(true);
+    return new Promise((resolve) => {
+      testHttpFn({
+        url: `${PRINT_ORIGIN}/test`,
+        method: "get",
+        withCredentials: false,
+        params: {
+          inputdata: {
+            result: "success"
+          }
+        }
+      }).then(({ data }) => {
+        if (data.result !== "success") {
+          resolve(false);
+          return;
+        }
+        resolve(true);
+      }).catch((err) => {
+        resolve(false);
+      });
+    });
+  }
+  _queryServicesPrint(params) {
+    if (this.webview) {
+      return this.postMessage({ exec: "print", data: { inputData: params } });
+    }
+    return httpFn({
+      url: EDIT_LOCAL_URL,
+      method: "get",
+      params: {
+        inputData: JSON.stringify(params)
+      }
+    }).then(({ data }) => {
+      return data;
+    });
+  }
+  _callPrintWithFile(queryParams) {
+    const defaultQueryParams = {
+      cmdid: PRINT_CMD_ID,
+      flag: "1"
+    };
+    const params = {
+      inputData: JSON.stringify(Object.assign({}, defaultQueryParams, queryParams))
+    };
+    if (this.webview) {
+      return this.postMessage({ exec: "print", data: transformData(params) });
+    }
+    return httpFn({
+      url: PRINT_URL,
+      method: "post",
+      data: params,
+      transformRequest: [transformData]
+    }).then(({ data }) => {
+      return data;
+    });
+    function transformData(oldData) {
+      let newStr = "";
+      for (const item in oldData) {
+        newStr += encodeURIComponent(item) + "=" + encodeURIComponent(oldData[item]) + "&";
+      }
+      newStr = newStr.slice(0, -1);
+      return newStr;
+    }
+  }
+  _handleResult(data, errorCallbackFn) {
+    if (data.result !== "success") {
+      const message = data.message || data.Message;
+      const errorMsgObj = {
+        type: "printError",
+        message,
+        result: data.result,
+        errinfo: data.errinfo
+      };
+      errorCallbackFn == null ? void 0 : errorCallbackFn(errorMsgObj);
+      return false;
+    }
+    return data;
+  }
+  _handleResultTest(result, errorCallbackFn) {
+    if (!result) {
+      console.log("notInstalledApp");
+      errorCallbackFn == null ? void 0 : errorCallbackFn({
+        type: "notInstalledApp",
+        message: "\u8BF7\u6253\u5F00\u6253\u5370\u670D\u52A1\u5668\u63D2\u4EF6"
+      });
+      return false;
+    }
+    return true;
+  }
+  async _handleEventQueryPrintData(templateId, formatId, params, errorCallbackFn) {
+    const queryParams = {
+      templateId,
+      formatId,
+      params,
+      cmdid: PRINT_CMD_ID
+    };
+    const printData = await this._queryServicesPrint(queryParams);
+    return this._handleQueryPrintDataResult(printData, formatId, errorCallbackFn);
+  }
+  _handleQueryPrintDataResult(printData, formatId, errorCallbackFn) {
+    if (!(printData == null ? void 0 : printData.file)) {
+      try {
+        const message = printData.message || printData.Message;
+        console.log(message);
+        errorCallbackFn == null ? void 0 : errorCallbackFn({
+          type: "queryPrintDataFailure",
+          message
+        });
+      } catch (err) {
+        console.log(err);
+      }
+      return false;
+    }
+    return {
+      file: printData.file,
+      printerName: printData.defprinter,
+      pageCount: printData.pagecount,
+      formatId
+    };
+  }
+  async _handleEventDirect({
+    templateId,
+    formatId,
+    params,
+    cmdid,
+    print,
+    printdlgshow = "1",
+    nobillnode = "1"
+  }) {
+    const queryParams = {
+      templateId,
+      formatId,
+      params,
+      cmdid,
+      nobillnode,
+      printdlgshow
+    };
+    if (print) {
+      try {
+        print = JSON.parse(print);
+      } catch (error) {
+      }
+      queryParams.print = print;
+    }
+    return await this._queryServicesPrint(queryParams);
+  }
+  async _handleEventEditFormat({ templateId, formatId = "", params = "", token }) {
+    const DEFAULT_PARAMS = {};
+    let formatParams = {};
+    try {
+      formatParams = Object.assign({}, DEFAULT_PARAMS, JSON.parse(params));
+    } catch (error) {
+      formatParams = DEFAULT_PARAMS;
+    }
+    const queryParams = {
+      templateId,
+      formatId,
+      cmdid: "9",
+      token,
+      params: JSON.stringify(formatParams)
+    };
+    return await this._queryServicesPrint(queryParams);
+  }
+  async preview({ templateId, formatId, params = "" }, successCallbackFn, errorCallbackFn) {
+    const testResult = await this._testConnection();
+    if (!this._handleResultTest(testResult, errorCallbackFn))
+      return false;
+    const result = await this._handleEventDirect({
+      templateId,
+      formatId,
+      params,
+      cmdid: PREVIEW_CMD_ID
+    });
+    if (!result)
+      return false;
+    const handledResult = this._handleResult(result, errorCallbackFn);
+    if (!handledResult)
+      return false;
+    successCallbackFn && successCallbackFn(handledResult);
+  }
+  async printDirect({ templateId, formatId, params = "", print, printdlgshow, nobillnode }, successCallbackFn, errorCallbackFn) {
+    const testResult = await this._testConnection();
+    if (!this._handleResultTest(testResult, errorCallbackFn))
+      return false;
+    const result = await this._handleEventDirect({
+      templateId,
+      formatId,
+      params,
+      cmdid: PRINT_CMD_ID,
+      print,
+      printdlgshow,
+      nobillnode
+    });
+    if (!result)
+      return false;
+    const handledResult = this._handleResult(result, errorCallbackFn);
+    if (!handledResult)
+      return false;
+    successCallbackFn && successCallbackFn(handledResult);
+  }
+  async print({ templateId, formatId, params = "" }, successCallbackFn, errorCallbackFn) {
+    const testResult = await this._testConnection();
+    if (!this._handleResultTest(testResult, errorCallbackFn))
+      return false;
+    const printData = await this.queryPrintData({ templateId, formatId, params }, void 0, errorCallbackFn);
+    if (!printData)
+      return false;
+    const handledResult = this.printFileData({
+      formatId,
+      file: printData.file,
+      printerName: printData.printerName
+    }, void 0, errorCallbackFn);
+    if (!handledResult)
+      return false;
+    successCallbackFn && successCallbackFn(handledResult);
+  }
+  async queryPrintData({ templateId, formatId, params = "" }, successCallbackFn, errorCallbackFn) {
+    const testResult = await this._testConnection();
+    if (!this._handleResultTest(testResult, errorCallbackFn))
+      return false;
+    const result = await this._handleEventQueryPrintData(templateId, formatId, params, errorCallbackFn);
+    if (!result)
+      return false;
+    successCallbackFn && successCallbackFn(result);
+    return result;
+  }
+  async printFileData({ formatId, file, printerName = PRINTER_NAME_DEFAULT }, successCallbackFn, errorCallbackFn) {
+    const testResult = await this._testConnection();
+    if (!this._handleResultTest(testResult, errorCallbackFn))
+      return false;
+    const result = await this._callPrintWithFile({
+      formatId,
+      printname: printerName,
+      file
+    });
+    const handledResult = this._handleResult(result, errorCallbackFn);
+    if (!handledResult)
+      return false;
+    successCallbackFn && successCallbackFn(handledResult);
+    return handledResult;
+  }
+  async editPrintFormat({ templateId, formatId, params, token }, successCallbackFn, errorCallbackFn) {
+    const testResult = await this._testConnection();
+    if (!this._handleResultTest(testResult, errorCallbackFn))
+      return false;
+    const result = await this._handleEventEditFormat({
+      templateId,
+      formatId,
+      params,
+      token
+    });
+    const handledResult = this._handleResult(result, errorCallbackFn);
+    if (!handledResult)
+      return false;
+    successCallbackFn && successCallbackFn(handledResult);
+  }
+  async addPrintFormat({ templateId, params, token }, successCallbackFn, errorCallbackFn) {
+    const testResult = await this._testConnection();
+    if (!this._handleResultTest(testResult, errorCallbackFn))
+      return false;
+    const result = await this._handleEventEditFormat({
+      templateId,
+      params,
+      token
+    });
+    const handledResult = this._handleResult(result, errorCallbackFn);
+    if (!handledResult)
+      return false;
+    successCallbackFn && successCallbackFn(handledResult);
+  }
+}
+
+export { Print as default };

package/es/packages/fabric-chart/index.d.ts

@@ -30,9 +30,8 @@ declare const FabricChart: SFCWithInstall<import("vue").DefineComponent<{
     originY: import("vue").ComputedRef<number>;
     xCellWidth: import("vue").ComputedRef<number>;
     yCellHeight: import("vue").ComputedRef<number>;
-    xScaleList: import("vue").ComputedRef<number[]>;
     iconsWidth: import("vue").ComputedRef<any>;
-    xScaleCell: import("vue").ComputedRef<number>;
+    xScaleList: import("vue").ComputedRef<any[]>;
     breatheYCell: import("vue").ComputedRef<number>;
     pulseYCell: import("vue").ComputedRef<number>;
     temperatureYCell: import("vue").ComputedRef<number>;
@@ -50,9 +49,9 @@ declare const FabricChart: SFCWithInstall<import("vue").DefineComponent<{
         endY: number;
     }>;
     propItems: any;
-    cumputedX: (value: string | number) => number;
+    cumputedX: (value: string | number) => any;
     cumputedY: (type: import("./src/interface").IPointType, scaleValueList: number[], value: string | number) => number;
-    getXValue: (pointX: number) => string;
+    getXValue: (pointX: number) => string | undefined;
     getYValue: (type: import("./src/interface").IPointType, pointY: number) => number;
     pointTipProps: {
         show: boolean;

package/es/packages/fabric-chart/src/FabricChart.vue.d.ts

@@ -30,9 +30,8 @@ declare const _default: import("vue").DefineComponent<{
     originY: import("vue").ComputedRef<number>;
     xCellWidth: import("vue").ComputedRef<number>;
     yCellHeight: import("vue").ComputedRef<number>;
-    xScaleList: import("vue").ComputedRef<number[]>;
     iconsWidth: import("vue").ComputedRef<any>;
-    xScaleCell: import("vue").ComputedRef<number>;
+    xScaleList: import("vue").ComputedRef<any[]>;
     breatheYCell: import("vue").ComputedRef<number>;
     pulseYCell: import("vue").ComputedRef<number>;
     temperatureYCell: import("vue").ComputedRef<number>;
@@ -50,9 +49,9 @@ declare const _default: import("vue").DefineComponent<{
         endY: number;
     }>;
     propItems: any;
-    cumputedX: (value: string | number) => number;
+    cumputedX: (value: string | number) => any;
     cumputedY: (type: import("./interface").IPointType, scaleValueList: number[], value: string | number) => number;
-    getXValue: (pointX: number) => string;
+    getXValue: (pointX: number) => string | undefined;
     getYValue: (type: import("./interface").IPointType, pointY: number) => number;
     pointTipProps: {
         show: boolean;

package/es/packages/fabric-chart/src/FabricChart.vue_vue_type_script_setup_true_lang.js

@@ -60,7 +60,7 @@ var script = /* @__PURE__ */ defineComponent({
       return grid.mainYCell * grid.subYCell;
     });
     const endX = computed(() => {
-      const { width, right = null } = props.data;
+      const { width, right = null, top } = props.data;
       if (!right)
         return width;
       const endWidth = right.width || 50;
@@ -69,17 +69,14 @@ var script = /* @__PURE__ */ defineComponent({
     const originX = computed(() => {
       const { top, left } = props.data;
       const originX2 = top.titleWidth + iconsWidth.value;
-      const residue = (endX.value - originX2) % gridXNumber.value;
-      return originX2 + residue;
+      return originX2;
     });
     const endY = computed(() => {
       const { bottom = null, height } = props.data;
       if (!bottom)
         return height;
       const endHeight = bottom.height || 30;
-      const endY2 = height - endHeight;
-      const residue = (endY2 - originY.value) % gridYNumber.value;
-      return endY2 - residue;
+      return height - endHeight;
     });
     const originY = computed(() => {
       const { top } = props.data;
@@ -94,25 +91,35 @@ var script = /* @__PURE__ */ defineComponent({
     const yCellHeight = computed(() => {
       return (endY.value - originY.value) / gridYNumber.value;
     });
+    const iconsWidth = computed(() => {
+      var _a, _b;
+      const { left } = props.data;
+      return ((_a = left.icons) == null ? void 0 : _a.show) && (((_b = left.icons) == null ? void 0 : _b.width) || 100) || 0;
+    });
     const xScaleList = computed(() => {
       const { top } = props.data;
       const dateList = top.date.list;
-      const dayList = top.xScalevalue.list;
+      const times = top.xScalevalue.times;
+      let left = originX.value - xCellWidth.value;
+      function getDate(date) {
+        return String(date).length < 9 ? `20${date}` : date;
+      }
       const timeList = dateList.map((item) => {
-        return dayList.map((v) => {
-          return new Date(`${item} ${v}:00`).getTime();
+        return times.map((v) => {
+          left += xCellWidth.value;
+          const start = new Date(`${getDate(item)} ${v.start}`).getTime();
+          const end = new Date(`${getDate(item)} ${v.end}`).getTime();
+          return {
+            start,
+            end,
+            left,
+            center: left + xCellWidth.value / 2,
+            scaleCell: (end - start) / xCellWidth.value
+          };
         });
       });
       return timeList.flat();
     });
-    const iconsWidth = computed(() => {
-      var _a, _b;
-      const { left } = props.data;
-      return ((_a = left.icons) == null ? void 0 : _a.show) && (((_b = left.icons) == null ? void 0 : _b.width) || 100) || 0;
-    });
-    const xScaleCell = computed(() => {
-      return xScaleList.value[1] - xScaleList.value[0];
-    });
     const breatheYCell = computed(() => {
       var _a;
       const { yScaleValue, spaceGridNumber = 5 } = props.data.left;
@@ -222,7 +229,6 @@ var script = /* @__PURE__ */ defineComponent({
       xCellWidth: xCellWidth.value,
       yCellHeight: yCellHeight.value,
       xScaleList: xScaleList.value,
-      xScaleCell: xScaleCell.value,
       breatheYCell: breatheYCell.value,
       pulseYCell: pulseYCell.value,
       temperatureYCell: temperatureYCell.value,

package/es/packages/fabric-chart/src/hooks/useBottom.js

@@ -5,7 +5,6 @@ import { defaultBorderStyle, drawTextGroup, defaultTextStyle, defaultRectStyle,
 function useBottom(canvas, propItems) {
   const {
     xScaleList,
-    xScaleCell,
     originX,
     endX,
     endY,
@@ -35,7 +34,7 @@ function useBottom(canvas, propItems) {
       let text = "";
       bottomBreathingList.forEach((v, i) => {
         const time = new Date(v.time).getTime();
-        if (time >= item && time < +item + xScaleCell)
+        if (time >= item && time < +item + item.scaleCell)
           text = v.value;
       });
       const style = flag ? {