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

package/es/components/button-print/src/utils/dialog.js

@@ -1,5 +1,6 @@
 import { ref, render, createVNode, withCtx, nextTick, defineComponent, provide } from 'vue';
-import IdentityVerification from '../components/IdentityVerification.js';
+import IdentityVerification from '../components/IdentityVerification.vue.js';
+import Preview from '../components/Preview.vue.js';
 
 class IdentityVerificationDialog {
   constructor() {
@@ -15,7 +16,7 @@ class IdentityVerificationDialog {
       this.rendered = true;
       const container = document.createElement("div");
       const visible = ref(false);
-      const ProviderWrapper = this.createProviderWrapper(instance);
+      const ProviderWrapper = createProviderWrapper(instance);
       render(createVNode(ProviderWrapper, null, {
         default: withCtx(() => createVNode(IdentityVerification, {
           "to": container,
@@ -51,29 +52,70 @@ class IdentityVerificationDialog {
       }
     });
   }
-  createProviderWrapper(instance) {
-    return defineComponent({
-      setup(_, {
-        slots
-      }) {
-        let provides = (instance == null ? void 0 : instance.parent) && Reflect.get(instance.parent, "provides");
-        const keys = [];
-        while (provides) {
-          Object.entries(provides).forEach(([k, v]) => {
-            if (keys.includes(k))
-              return;
-            keys.push(k);
-            provide(k, v);
-          });
-          provides = Object.getPrototypeOf(provides);
-        }
-        return () => {
-          var _a;
-          return createVNode("div", null, [(_a = slots.default) == null ? void 0 : _a.call(slots)]);
-        };
+}
+class PreviewDialog {
+  constructor() {
+    this.rendered = false;
+  }
+  static createMsg(message) {
+    return `[PreviewDialog] ${message}`;
+  }
+  show(instance, src) {
+    if (this.rendered)
+      return Promise.reject(PreviewDialog.createMsg("\u8BF7\u52FF\u91CD\u590D\u6253\u5F00\u5F39\u7A97"));
+    return new Promise((resolve, reject) => {
+      this.rendered = true;
+      const container = document.createElement("div");
+      const visible = ref(false);
+      const ProviderWrapper = createProviderWrapper(instance);
+      render(createVNode(ProviderWrapper, null, {
+        default: withCtx(() => createVNode(Preview, {
+          "visible": visible.value,
+          "onUpdate:visible": ($event) => visible.value = $event,
+          "src": src,
+          "onAfterLeave": () => unmount(container)
+        }, null), instance)
+      }), container);
+      mount(container);
+      nextTick(() => {
+        visible.value = true;
+        resolve("success");
+      });
+      function mount(target) {
+        document.body.appendChild(target);
+      }
+      const that = this;
+      function unmount(target) {
+        if (!target.parentElement)
+          return;
+        that.rendered = false;
+        target.parentElement.removeChild(target);
       }
     });
   }
 }
+function createProviderWrapper(instance) {
+  return defineComponent({
+    setup(_, {
+      slots
+    }) {
+      let provides = (instance == null ? void 0 : instance.parent) && Reflect.get(instance.parent, "provides");
+      const keys = [];
+      while (provides) {
+        Object.entries(provides).forEach(([k, v]) => {
+          if (keys.includes(k))
+            return;
+          keys.push(k);
+          provide(k, v);
+        });
+        provides = Object.getPrototypeOf(provides);
+      }
+      return () => {
+        var _a;
+        return createVNode("div", null, [(_a = slots.default) == null ? void 0 : _a.call(slots)]);
+      };
+    }
+  });
+}
 
-export { IdentityVerificationDialog };
+export { IdentityVerificationDialog, PreviewDialog };

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

@@ -1,9 +1,11 @@
 import { AnyObject, Func } from '../../../../../es/shared/types';
-import { IdentityVerificationDialog } from '../../../../../es/components/button-print/src/utils/dialog';
+import { IdentityVerificationDialog, PreviewDialog } from '../../../../../es/components/button-print/src/utils/dialog';
 export declare class Print {
     private readonly webview;
     private currentMessageHandler?;
     private dialog;
+    private dialogPreview;
+    private instance;
     constructor();
     private readonly messageHandlerQueue;
     private messageHandler;
@@ -13,6 +15,7 @@ export declare class Print {
      * @desc 调用实例方法打开弹窗
      */
     show(...args: Parameters<IdentityVerificationDialog['show']>): Promise<string>;
+    showPreview(...args: Parameters<PreviewDialog['show']>): Promise<string>;
     _testConnection(): Promise<unknown>;
     _queryServicesPrint(params: AnyObject): Promise<any>;
     _callPrintWithFile(queryParams: AnyObject): Promise<any>;

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

@@ -1,7 +1,8 @@
 import axios from 'axios';
 import { isArray } from 'lodash-es';
-import { IdentityVerificationDialog } from './dialog.js';
+import { IdentityVerificationDialog, PreviewDialog } from './dialog.js';
 import { isIReport, useBrowserPrint } from './browserPrint.js';
+import { getCurrentInstance } from 'vue';
 
 const PRINT_ORIGIN = "http://127.0.0.1:11111";
 const EDIT_LOCAL_URL = `${PRINT_ORIGIN}/services/print`;
@@ -17,12 +18,15 @@ const testHttpFn = axios.create({
 const httpFn = axios.create({
   withCredentials: false
 });
+const PROTOCOL = window.location.protocol;
 const HOST = window.location.host;
-const PRINTIREPORT = `${HOST}/fdp-api/print/assembly/printIReport`;
+const PRINTIREPORT = `${PROTOCOL}//${HOST}/fdp-api/print/assembly/printIReport`;
 const ERRORMSG = "\u83B7\u53D6\u6587\u4EF6\u5931\u8D25\uFF01";
 class Print {
   constructor() {
     this.dialog = new IdentityVerificationDialog();
+    this.dialogPreview = new PreviewDialog();
+    this.instance = null;
     this.messageHandlerQueue = [];
     var _a;
     const _window = window;
@@ -61,6 +65,9 @@ class Print {
   show(...args) {
     return this.dialog.show(...args);
   }
+  showPreview(...args) {
+    return this.dialogPreview.show(...args);
+  }
   _testConnection() {
     if (this.webview)
       return Promise.resolve(true);
@@ -243,7 +250,10 @@ class Print {
       const data = await this._queryPrintFile(formatId, params);
       if (!data)
         return errorCallbackFn == null ? void 0 : errorCallbackFn(ERRORMSG);
-      useBrowserPrint(data, "preview");
+      const src = useBrowserPrint(data, "preview");
+      if (!this.instance)
+        this.instance = getCurrentInstance();
+      this.showPreview(this.instance, src);
       successCallbackFn == null ? void 0 : successCallbackFn({ file: data });
       return;
     }

package/es/components/button-print/style/index.css

@@ -1 +1 @@
-.dropdown-button{border-color:#d5d5d5!important;color:#212121}.c-dropdown .n-dropdown-menu-wrapper span.active{color:#5585f5}.login-form-button{border-radius:24px;color:#fff;font-size:16px;height:50px;width:100%}.login-form-button-print{padding-top:15px}.login-form-button-print .n-input{border-radius:6px;color:#757575;font-size:14px;height:50px;line-height:50px}.c-button-print-modal .n-form-item-feedback-wrapper{display:none}
+.dropdown-button{border-color:#d5d5d5!important;color:#212121}.c-dropdown .n-dropdown-menu-wrapper span.active{color:#5585f5}.login-form-button{border-radius:24px;color:#fff;font-size:16px;height:50px;width:100%}.login-form-button-print{padding-top:15px}.login-form-button-print .n-input{border-radius:6px;color:#757575;font-size:14px;height:50px;line-height:50px}.c-button-print-modal .n-form-item-feedback-wrapper{display:none}.n-dialog.n-modal.c-button-preview-modal{max-width:none}.n-dialog.n-modal.c-button-preview-modal .n-dialog__content{height:98%}

package/es/components/drag-layout/index.js

@@ -1,7 +1,7 @@
 import { COMPONENT_NAMESPACE } from '../../shared/global/variable.js';
 import { safeComponentRegister } from '../../shared/utils/index.js';
 import '../../shared/utils/utilExpand.js';
-import script from './src/DragLayout.js';
+import script from './src/DragLayout.vue.js';
 
 const DragLayout = script;
 DragLayout.install = function(app) {

package/es/components/drag-layout/src/{DragLayout.js → DragLayout.vue.js}

@@ -1,8 +1,8 @@
 import { defineComponent, ref, reactive, computed, onMounted, nextTick, watch, openBlock, createElementBlock, createCommentVNode, createElementVNode, createVNode, unref, withCtx, renderSlot, createTextVNode, normalizeStyle, normalizeClass, createBlock, Fragment, withDirectives, vShow, vModelCheckbox } from 'vue';
 import { NButton, NModal, NForm, NGrid, NFormItemGi, NInput, NSelect, NCheckbox, NInputNumber } from 'naive-ui';
 import draggableComponent from '../../../shared/components/VueDraggable/src/vuedraggable.js';
-import DragFormLeftItem from './DragFormLeftItem.js';
-import DragFormRightItem from './DragFormRightItem.js';
+import DragFormLeftItem from './DragFormLeftItem.vue.js';
+import DragFormRightItem from './DragFormRightItem.vue.js';
 import XEUtils from 'xe-utils';
 import 'moment';
 import _export_sfc from '../../../_virtual/plugin-vue_export-helper.js';

package/es/components/fabric-chart/index.js

@@ -1,6 +1,6 @@
 import { COMPONENT_NAMESPACE } from '../../shared/global/variable.js';
 import { safeComponentRegister } from '../../shared/utils/index.js';
-import script from './src/FabricChart.js';
+import script from './src/FabricChart.vue.js';
 
 const FabricChart = script;
 FabricChart.install = function(app) {

package/es/components/fabric-chart/src/{FabricChart.js → FabricChart.vue.js}

@@ -9,7 +9,7 @@ import { useCenter } from './hooks/useCenter.js';
 import { useBottom } from './hooks/useBottom.js';
 import { useOther } from './hooks/useOther.js';
 import { useEvent, useCanvasEvent } from './hooks/useEvent.js';
-import PopupTip from './components/PopupTip.js';
+import PopupTip from './components/PopupTip.vue.js';
 import PopupMenu from './components/PopupMenu.js';
 import _export_sfc from '../../../_virtual/plugin-vue_export-helper.js';
 

package/es/components/fabric-chart/src/hooks/useCenter.js

@@ -250,6 +250,7 @@ function useCenter(canvas, propItems, emits, cumputedX, cumputedY, getXValue, ge
     });
   }
   function drawPolyLine(item, dataIndex, scaleValue) {
+    var _a;
     const {
       type,
       riseStyle = {},
@@ -264,7 +265,7 @@ function useCenter(canvas, propItems, emits, cumputedX, cumputedY, getXValue, ge
     const pointList = [];
     const lineList = [];
     const otherList = [];
-    item.list.forEach((v, index) => {
+    (_a = item.list) == null ? void 0 : _a.forEach((v, index) => {
       const _item = type !== "temperature" ? item : dataList.find((_v) => _v.key === v.key);
       const points = getPointer(v, scaleValue);
       const otherObj = {};
@@ -311,7 +312,7 @@ function useCenter(canvas, propItems, emits, cumputedX, cumputedY, getXValue, ge
       };
     }
     function drawOther(points, v, _item, otherObj) {
-      var _a;
+      var _a2;
       if (!(points == null ? void 0 : points.length) || !["temperature", "pain"].includes(type))
         return;
       const { lineAttr = {} } = _item;
@@ -355,7 +356,7 @@ function useCenter(canvas, propItems, emits, cumputedX, cumputedY, getXValue, ge
           ...reduceStyle.line,
           ...defaultStyle
         });
-        reducePoint = drawPoint(((_a = reduceStyle == null ? void 0 : reduceStyle.point) == null ? void 0 : _a.type) || "circle", {
+        reducePoint = drawPoint(((_a2 = reduceStyle == null ? void 0 : reduceStyle.point) == null ? void 0 : _a2.type) || "circle", {
           left: points[0],
           top: reduceY,
           ...reduceStyle.point,
@@ -658,9 +659,7 @@ function useCenter(canvas, propItems, emits, cumputedX, cumputedY, getXValue, ge
   }
   function redrawPoints() {
     var _a;
-    if (!gridPoints.size)
-      return;
-    (_a = canvas.value) == null ? void 0 : _a.remove(...getRemovePoints([...gridPoints]));
+    gridPoints.size && ((_a = canvas.value) == null ? void 0 : _a.remove(...getRemovePoints([...gridPoints])));
     shadowPointCache = [];
     gridPoints.clear();
     maiboPoints.clear();

package/es/components/fabric-chart/src/hooks/useGrid.js

@@ -1,6 +1,6 @@
 import { onMounted, nextTick } from 'vue';
 import { fabric } from '../utils/index.js';
-import { drawLine } from './useDraw.js';
+import { drawLine, defaultBorderStyle } from './useDraw.js';
 
 function useGrid(canvas, propItems) {
   var _a, _b;
@@ -25,10 +25,10 @@ function useGrid(canvas, propItems) {
       style = grid.subSecondLineStyle || {};
     }
     if (i % grid.subXCell === 0) {
-      style = ((_b = grid.mainLineStyle) == null ? void 0 : _b.y) || {};
+      style = i !== 0 && i !== gridXNumber ? ((_b = grid.mainLineStyle) == null ? void 0 : _b.y) || {} : defaultBorderStyle;
     }
     const line = drawLine([x, originY, x, endY], style);
-    if (i % grid.subXCell === 0) {
+    if (i % grid.subXCell === 0 && i !== 0 && i !== gridXNumber) {
       mainList.add(line);
     } else {
       xList.push(line);

package/es/components/fabric-chart/src/interface.d.ts

@@ -40,7 +40,7 @@ export interface IPropItems {
     left: ILeft;
     right: IRight | undefined;
     bottom: any;
-    other: IOther;
+    other?: IOther;
     painIndex: number;
     painHeight: number;
     painOriginY: any;