cnhis-design-vue 3.1.15-beta.0 → 3.1.15-beta.1

package/es/packages/big-table/src/components/edit-form/edit-separate.js

@@ -1,4 +1,4 @@
-import { defineComponent, ref, openBlock, createBlock, unref, withCtx, createVNode, withModifiers } from 'vue';
+import { defineComponent, ref, watch, openBlock, createBlock, unref, withCtx, createVNode, withModifiers } from 'vue';
 import SlotRender from '../../../../../src/components/SlotRender';
 import { cloneDeep, isObject, isArray } from 'lodash-es';
 import { NPopover, NInput } from 'naive-ui';
@@ -17,13 +17,15 @@ const _sfc_main = /* @__PURE__ */ defineComponent({
   setup(__props, { emit }) {
     const props = __props;
     const popoverRef = ref();
+    const show = ref(false);
+    watch(show, updateShow);
     const editContent = ref();
     const { getRowData } = useSeparateMap();
-    function updateShow(show) {
+    function updateShow(show2) {
       const target = getRowData(props.row);
       if (!target)
         return;
-      if (show) {
+      if (show2) {
         editContent.value = cloneDeep(target.row[props.col.field]);
         return;
       }
@@ -52,14 +54,14 @@ const _sfc_main = /* @__PURE__ */ defineComponent({
       return openBlock(), createBlock(unref(NPopover), {
         ref_key: "popoverRef",
         ref: popoverRef,
-        trigger: "click",
-        "show-arrow": false,
-        "onUpdate:show": updateShow
+        trigger: "manual",
+        show: show.value,
+        "onUpdate:show": _cache[3] || (_cache[3] = ($event) => show.value = $event),
+        "show-arrow": false
       }, {
         trigger: withCtx(() => [
           createVNode(Separate, {
-            onClick: _cache[0] || (_cache[0] = withModifiers(() => {
-            }, ["stop"])),
+            onClick: _cache[0] || (_cache[0] = withModifiers(($event) => show.value = !show.value, ["stop"])),
             style,
             col: __props.col,
             row: __props.row
@@ -81,7 +83,7 @@ const _sfc_main = /* @__PURE__ */ defineComponent({
           }, null, 8, ["value"]))
         ]),
         _: 1
-      }, 512);
+      }, 8, ["show"]);
     };
   }
 });

package/es/packages/big-table/src/components/edit-form/edit-separate.vue.d.ts

@@ -31,6 +31,7 @@ declare const _default: import("vue").DefineComponent<{
         onFormChange?: ((...args: any[]) => any) | undefined;
     }>>;
     popoverRef: import("vue").Ref<any>;
+    show: import("vue").Ref<boolean>;
     emit: (event: "formChange", ...args: any[]) => void;
     editContent: import("vue").Ref<any>;
     getRowData: (row: AnyObject) => {

package/es/packages/big-table/src/hooks/useEdit.d.ts

@@ -223,6 +223,7 @@ export declare const comps: {
             onFormChange?: ((...args: any[]) => any) | undefined;
         }>>;
         popoverRef: import("vue").Ref<any>;
+        show: import("vue").Ref<boolean>;
         emit: (event: "formChange", ...args: any[]) => void;
         editContent: import("vue").Ref<any>;
         getRowData: (row: import("../../../../src/types").AnyObject) => {

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

@@ -8,6 +8,18 @@ import { TEMPERATURE_MENU, PAIN_MENU } from './constant.js';
 function isEffectiveNode(node) {
   return (node == null ? void 0 : node.time) && ((node == null ? void 0 : node.value) || (node == null ? void 0 : node.value) === 0);
 }
+function getPointArr(arr) {
+  let _arr = [];
+  return arr.reduce((pre, cur, index) => {
+    var _a, _b;
+    _arr.push([cur.left, cur.top]);
+    if (((_b = (_a = cur.origin) == null ? void 0 : _a.data) == null ? void 0 : _b.breakpoint) || arr.length - 1 === index) {
+      pre.push(_arr);
+      _arr = [];
+    }
+    return pre;
+  }, []);
+}
 function useCenter(canvas, propItems, emits, cumputedX, cumputedY, getXValue, getYValue, addRenderItem) {
   useGrid(canvas, propItems);
   const {
@@ -36,6 +48,7 @@ function useCenter(canvas, propItems, emits, cumputedX, cumputedY, getXValue, ge
     target: null
   });
   const shadowLinesCache = /* @__PURE__ */ new Set();
+  let shadowPointCache = [];
   const maiboPoints = /* @__PURE__ */ new Set();
   const otherPoints = /* @__PURE__ */ new Set();
   const prevLines = /* @__PURE__ */ new Set();
@@ -45,7 +58,7 @@ function useCenter(canvas, propItems, emits, cumputedX, cumputedY, getXValue, ge
     });
   });
   function init() {
-    drawShaDow();
+    shadowPointCache = [];
     maiboPoints.clear();
     otherPoints.clear();
     prevLines.clear();
@@ -55,6 +68,7 @@ function useCenter(canvas, propItems, emits, cumputedX, cumputedY, getXValue, ge
         drawPolyLine(item, dataIndex, scaleValue);
       });
     });
+    drawShaDow();
     drawOverlapPoint();
     setCanvasEvent();
   }
