cnhis-design-vue 3.1.21-beta.11 → 3.1.21-beta.13

package/es/components/big-table/index.d.ts

@@ -329,6 +329,14 @@ declare const BigTable: SFCWithInstall<import("vue").DefineComponent<{
             showInsertStatus?: boolean | undefined;
             showAsterisk?: boolean | undefined;
             autoClear?: boolean | undefined;
+            beforeEditMethod?: ((params: {
+                row: any;
+                rowIndex: number;
+                column: import("vxe-table").VxeTableDefines.ColumnInfo;
+                columnIndex: number;
+                $table: import("vxe-table").VxeTableConstructor & import("vxe-table").VxeTablePrivateMethods;
+                $grid: import("vxe-table").VxeGridConstructor | null | undefined;
+            }) => boolean) | undefined;
             activeMethod?: ((params: {
                 row: any;
                 rowIndex: number;

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

@@ -327,6 +327,14 @@ declare const _default: import("vue").DefineComponent<{
             showInsertStatus?: boolean | undefined;
             showAsterisk?: boolean | undefined;
             autoClear?: boolean | undefined;
+            beforeEditMethod?: ((params: {
+                row: any;
+                rowIndex: number;
+                column: import("vxe-table").VxeTableDefines.ColumnInfo;
+                columnIndex: number;
+                $table: import("vxe-table").VxeTableConstructor & import("vxe-table").VxeTablePrivateMethods;
+                $grid: import("vxe-table").VxeGridConstructor | null | undefined;
+            }) => boolean) | undefined;
             activeMethod?: ((params: {
                 row: any;
                 rowIndex: number;

package/es/components/fabric-chart/src/components/PopupMenu.js

@@ -60,7 +60,7 @@ var PopupMenu = defineComponent({
         "align": "center"
       }, {
         default: () => [createVNode("span", null, [item.label]), createVNode(NInputNumber, {
-          "style": "width: 120px",
+          "style": "width: 110px",
           "size": "small",
           "value": item.value,
           "onUpdate:value": ($event) => item.value = $event,
@@ -68,6 +68,7 @@ var PopupMenu = defineComponent({
           "placeholder": "\u8BF7\u8F93\u5165\u6570\u503C",
           "max": props.target.origin.data.value,
           "min": min,
+          "showButton": false,
           "onFocus": () => emit("update:show", true)
         }, null)]
       });

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

@@ -154,17 +154,20 @@ function useCenter(canvas, propItems, emits, cumputedX, cumputedY, getXValue, ge
             pointMenuProps.list = ["\u65B0\u589E\u8282\u70B9"];
             itemList.forEach((v) => {
               if (!getEqualXTypes(x).includes(v.bigType)) {
-                pointMenuProps.list.push({
-                  renderItem: addRenderItem ? addRenderItem(v) : () => v.title,
-                  origin: {
-                    title: v.title,
-                    unit: v.unit,
-                    type: v.bigType,
-                    dataIndex: v.dataIndex,
-                    key: v.key
-                  },
-                  pointer: event2.pointer
-                });
+                const newY = ["pain"].includes(v.bigType) ? painOriginY : vitalSignsOriginY;
+                if (y >= newY.originY && y <= newY.endY) {
+                  pointMenuProps.list.push({
+                    renderItem: addRenderItem ? addRenderItem(v) : () => v.title,
+                    origin: {
+                      title: v.title,
+                      unit: v.unit,
+                      type: v.bigType,
+                      dataIndex: v.dataIndex,
+                      key: v.key
+                    },
+                    pointer: event2.pointer
+                  });
+                }
               }
             });
             if (pointMenuProps.list.length === 1) {
@@ -348,8 +351,8 @@ function useCenter(canvas, propItems, emits, cumputedX, cumputedY, getXValue, ge
       const pointAttrNew = {
         origin: {
           data: v,
-          title: item.title,
-          key: item.key || "",
+          title: _item.title,
+          key: _item.key || "",
           unit: scaleValue.unit,
           type,
           dataIndex,
@@ -385,7 +388,7 @@ function useCenter(canvas, propItems, emits, cumputedX, cumputedY, getXValue, ge
       }
       lineList.push(line);
       if (point) {
-        if (item.title.includes("\u8109\u640F")) {
+        if (_item.title.includes("\u8109\u640F")) {
           maiboPoints.add(point);
         } else {
           otherPoints.add(point);

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

@@ -235,8 +235,21 @@ function useLeft(canvas, propItems, emits, setPopup, pointTipProps, getXValue, g
   function isLimit(point) {
     return point.left >= originX && point.left <= endX && point.top >= originY && point.top <= endY;
   }
+  function moveLimit(point) {
+    if (point.left >= originX && point.left <= endX) {
+      point.setCoords();
+      const newY = point.origin.type === "pain" ? painOriginY : vitalSignsOriginY;
+      if (point.top < newY.originY) {
+        point.set("top", newY.originY);
+      }
+      if (point.top > newY.endY) {
+        point.set("top", newY.endY);
+      }
+    }
+  }
   function setPointEvent(point) {
     point.on("moving", () => {
+      moveLimit(point);
       if (isLimit(point)) {
         setPopup(point);
       } else {

package/es/components/field-set/index.d.ts

@@ -63,6 +63,7 @@ declare const FieldSet: SFCWithInstall<import("vue").DefineComponent<{
             columnWidth: number;
             editable: boolean;
             required: boolean;
+            hide: boolean;
         }[];
         widthShow: string;
         widthLarge: string;
@@ -80,6 +81,7 @@ declare const FieldSet: SFCWithInstall<import("vue").DefineComponent<{
         columnWidth: number;
         editable: boolean;
         required: boolean;
+        hide: boolean;
     }) => {
         background: string | undefined;
     };
@@ -104,6 +106,7 @@ declare const FieldSet: SFCWithInstall<import("vue").DefineComponent<{
         columnWidth: number;
         editable: boolean;
         required: boolean;
+        hide: boolean;
     }) => void;
     setWidth: () => void;
     NButton: any;

package/es/components/field-set/src/FieldSet.js

@@ -292,7 +292,8 @@ const _sfc_main = /* @__PURE__ */ defineComponent({
                     tag: "ul"
                   }, {
                     item: withCtx(({ element }) => [
-                      createElementVNode("li", {
+                      !element.hide ? (openBlock(), createElementBlock("li", {
+                        key: 0,
                         class: "left-style",
                         style: normalizeStyle(leftStyle(element)),
                         onClick: ($event) => handleFieldClick(element)
@@ -379,7 +380,7 @@ const _sfc_main = /* @__PURE__ */ defineComponent({
                             style: { width: "120px" }
                           }, null, 8, ["value", "onUpdate:value"])
                         ])
-                      ], 12, _hoisted_16)
+                      ], 12, _hoisted_16)) : createCommentVNode("v-if", true)
                     ]),
                     _: 1
                   }, 8, ["list"])

package/es/components/field-set/src/FieldSet.vue.d.ts

@@ -11,6 +11,7 @@ declare type Ifields = {
     columnWidth: number;
     editable: boolean;
     required: boolean;
+    hide: boolean;
     [key: string]: any;
 };
 declare type Istate = {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "cnhis-design-vue",
-  "version": "3.1.21-beta.11",
+  "version": "3.1.21-beta.13",
   "license": "ISC",
   "module": "./es/components/index.js",
   "main": "./es/components/index.js",
@@ -55,7 +55,7 @@
     "vue": "^3.2.0",
     "vue-simple-uploader": "^1.0.0-beta.5",
     "vuedraggable": "4.1.0",
-    "vxe-table": "4.2.5",
+    "vxe-table": "4.2.6",
     "xe-utils": "^3.5.4"
   },
   "browserslist": [
@@ -66,5 +66,5 @@
     "iOS 7",
     "last 3 iOS versions"
   ],
-  "gitHead": "79a10ccc3e78b46f18703b08ab2edecfe5bcbb48"
+  "gitHead": "7b5157ff60722aaeea7a4e638304e7570b8a22db"
 }