cnhis-design-vue 3.1.13-beta.3 → 3.1.13-beta.6

package/es/packages/big-table/src/BigTable.vue.d.ts

@@ -1080,7 +1080,9 @@ declare const _default: import("vue").DefineComponent<{
                 textColorSuccess: string;
                 textColorHoverSuccess: string;
                 textColorPressedSuccess: string;
-                textColorFocusSuccess: string;
+                textColorFocusSuccess: string; /**
+                 * 删除选中scan数据
+                 */
                 textColorDisabledSuccess: string;
                 textColorTextSuccess: string;
                 textColorTextHoverSuccess: string;
@@ -1098,7 +1100,12 @@ declare const _default: import("vue").DefineComponent<{
                 borderFocusSuccess: string;
                 borderDisabledSuccess: string;
                 rippleColorSuccess: string;
-                colorWarning: string;
+                colorWarning: string; /**
+                 * 判断是否渲染EditForm
+                 * @param {*} row
+                 * @param {*} column
+                 * @returns
+                 */
                 colorHoverWarning: string;
                 colorPressedWarning: string;
                 colorFocusWarning: string;
@@ -1173,10 +1180,7 @@ declare const _default: import("vue").DefineComponent<{
             }, any>>;
             readonly themeOverrides: import("vue").PropType<import("naive-ui/es/_mixins/use-theme").ExtractThemeOverrides<import("naive-ui/es/_mixins").Theme<"Button", {
                 heightTiny: string;
-                heightSmall: string; /**
-                 * 单个form提交失败
-                 * @param {*} obj
-                 */
+                heightSmall: string;
                 heightMedium: string;
                 heightLarge: string;
                 borderRadiusTiny: string;
@@ -1195,6 +1199,10 @@ declare const _default: import("vue").DefineComponent<{
                 colorSecondaryHover: string;
                 colorSecondaryPressed: string;
                 colorTertiary: string;
+                /**
+                 * 避免每次点击都查询
+                 * 初始化查一次 行编辑 表单search用
+                 */
                 colorTertiaryHover: string;
                 colorTertiaryPressed: string;
                 colorQuaternary: string;
@@ -1297,7 +1305,7 @@ declare const _default: import("vue").DefineComponent<{
                 textColorGhostSuccess: string;
                 textColorGhostHoverSuccess: string;
                 textColorGhostPressedSuccess: string;
-                textColorGhostFocusSuccess: string;
+                textColorGhostFocusSuccess: string; /** string */
                 textColorGhostDisabledSuccess: string;
                 borderSuccess: string;
                 borderHoverSuccess: string;

package/es/packages/big-table/src/BigTable.vue_vue_type_script_setup_true_lang.js

@@ -423,9 +423,16 @@ var script = /* @__PURE__ */ defineComponent({
         };
       }
       const currentColumns = fieldList.map((item, index) => {
-        var _a2, _b2, _c, _d;
-        let filterField = ((_b2 = (_a2 = item == null ? void 0 : item.fieldSetting) == null ? void 0 : _a2.mapping) == null ? void 0 : _b2.type) === "manual" && item.isMerge != 1;
-        let notParticipatingSort = ((_c = item == null ? void 0 : item.fieldSetting) == null ? void 0 : _c.notParticipatingSort) || "";
+        var _a2, _b2, _c, _d, _e;
+        let filterField = false;
+        let filterItems = [];
+        try {
+          const fieldSetting = JSON.parse(item.fieldSetting);
+          filterField = ((_a2 = fieldSetting == null ? void 0 : fieldSetting.mapping) == null ? void 0 : _a2.type) === "manual" && item.isMerge != 1;
+          filterItems = (_c = (_b2 = fieldSetting == null ? void 0 : fieldSetting.mapping) == null ? void 0 : _b2.mappingFiled) == null ? void 0 : _c.map((item2) => item2.value[0]);
+        } catch (e) {
+        }
+        let notParticipatingSort = ((_d = item == null ? void 0 : item.fieldSetting) == null ? void 0 : _d.notParticipatingSort) || "";
         let fixed = isAboutNestTable.value ? "" : item.isFixed ? item.isFixed == 1 ? "left" : "right" : "";
         let sortable = props.isNestTable ? false : !filterField && item.isSort == 1 && notParticipatingSort != 1 && item.isMerge != 1;
         let treeNode = props.isNestTable ? false : state.isTree != 0 ? index === 0 : false;
@@ -475,7 +482,10 @@ var script = /* @__PURE__ */ defineComponent({
           editRender: isEdit ? {} : generateEditRender(item)
         });
         if (filterField && !props.isNestTable && !isScanMultiTable2) {
-          state.filterFields[item.columnName] = Object.assign({}, vexutils.clone(item, true), {
+          state.filterFields[item.columnName] = Object.assign({}, vexutils.clone({
+            ...item,
+            setting: item.settingObj
+          }, true), {
             visible: false,
             left: "initial",
             right: "initial",
@@ -484,7 +494,8 @@ var script = /* @__PURE__ */ defineComponent({
             checkAll: false,
             searchFilterText: "",
             searchFilterCONVERT: [],
-            filterSort: ""
+            filterSort: "",
+            filterItems
           });
           let field = state.filterFields[item.columnName];
           handlerInitSearchItem([field]);
@@ -495,7 +506,7 @@ var script = /* @__PURE__ */ defineComponent({
         if (!isScanMultiTable2) {
           col.slots.footer = "tooltip_footer";
         }
-        if (props.showNestTable && state.isTree == 0 && ((_d = props.curNestColumnConfig) == null ? void 0 : _d.isTree) == 0) {
+        if (props.showNestTable && state.isTree == 0 && ((_e = props.curNestColumnConfig) == null ? void 0 : _e.isTree) == 0) {
           col.slots.content = "nest_table_content";
         }
         return col;
@@ -734,7 +745,7 @@ var script = /* @__PURE__ */ defineComponent({
             "class": "filter-header-icon vxe-filter--btn vxe-icon--funnel"
           }, null), createVNode("span", {
             "class": "filter-header-text"
-          }, [createTextVNode("\u7B5B\u9009")])]), field.setting.showSetting.length > 5 ? createVNode("div", {
+          }, [createTextVNode("\u7B5B\u9009")])]), field.filterItems.length > 5 ? createVNode("div", {
             "class": "checkbox-wrap checkbox-wrap--search"
           }, [createVNode("div", {
             "class": "check-search-wrap"
@@ -763,10 +774,10 @@ var script = /* @__PURE__ */ defineComponent({
           }, {
             default: () => [createVNode(NSpace, {
               "item-style": "display: flex;"
-            }, _isSlot(_slot = field.setting.showSetting.map((item2) => {
+            }, _isSlot(_slot = field.filterItems.map((item2) => {
               return createVNode(NCheckbox, {
                 "value": item2.value,
-                "label": item2.label
+                "label": item2.key
               }, null);
             })) ? _slot : {
               default: () => [_slot]
@@ -777,15 +788,15 @@ var script = /* @__PURE__ */ defineComponent({
           }, {
             default: () => [createVNode(NSpace, {
               "item-style": "display: flex;"
-            }, _isSlot(_slot2 = field.setting.showSetting.filter((item2) => {
+            }, _isSlot(_slot2 = field.filterItems.filter((item2) => {
               if (!field.searchFilterText)
                 return item2;
               let reg = new RegExp(field.searchFilterText);
-              return reg.test(item2.label);
+              return reg.test(item2.key);
             }).map((item2) => {
               return createVNode(NCheckbox, {
                 "value": item2.value,
-                "label": item2.label
+                "label": item2.key
               }, null);
             })) ? _slot2 : {
               default: () => [_slot2]
@@ -835,12 +846,12 @@ var script = /* @__PURE__ */ defineComponent({
     const handleFilterSeach = (val, field) => {
       field.searchFilterText = val;
       if (val === "") {
-        field.checkAll = field.CONVERT.length === field.setting.showSetting.length;
-        field.indeterminate = !!field.CONVERT.length && field.CONVERT.length !== field.setting.showSetting.length;
+        field.checkAll = field.CONVERT.length === field.filterItems.length;
+        field.indeterminate = !!field.CONVERT.length && field.CONVERT.length !== field.filterItems.length;
         return;
       }
-      field.searchFilterCONVERT = field.setting.showSetting.filter((item) => {
-        return field.searchFilterText === item.label && field.CONVERT.includes(item.value);
+      field.searchFilterCONVERT = field.filterItems.filter((item) => {
+        return field.searchFilterText === item.key && field.CONVERT.includes(item.value);
       }).map((item) => item.value);
       _beforeSearchConvert = field.searchFilterCONVERT;
     };
@@ -849,15 +860,15 @@ var script = /* @__PURE__ */ defineComponent({
       let checked = val;
       field.indeterminate = false;
       field.checkAll = checked;
-      state.filterFields[field.columnName].CONVERT = checked ? field.setting.showSetting.map((item) => {
+      state.filterFields[field.columnName].CONVERT = checked ? field.filterItems.map((item) => {
         return item.value;
       }) : [];
     };
     const handleFilterChange = (value, name, field) => {
       reScrollFilterWrap();
       state.filterFields[name].CONVERT = value;
-      field.checkAll = value.length === field.setting.showSetting.length;
-      field.indeterminate = !!value.length && value.length !== field.setting.showSetting.length;
+      field.checkAll = value.length === field.filterItems.length;
+      field.indeterminate = !!value.length && value.length !== field.filterItems.length;
     };
     const handleFilterSearchChange = (value, columnName, field) => {
       reScrollFilterWrap();

package/es/packages/big-table/src/utils.js

@@ -207,6 +207,7 @@ const handlerInitSearchItem = (arr) => {
   if (!Array.isArray(arr))
     return;
   arr.forEach((el) => {
+    var _a;
     if (el.setting) {
       el.setting = typeof el.setting == "string" ? JSON.parse(el.setting) : el.setting;
       if (!vexutils.isEmpty(el.setting.wordbook)) {
@@ -224,7 +225,7 @@ const handlerInitSearchItem = (arr) => {
         return;
       }
     }
-    if (el.fieldType.includes("DATE")) {
+    if ((_a = el.fieldType) == null ? void 0 : _a.includes("DATE")) {
       if (el.settingObj && el.settingObj.attr == "BIRTHDAY") {
         el["con"] = "BIRTHDAY";
         el["showDate"] = false;

package/es/packages/big-table/style/index.css

@@ -249,6 +249,11 @@ body > .vxe-table--tooltip-wrapper {
   height: 100%;
   line-height: unset;
   width: 100%;
+  display: inline-flex;
+}
+.custom-big-table .vxe-table .vxe-table--header .col--seq .vxe-cell--title,
+.custom-big-table .vxe-table .vxe-table--header .col--checkbox .vxe-cell--title {
+  display: inline-block;
 }
 .custom-big-table .vxe-table .vxe-table--footer-wrapper.body--wrapper::-webkit-scrollbar,
 .custom-big-table .vxe-table .vxe-table--body-wrapper::-webkit-scrollbar {

package/es/packages/bpmn-workflow/src/BpmnWorkflow.d.ts

@@ -0,0 +1,5 @@
+declare module '*.vue' {
+	import type { DefineComponent } from 'vue';
+	const component: DefineComponent<{}, {}, any>;
+	export { component };
+}

package/es/packages/bpmn-workflow/types/BpmnViewer.d.ts

@@ -0,0 +1 @@
+declare module 'bpmn-js/lib/Viewer';

package/es/packages/bpmn-workflow/types/ModelingModule.d.ts

@@ -0,0 +1 @@
+declare module 'bpmn-js/lib/features/modeling';

package/es/packages/bpmn-workflow/types/MoveCanvasModule.d.ts

@@ -0,0 +1 @@
+declare module 'diagram-js/lib/navigation/movecanvas';

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

@@ -1,6 +1,6 @@
 import { reactive, onMounted, nextTick } from 'vue';
 import { fabric } from '../utils/index.js';
-import { defaultStyle, drawLine, drawPoint, defaultTextStyle } from './useDraw.js';
+import { defaultStyle, drawPoint, drawLine, defaultTextStyle } from './useDraw.js';
 import useGrid from './useGrid.js';
 import { useShadow } from './useShadow.js';
 import { TEMPERATURE_MENU, PAIN_MENU } from './constant.js';
@@ -36,6 +36,8 @@ function useCenter(canvas, propItems, emits, cumputedX, cumputedY, getXValue, ge
     target: null
   });
   const shadowLinesCache = /* @__PURE__ */ new Set();
+  const maiboPoints = /* @__PURE__ */ new Set();
+  const otherPoints = /* @__PURE__ */ new Set();
   onMounted(() => {
     nextTick(() => {
       init();
@@ -43,11 +45,14 @@ function useCenter(canvas, propItems, emits, cumputedX, cumputedY, getXValue, ge
   });
   function init() {
     drawShaDow();
+    maiboPoints.clear();
+    otherPoints.clear();
     left.yScaleValue.forEach((scaleValue) => {
       scaleValue.dataList.forEach((item, dataIndex) => {
         drawPolyLine(item, dataIndex, scaleValue);
       });
     });
+    drawOverlapPoint();
     setCanvasEvent();
   }
   function drawShaDow(target) {
@@ -145,6 +150,7 @@ function useCenter(canvas, propItems, emits, cumputedX, cumputedY, getXValue, ge
           pointMenuProps.point = { x, y };
           pointMenuProps.show = true;
           const { type } = ((_a = event.target) == null ? void 0 : _a.origin) || {};
+          console.log(999, type);
           if (event.target && (type === "temperature" || type === "pain")) {
             if (type === "temperature") {
               pointMenuProps.list = [...TEMPERATURE_MENU];
@@ -181,13 +187,57 @@ function useCenter(canvas, propItems, emits, cumputedX, cumputedY, getXValue, ge
   }
   function getEqualXTypes(pointX) {
     const types = [];
+    const left2 = cumputedX(getXValue(pointX));
     canvas.value.forEachObject((obj) => {
-      if (obj.origin && cumputedX(getXValue(pointX)) === obj.left) {
+      if (obj.origin && left2 === obj.left) {
         types.push(obj.origin.type);
       }
     });
     return [...new Set(types)];
   }
+  function drawOverlapPoint() {
+    var _a;
+    const pulseObj = left.yScaleValue.find((item) => item.type === "pulse");
+    if (!pulseObj || !((_a = pulseObj.dataList) == null ? void 0 : _a.length))
+      return;
+    if (!pulseObj.dataList.some((item) => item.title.includes("\u8109\u640F")))
+      return;
+    const overlap = left.overlap || {};
+    const points = [];
+    maiboPoints.size && [...maiboPoints].forEach((item) => {
+      [...otherPoints].forEach((obj) => {
+        if (obj.origin && item.left === obj.left && item.top === obj.top) {
+          const key = obj.origin.key;
+          if (key) {
+            const pointer = {
+              left: obj.left,
+              top: obj.top,
+              ...defaultStyle,
+              hoverCursor: "default"
+            };
+            let type = "koumai";
+            if (key === "yemai") {
+              type = key;
+            }
+            if (key === "humai") {
+              type = "circle";
+            }
+            points.push(drawPoint(type, {
+              ...overlap[key] || {},
+              ...pointer
+            }));
+          }
+        }
+      });
+    });
+    setTimeout(() => {
+      canvas.value.add(...points);
+      points.forEach((v) => {
+        v == null ? void 0 : v.bringToFront();
+      });
+      canvas.value.renderAll();
+    });
+  }
   function drawPolyLine(item, dataIndex, scaleValue) {
     const {
       pointAttr = {},
@@ -290,6 +340,7 @@ function useCenter(canvas, propItems, emits, cumputedX, cumputedY, getXValue, ge
         origin: {
           data: v,
           title: item.title,
+          key: item.key || "",
           unit: scaleValue.unit,
           type: scaleValue.type,
           dataIndex,
@@ -323,6 +374,11 @@ function useCenter(canvas, propItems, emits, cumputedX, cumputedY, getXValue, ge
       }
       lineList.push(line);
       if (point) {
+        if (item.title.includes("\u8109\u640F")) {
+          maiboPoints.add(point);
+        } else {
+          otherPoints.add(point);
+        }
         setPointEvent(point);
         pointList.push(point);
       }

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

@@ -39,4 +39,4 @@ export declare const defaultTextStyle: {
 };
 export declare function drawLine(points: number[], style: Partial<ILineOptions>): fabric.Line;
 export declare function drawTextGroup(rectStyle: Partial<fabric.IRectOptions>, fontStyle: Partial<ITextOptions>, groupStyle: Partial<fabric.IGroupOptions>): fabric.Group;
-export declare function drawPoint(type: string | undefined, style: any): fabric.Circle | fabric.Triangle;
+export declare function drawPoint(type: string | undefined, style: any): fabric.Object;

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

@@ -57,7 +57,6 @@ function drawTextGroup(rectStyle, fontStyle, groupStyle) {
   });
 }
 function drawPoint(type = "circle", style) {
-  let point = null;
   const newStyle = {
     originX: "center",
     originY: "center",
@@ -65,27 +64,81 @@ function drawPoint(type = "circle", style) {
     hasBorders: false,
     ...style
   };
+  const createCircleBorder = () => {
+    return new fabric.Circle({
+      objectCaching: false,
+      strokeWidth: style.strokeWidth || 1,
+      stroke: style.stroke || "red",
+      radius: style.radius || 5,
+      fill: "#fff"
+    });
+  };
   switch (type) {
     case "triangle":
-      point = new fabric.Triangle({
+      return new fabric.Triangle({
         width: 20,
         height: 20,
         strokeWidth: 1,
         scale: 1,
         ...newStyle
       });
-      break;
     case "circle":
-      point = new fabric.Circle({
+      return new fabric.Circle({
         objectCaching: false,
         strokeWidth: 1,
         radius: 5,
         scale: 1,
         ...newStyle
       });
-      break;
+    case "image":
+      if (style == null ? void 0 : style.url) ; else {
+        return new fabric.Image(style.element, {
+          ...newStyle,
+          scale: 1
+        });
+      }
+    case "yemai":
+      const createAdd = () => {
+        const width = ((style.radius || 5) + (style.strokeWidth || 1)) * 2;
+        const subLineStyle = {
+          stroke: style.strokeX || "blue",
+          strokeWidth: style.strokeWidthX || 1,
+          originX: "center",
+          originY: "center"
+        };
+        const line1 = new fabric.Line([0, width / 2, width, width / 2], subLineStyle);
+        const line2 = new fabric.Line([width / 2, 0, width / 2, width], subLineStyle);
+        return new fabric.Group([line1, line2]);
+      };
+      return new fabric.Group([createCircleBorder(), createAdd()], {
+        scale: 1,
+        ...newStyle
+      });
+    case "koumai":
+      const left = (style.radius || 5) + (style.strokeWidth || 1);
+      const circle = new fabric.Circle({
+        objectCaching: false,
+        radius: style.radiusCircle || 2,
+        fill: style.fillCircle || "#000",
+        originX: "center",
+        originY: "center",
+        left,
+        top: left
+      });
+      return new fabric.Group([createCircleBorder(), circle], {
+        scale: 1,
+        ...newStyle
+      });
+    default:
+      style && Reflect.deleteProperty(style, "stroke");
+      return new fabric.Text(String(type), {
+        fontFamily: "\u5FAE\u8F6F\u96C5\u9ED1",
+        scale: 1,
+        fontSize: 14,
+        fill: "#000",
+        ...newStyle
+      });
   }
-  return point;
 }
 
 export { defaultBorderStyle, defaultLineStyle, defaultRectStyle, defaultStyle, defaultTextStyle, drawLine, drawPoint, drawTextGroup };

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

@@ -9,13 +9,14 @@ function useOther(canvas, propItems, cumputedX) {
       return false;
     const list = [];
     other.list.forEach((v, i) => {
+      var _a;
       const text = new fabric.Text(String(v.value.toString().split("").join("\n")), {
         originX: "center",
-        top: vitalSignsOriginY.originY,
+        top: (((_a = v.style) == null ? void 0 : _a.baseTop) || 0) + vitalSignsOriginY.originY,
         left: cumputedX(v.time),
         textAlign: "center",
         ...defaultStyle,
-        ...other.style || {}
+        ...v.style || {}
       });
       list.push(text);
     });

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

@@ -80,6 +80,7 @@ export interface ITop {
     operationDays?: IDate;
 }
 interface ILeft {
+    overlap?: any;
     spaceGridNumber?: number;
     yScaleValue: Array<any>;
     icons?: any;