@@ -67,89 +81,34 @@ function useCenter(canvas, propItems, emits, cumputedX, cumputedY, getXValue, ge
     canvas.value.renderAll();
   }
   function drawShaDow(target) {
-    var _a, _b;
+    var _a;
     const pulseObj = left.yScaleValue.find((item) => item.type === "pulse");
     if (!pulseObj || !((_a = pulseObj.dataList) == null ? void 0 : _a.length))
       return;
     if (shadowLinesCache.size)
       canvas.value.remove(...shadowLinesCache);
     shadowLinesCache.clear();
-    const data = [];
-    if (((_b = pulseObj.dataList) == null ? void 0 : _b.length) > 1) {
-      let points1 = [];
-      let points2 = [];
-      const copyDataList = JSON.parse(JSON.stringify(pulseObj.dataList));
+    if (shadowPointCache.length > 1) {
       if (target) {
         const { type, dataIndex, index } = target.origin || {};
         if (type === "pulse") {
-          Object.assign(copyDataList[dataIndex].list[index], {
-            x: target.left,
-            y: target.top
-          });
+          shadowPointCache[dataIndex].splice(index, 1, target);
         }
       }
-      const [data1, data2] = copyDataList;
-      const getPoint = (item) => {
-        if (item.x && item.y) {
-          return {
-            x: item.x,
-            y: item.y
-          };
-        }
-        const point = getPointer(item, pulseObj);
-        if (point == null ? void 0 : point.length) {
-          return {
-            x: point[0],
-            y: point[1]
-          };
-        }
-      };
-      data1.list.forEach((item, index) => {
-        const point1 = getPoint(item);
-        const item2 = data2.list[index];
-        const point2 = item2 ? getPoint(item2) : null;
-        if (point1 && point2 && point1.x === point2.x && point1.y !== point2.y) {
-          points1.push(point1);
-          points2.push(point2);
-          const itemPrev = data1.list[index - 1];
-          const itemNext = data1.list[index + 1];
-          const itemNext2 = data2.list[index + 1];
-          if (itemPrev && points1.length === 1) {
-            const point = getPoint(itemPrev);
-            point && points1.unshift(point);
-          }
-          if (itemNext && itemNext2) {
-            const pointNext = getPoint(itemNext);
-            const pointNext2 = getPoint(itemNext2);
-            if (pointNext && pointNext2 && pointNext.x === pointNext2.x && pointNext.y === pointNext2.y) {
-              points1.push(pointNext);
-            }
-          } else {
-            data.push({ points1, points2 });
-          }
-        } else {
-          if (points1.length && points2.length) {
-            data.push({ points1, points2 });
-            points1 = [];
-            points2 = [];
-          }
-        }
-      });
-    }
-    if (data.length) {
-      const newData = data.reduce((pre, cur) => {
-        const arr1 = cur.points1.map((v) => [v.x, v.y]);
-        const arr2 = cur.points2.map((v) => [v.x, v.y]);
-        return pre.concat([[...arr1, ...arr2.reverse()]]);
-      }, []);
+      const [data1, data2] = shadowPointCache;
+      if (!data1.length || !data2.length)
+        return;
+      const points1 = getPointArr(data1);
+      const points2 = getPointArr(data2);
+      const data = points1.reduce((pre, cur, index) => pre.concat([[...cur, ...points2[index].reverse()]]), []);
       const { createShadowLines } = useShadow();
-      newData.forEach((item) => {
-        var _a2, _b2, _c, _d;
+      data.forEach((item) => {
+        var _a2, _b, _c, _d;
         if (((_a2 = pulseObj.shadow) == null ? void 0 : _a2.mode) == "color") {
           const points = item.map((v) => ({ x: v[0], y: v[1] }));
           const polygon = new fabric.Polygon(points, {
             ...defaultStyle,
-            ...((_b2 = pulseObj.shadow) == null ? void 0 : _b2.style) || {}
+            ...((_b = pulseObj.shadow) == null ? void 0 : _b.style) || {}
           });
           shadowLinesCache.add(polygon);
           canvas.value.add(polygon);
@@ -414,6 +373,7 @@ function useCenter(canvas, propItems, emits, cumputedX, cumputedY, getXValue, ge
         pointList.push(point);
       }
     });
+    scaleValue.type === "pulse" && shadowPointCache.push(pointList);
     Promise.all(pointList).then((res) => {
       const lineListFilter = lineList.filter((v) => v);
       let prevPoint = null;

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

@@ -1,5 +1,4 @@
 import { AnyObject, ArrayAble } from '../../../../../es/src/types';
-import { SchemaReaction } from '@formily/json-schema/esm/types';
 import { SchemaTypes } from '@formily/vue';
 import { CSSProperties, VNode } from 'vue';
 import { DependKeyType, FormCommonState } from '../../../../../es/packages/form-render';
@@ -41,6 +40,20 @@ interface SwitchProperty {
     value?: any;
     describe?: string;
 }
+interface ReactionType {
+    dependencies?: string[];
+    target?: string;
+    when?: string | boolean;
+    fulfill?: {
+        state?: AnyObject;
+        run?: string;
+    };
+    otherwise?: {
+        state?: AnyObject;
+        run?: string;
+    };
+    [key: string]: any;
+}
 export declare type FieldItem = {
     /**
      * 字段的key
@@ -181,7 +194,7 @@ export declare type FieldItem = {
     /**
      * 表单联动配置
      */
-    reactions: ArrayAble<SchemaReaction>;
+    reactions: ArrayAble<ReactionType>;
     [key: string]: any;
 }>;
 export {};

package/package.json

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