cnhis-design-vue 3.1.14-beta.4 → 3.1.14-beta.5

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

@@ -1,7 +1,8 @@
 import { defineComponent, reactive, computed, onMounted, onUnmounted, watch, openBlock, createElementBlock, Fragment, createVNode, unref, withCtx, renderSlot, withModifiers, createCommentVNode, createTextVNode, toDisplayString, mergeProps } from 'vue';
+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 { 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';
@@ -123,6 +124,9 @@ var script = /* @__PURE__ */ defineComponent({
     };
     const callLocalServicesErrorCb = (res) => {
       emit("error", res);
+      if (isObject(res) && res.type === "notInstalledApp") {
+        $message.error(res.message);
+      }
     };
     const prevFnError = () => {
       let error = {

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

@@ -0,0 +1 @@
+export * from './print';

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

@@ -0,0 +1 @@
+export { Print } from './print.js';

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

@@ -1,5 +1,5 @@
 import { AnyObject, Func } from '../../../../../es/src/types';
-export default class Print {
+export declare class Print {
     private readonly webview;
     private currentMessageHandler?;
     constructor();

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

@@ -322,4 +322,4 @@ class Print {
   }
 }
 
-export { Print as default };
+export { Print };

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

@@ -14,7 +14,8 @@ declare const FabricChart: SFCWithInstall<import("vue").DefineComponent<{
         data: import("./src/interface").IData;
         addRenderItem?: Function | undefined;
     };
-    emits: (event: "change" | "add", ...args: any[]) => void;
+    emits: (event: "select" | "change" | "add", ...args: any[]) => void;
+    select: import("vue").Ref<any>;
     canvasRef: any;
     canvas: import("vue").Ref<any>;
     dateHeight: import("vue").ComputedRef<number>;
@@ -48,6 +49,7 @@ declare const FabricChart: SFCWithInstall<import("vue").DefineComponent<{
         originY: number;
         endY: number;
     }>;
+    topList: import("vue").ComputedRef<import("./src/interface").IDate[]>;
     propItems: any;
     cumputedX: (value: string | number) => any;
     cumputedY: (type: import("./src/interface").IPointType, scaleValueList: number[], value: string | number) => number;
@@ -180,7 +182,7 @@ declare const FabricChart: SFCWithInstall<import("vue").DefineComponent<{
         show: boolean;
         list: unknown[];
     }>;
-}, unknown, {}, {}, import("vue").ComponentOptionsMixin, import("vue").ComponentOptionsMixin, ("change" | "add")[], "change" | "add", import("vue").VNodeProps & import("vue").AllowedComponentProps & import("vue").ComponentCustomProps, Readonly<import("vue").ExtractPropTypes<{
+}, unknown, {}, {}, import("vue").ComponentOptionsMixin, import("vue").ComponentOptionsMixin, ("select" | "change" | "add")[], "select" | "change" | "add", import("vue").VNodeProps & import("vue").AllowedComponentProps & import("vue").ComponentCustomProps, Readonly<import("vue").ExtractPropTypes<{
     data: {
         type: null;
         required: true;
@@ -191,6 +193,7 @@ declare const FabricChart: SFCWithInstall<import("vue").DefineComponent<{
     };
 }>> & {
     onChange?: ((...args: any[]) => any) | undefined;
+    onSelect?: ((...args: any[]) => any) | undefined;
     onAdd?: ((...args: any[]) => any) | undefined;
 }, {}>>;
 export default FabricChart;

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

@@ -1,4 +1,4 @@
-import { IData } from './interface';
+import { IData, IDate } from './interface';
 declare const _default: import("vue").DefineComponent<{
     data: {
         type: null;
@@ -14,7 +14,8 @@ declare const _default: import("vue").DefineComponent<{
         data: IData;
         addRenderItem?: Function | undefined;
     };
-    emits: (event: "change" | "add", ...args: any[]) => void;
+    emits: (event: "select" | "change" | "add", ...args: any[]) => void;
+    select: import("vue").Ref<any>;
     canvasRef: any;
     canvas: import("vue").Ref<any>;
     dateHeight: import("vue").ComputedRef<number>;
@@ -48,6 +49,7 @@ declare const _default: import("vue").DefineComponent<{
         originY: number;
         endY: number;
     }>;
+    topList: import("vue").ComputedRef<IDate[]>;
     propItems: any;
     cumputedX: (value: string | number) => any;
     cumputedY: (type: import("./interface").IPointType, scaleValueList: number[], value: string | number) => number;
@@ -180,7 +182,7 @@ declare const _default: import("vue").DefineComponent<{
         show: boolean;
         list: unknown[];
     }>;
-}, unknown, {}, {}, import("vue").ComponentOptionsMixin, import("vue").ComponentOptionsMixin, ("change" | "add")[], "change" | "add", import("vue").VNodeProps & import("vue").AllowedComponentProps & import("vue").ComponentCustomProps, Readonly<import("vue").ExtractPropTypes<{
+}, unknown, {}, {}, import("vue").ComponentOptionsMixin, import("vue").ComponentOptionsMixin, ("select" | "change" | "add")[], "select" | "change" | "add", import("vue").VNodeProps & import("vue").AllowedComponentProps & import("vue").ComponentCustomProps, Readonly<import("vue").ExtractPropTypes<{
     data: {
         type: null;
         required: true;
@@ -191,6 +193,7 @@ declare const _default: import("vue").DefineComponent<{
     };
 }>> & {
     onChange?: ((...args: any[]) => any) | undefined;
+    onSelect?: ((...args: any[]) => any) | undefined;
     onAdd?: ((...args: any[]) => any) | undefined;
 }, {}>;
 export default _default;

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

@@ -9,7 +9,7 @@ import { useLeft } from './hooks/useLeft.js';
 import { useRight } from './hooks/useRight.js';
 import { useBottom } from './hooks/useBottom.js';
 import { useOther } from './hooks/useOther.js';
-import { useEvent } from './hooks/useEvent.js';
+import { useEvent, useCanvasEvent } from './hooks/useEvent.js';
 import script$1 from './components/PopupTip.vue_vue_type_script_setup_true_lang.js';
 import { useCumputedPoint } from './hooks/useCumputedPoint.js';
 
@@ -19,10 +19,11 @@ var script = /* @__PURE__ */ defineComponent({
     data: { type: null, required: true },
     addRenderItem: { type: Function, required: false }
   },
-  emits: ["change", "add"],
-  setup(__props, { emit: emits }) {
+  emits: ["change", "add", "select"],
+  setup(__props, { expose, emit: emits }) {
     const props = __props;
     const defaultHeight = 15;
+    let select = ref();
     const canvasRef = ref(null);
     let canvas = ref();
     const dateHeight = computed(() => {
@@ -200,14 +201,29 @@ var script = /* @__PURE__ */ defineComponent({
       }
       return obj;
     });
+    const topList = computed(() => {
+      const { top } = props.data;
+      let topList2 = [];
+      for (let i in top) {
+        if (top[i].show) {
+          topList2.push({
+            ...top[i],
+            key: i
+          });
+        }
+      }
+      return topList2.sort((a, b) => a.seq - b.seq);
+    });
     const propItems = reactive({
       canvasWidth: props.data.width,
       canvasHeight: props.data.height,
       borderStyle: props.data.borderStyle || defaultBorderStyle,
+      selectionStyle: props.data.selectionStyle || {},
       dateHeight: dateHeight.value,
       hospitalDaysHeight: hospitalDaysHeight.value,
       operationDaysHeight: operationDaysHeight.value,
       xScalevalueHeight: xScalevalueHeight.value,
+      topList: topList.value,
       breathingHeight: breathingHeight.value,
       grid: props.data.grid,
       top: props.data.top,
@@ -253,11 +269,16 @@ var script = /* @__PURE__ */ defineComponent({
         fireRightClick: true
       });
       useEvent(canvasRef.value);
+      const { select: selectFunc } = useCanvasEvent(canvas, propItems, emits);
+      select.value = selectFunc;
     });
     onBeforeUnmount(() => {
       canvas.value.clear();
       canvas.value = null;
     });
+    expose({
+      select
+    });
     return (_ctx, _cache) => {
       return openBlock(), createElementBlock(Fragment, null, [
         createElementVNode("canvas", {

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

@@ -1,4 +1,4 @@
-export { defaultBorderStyle } from './useDraw';
+export * from './useDraw';
 export * from './useCumputedPoint';
 export * from './useTop';
 export * from './useLeft';

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

@@ -1,4 +1,4 @@
-export { defaultBorderStyle } from './useDraw.js';
+export { defaultBorderStyle, defaultLineStyle, defaultRectStyle, defaultStyle, defaultTextStyle, drawLine, drawPoint, drawTextGroup } from './useDraw.js';
 export { useCumputedPoint } from './useCumputedPoint.js';
 export { useTop } from './useTop.js';
 export { useLeft } from './useLeft.js';
@@ -6,4 +6,4 @@ export { useRight } from './useRight.js';
 export { useCenter } from './useCenter.js';
 export { useBottom } from './useBottom.js';
 export { useOther } from './useOther.js';
-export { useEvent } from './useEvent.js';
+export { useCanvasEvent, useEvent } from './useEvent.js';

package/es/packages/fabric-chart/src/hooks/useEvent.d.ts

@@ -1 +1,7 @@
+import { Ref } from 'vue';
+import { fabric } from '../utils';
+import { IPropItems } from '../interface';
 export declare function useEvent(element: HTMLCanvasElement | any): void;
+export declare function useCanvasEvent(canvas: Ref<fabric.Canvas>, propItems: IPropItems, emits: any): {
+    select: (key: string) => void;
+};

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

@@ -1,4 +1,5 @@
 import { useEventListener } from '@vueuse/core';
+import { fabric } from '../utils/index.js';
 
 function useEvent(element) {
   useEventListener(element.nextSibling, "contextmenu", (e) => {
@@ -6,5 +7,69 @@ function useEvent(element) {
     return false;
   });
 }
+function useCanvasEvent(canvas, propItems, emits) {
+  const { originY, originX, endX, endY, iconsWidth, selectionStyle, topList } = propItems;
+  function drawRect(options, key) {
+    const { left, top, width, height } = options;
+    const rect = new fabric.Rect({
+      key,
+      left: left != null ? left : 0,
+      top: top != null ? top : 0,
+      width,
+      height,
+      stroke: "transparent",
+      strokeWidth: 1,
+      fill: "transparent",
+      lockMovementX: true,
+      lockMovementY: true,
+      transparentCorners: false,
+      ...selectionStyle
+    });
+    canvas.value.add(rect);
+    rect.on("mousedown", () => {
+      emits("select", key);
+    });
+    return rect;
+  }
+  function initSelection() {
+    if (typeof (selectionStyle == null ? void 0 : selectionStyle.evented) === "boolean" && !(selectionStyle == null ? void 0 : selectionStyle.evented))
+      return;
+    const selections2 = [];
+    selections2.push(drawRect({
+      left: iconsWidth,
+      top: originY,
+      width: originX - iconsWidth,
+      height: endY
+    }, "left"));
+    let topY = 0;
+    topList.forEach((item, index) => {
+      if (index > 0) {
+        topY += propItems[`${topList[index - 1].key}Height`];
+      }
+      selections2.push(drawRect({
+        left: iconsWidth,
+        top: topY,
+        width: endX - iconsWidth,
+        height: propItems[`${item.key}Height`]
+      }, item.key));
+    });
+    selections2.push(drawRect({
+      left: originX,
+      top: originY,
+      width: endX - originX,
+      height: endY - originY
+    }, "grid"));
+    canvas.value.renderAll();
+    return selections2;
+  }
+  const selections = initSelection();
+  function select(key) {
+    canvas.value.discardActiveObject();
+    const obj = selections == null ? void 0 : selections.find((obj2) => obj2.key === key);
+    obj && obj.bringToFront();
+    obj && canvas.value.setActiveObject(obj);
+  }
+  return { select };
+}
 
-export { useEvent };
+export { useCanvasEvent, useEvent };

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

@@ -14,21 +14,12 @@ function useTop(canvas, propItems) {
     hospitalDaysHeight,
     operationDaysHeight,
     xScalevalueHeight,
-    iconsWidth
+    iconsWidth,
+    topList
   } = propItems;
   function drawTop() {
     let list = [];
     let topY = 0;
-    let topList = [];
-    for (let i in top) {
-      if (top[i].show) {
-        topList.push({
-          ...top[i],
-          key: i
-        });
-      }
-    }
-    topList.sort((a, b) => a.seq - b.seq);
     topList.forEach((item, index) => {
       if (index > 0) {
         topY += propItems[`${topList[index - 1].key}Height`];

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

@@ -23,10 +23,12 @@ export interface IPropItems {
     canvasWidth: number;
     canvasHeight: number;
     borderStyle: fabric.ILineOptions;
+    selectionStyle: any;
     dateHeight: number;
     hospitalDaysHeight: number;
     operationDaysHeight: number;
     xScalevalueHeight: number;
+    topList: IDate[];
     breathingHeight: number;
     grid: IGrid;
     top: ITop;
@@ -96,6 +98,7 @@ export interface IData {
     width: number;
     height: number;
     borderStyle?: fabric.ILineOptions;
+    selectionStyle?: any;
     grid: IGrid;
     other?: IOther;
     top: ITop;

package/es/packages/form-render/src/hooks/useFieldListAdaptor.js

@@ -1,7 +1,7 @@
 import { isObject } from '@vueuse/core';
 import { isArray, pick } from 'lodash-es';
 import { useFormValidator, useTypeNormalize } from '../../../../packages/form-render';
-import { createLinebarId, arrayed, transformDateFormat } from '../utils/index.js';
+import { fieldKeyEscape, createLinebarId, arrayed, transformDateFormat } from '../utils/index.js';
 
 function useFieldListAdaptor(collector, uuid) {
   const { createValidatorSchema } = useFormValidator();
@@ -174,13 +174,15 @@ function useFieldListAdaptor(collector, uuid) {
     return creator(item);
   };
   const createWidgetCombinationSchema = (item) => {
+    if (!item.suffixConfig)
+      return createWidgetSchema(item);
     const suffixList = arrayed(item.suffixConfig);
     const fieldList = [{ ...item, suffixConfig: void 0 }].concat(suffixList.map((suffix) => {
       return { ...suffix, is_show: item.is_show, alias: " " };
     }));
     return {
       type: "void",
-      name: fieldList.map((f) => f.val_key).join("-"),
+      name: fieldKeyEscape(fieldList),
       title: item.alias || item.name,
       "x-component": "INPUT_GROUP",
       "x-component-props": { span: item.elem_width },
@@ -212,7 +214,7 @@ function useFieldListAdaptor(collector, uuid) {
     }
     function createFieldName(fieldItem) {
       if (isArray(fieldItem.suffixConfig)) {
-        return [fieldItem.val_key, fieldItem.suffixConfig.map((f) => f.val_key)].join("-");
+        return fieldKeyEscape([fieldItem, ...fieldItem.suffixConfig]);
       }
       return fieldItem.val_key;
     }

package/es/packages/form-render/src/types/fieldItem.d.ts

@@ -69,6 +69,7 @@ export declare type FieldItem = {
         nameKey: string;
         valueKey: string;
     }>;
+    suffixConfig: FieldItem[];
     fieldType: 'string' | 'object' | 'array' | 'number' | 'void' | 'boolean' | 'datetime';
     content: string | FormRenderer | Record<string, FormRenderer>;
     properties: FieldItem[];

package/es/packages/form-render/src/utils/index.d.ts

@@ -27,3 +27,4 @@ export declare function queryInput(decoratorElement?: HTMLElement | null): {
 };
 export declare function getParentLinebar(key: string, fieldList: FieldItem[]): string | null;
 export declare function createLinebarId(id: string): string;
+export declare function fieldKeyEscape(fieldList: FieldItem[]): string;

package/es/packages/form-render/src/utils/index.js

@@ -139,5 +139,8 @@ function getParentLinebar(key, fieldList) {
 function createLinebarId(id) {
   return `id-${id}`;
 }
+function fieldKeyEscape(fieldList) {
+  return fieldList.map((f) => f.val_key).join("-").replace(/[.]/g, "_");
+}
 
-export { arrayed, assignUpdateValue, createLinebarId, createSlot, formRenderLog, generateUrlParams, getParentLinebar, injectOrProvide, isIdCard, isMobile, parseBirthday, parseIdCard, queryDecorator, queryInput, transformDateFormat, traverseSchema, uuidGenerator };
+export { arrayed, assignUpdateValue, createLinebarId, createSlot, fieldKeyEscape, formRenderLog, generateUrlParams, getParentLinebar, injectOrProvide, isIdCard, isMobile, parseBirthday, parseIdCard, queryDecorator, queryInput, transformDateFormat, traverseSchema, uuidGenerator };

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "cnhis-design-vue",
   "private": false,
-  "version": "3.1.14-beta.4",
+  "version": "3.1.14-beta.5",
   "license": "ISC",
   "module": "es/packages/index.js",
   "main": "es/packages/index.js",