cnhis-design-vue 3.1.21-beta.4 → 3.1.21-beta.6

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

@@ -200,7 +200,7 @@ declare const BigTable: SFCWithInstall<import("vue").DefineComponent<{
     resetInlineBatchEdit: FunctionConstructor;
     resetBatchEditRowStatus: FunctionConstructor;
     anchor: {
-        type: ArrayConstructor;
+        type: import("vue").PropType<import("../../../es/shared/types").AnyObject[]>;
         default: () => never[];
     };
 }, {
@@ -547,12 +547,15 @@ declare const BigTable: SFCWithInstall<import("vue").DefineComponent<{
         resetInlineBatchEdit: FunctionConstructor;
         resetBatchEditRowStatus: FunctionConstructor;
         anchor: {
-            type: ArrayConstructor;
+            type: import("vue").PropType<import("../../../es/shared/types").AnyObject[]>;
             default: () => never[];
         };
     }>> & {
         [x: `on${string}`]: ((...args: any[]) => any) | undefined;
     }>>;
+    attr: {
+        [x: string]: unknown;
+    };
     formatData: (data?: {
         tableList: any[];
         fieldList: any[];
@@ -579,6 +582,7 @@ declare const BigTable: SFCWithInstall<import("vue").DefineComponent<{
         'border-color': any;
         color?: undefined;
     };
+    getAttr: (field: string) => any;
     imgs2imgArr: (imgs: any) => any;
     parseDurationValue: (v: any, duration: any) => string | undefined;
     parseCombinationValue: (value: any, setting: any) => any;
@@ -621,9 +625,6 @@ declare const BigTable: SFCWithInstall<import("vue").DefineComponent<{
         $event: KeyboardEvent;
     }) => void;
     scroll: (params: any) => void;
-    attr: {
-        [x: string]: unknown;
-    };
     currentCheckedKeys: import("vue").ComputedRef<never[]>;
     visibleCancelCheckAllBtn: import("vue").ComputedRef<boolean>;
     singleCheckedKey: import("vue").ComputedRef<string>;
@@ -1116,13 +1117,13 @@ declare const BigTable: SFCWithInstall<import("vue").DefineComponent<{
     resetInlineBatchEdit: FunctionConstructor;
     resetBatchEditRowStatus: FunctionConstructor;
     anchor: {
-        type: ArrayConstructor;
+        type: import("vue").PropType<import("../../../es/shared/types").AnyObject[]>;
         default: () => never[];
     };
 }>> & {
     [x: `on${string}`]: ((...args: any[]) => any) | undefined;
 }, {
-    anchor: unknown[];
+    anchor: import("../../../es/shared/types").AnyObject[];
     data: unknown[];
     showFooter: boolean;
     columnConfig: Record<string, any>;

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

@@ -198,7 +198,7 @@ declare const _default: import("vue").DefineComponent<{
     resetInlineBatchEdit: FunctionConstructor;
     resetBatchEditRowStatus: FunctionConstructor;
     anchor: {
-        type: ArrayConstructor;
+        type: import("vue").PropType<import("../../../shared/types").AnyObject[]>;
         default: () => never[];
     };
 }, {
@@ -545,12 +545,15 @@ declare const _default: import("vue").DefineComponent<{
         resetInlineBatchEdit: FunctionConstructor;
         resetBatchEditRowStatus: FunctionConstructor;
         anchor: {
-            type: ArrayConstructor;
+            type: import("vue").PropType<import("../../../shared/types").AnyObject[]>;
             default: () => never[];
         };
     }>> & {
         [x: `on${string}`]: ((...args: any[]) => any) | undefined;
     }>>;
+    attr: {
+        [x: string]: unknown;
+    };
     formatData: (data?: {
         tableList: any[];
         fieldList: any[];
@@ -577,6 +580,7 @@ declare const _default: import("vue").DefineComponent<{
         'border-color': any;
         color?: undefined;
     };
+    getAttr: (field: string) => any;
     imgs2imgArr: (imgs: any) => any;
     parseDurationValue: (v: any, duration: any) => string | undefined;
     parseCombinationValue: (value: any, setting: any) => any;
@@ -619,9 +623,6 @@ declare const _default: import("vue").DefineComponent<{
         $event: KeyboardEvent;
     }) => void;
     scroll: (params: any) => void;
-    attr: {
-        [x: string]: unknown;
-    };
     currentCheckedKeys: import("vue").ComputedRef<never[]>;
     visibleCancelCheckAllBtn: import("vue").ComputedRef<boolean>;
     singleCheckedKey: import("vue").ComputedRef<string>;
@@ -1114,13 +1115,13 @@ declare const _default: import("vue").DefineComponent<{
     resetInlineBatchEdit: FunctionConstructor;
     resetBatchEditRowStatus: FunctionConstructor;
     anchor: {
-        type: ArrayConstructor;
+        type: import("vue").PropType<import("../../../shared/types").AnyObject[]>;
         default: () => never[];
     };
 }>> & {
     [x: `on${string}`]: ((...args: any[]) => any) | undefined;
 }, {
-    anchor: unknown[];
+    anchor: import("../../../shared/types").AnyObject[];
     data: unknown[];
     showFooter: boolean;
     columnConfig: Record<string, any>;

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

@@ -57,11 +57,13 @@ var _sfc_main = /* @__PURE__ */ defineComponent({
     const xGrid = ref({});
     const copyState = XEUtils.clone(bigTableState, true);
     const state = reactive(copyState);
+    const attr = useAttrs();
     const {
       formatData,
       htmlToText,
-      getBtnStyle
-    } = useFormat(state);
+      getBtnStyle,
+      getAttr
+    } = useFormat(state, attr);
     const {
       imgs2imgArr,
       parseDurationValue,
@@ -104,7 +106,6 @@ var _sfc_main = /* @__PURE__ */ defineComponent({
       keyDown,
       scroll
     } = useEvent(props, state, emit, xGrid, anchorEvent);
-    const attr = useAttrs();
     const currentCheckedKeys = computed(() => {
       var _a;
       return ((_a = state.checkedRows) == null ? void 0 : _a.map((row) => row[props.primaryKey])) || [];
@@ -2334,20 +2335,20 @@ var _sfc_main = /* @__PURE__ */ defineComponent({
         "cell-class-name": _ctx.columnConfig.cellClassName || null,
         "row-config": {
           ...state.rowConfig,
-          ..._ctx.$attrs.rowConfig || {}
+          ...unref(getAttr)("row-config")
         },
         "show-footer": _ctx.showFooter && !props.isInlineOperating,
         "footer-method": footerMethod,
         "sort-config": {
           trigger: "cell",
           remote: true,
-          ..._ctx.$attrs.sortConfig || {}
+          ...unref(getAttr)("sort-config")
         },
         "span-method": colspanMethod,
         "footer-span-method": footerRowspanMethod,
         "tooltip-config": {
           enterable: false,
-          ..._ctx.$attrs.tooltipConfig || {}
+          ...unref(getAttr)("tooltip-config")
         },
         "checkbox-config": {
           checkField: "checked",
@@ -2357,18 +2358,18 @@ var _sfc_main = /* @__PURE__ */ defineComponent({
           trigger: "cell",
           reserve: true,
           highlight: true,
-          ..._ctx.$attrs.checkboxConfig || {}
+          ...unref(getAttr)("checkbox-config")
         },
         "radio-config": {
           checkField: "checked",
           trigger: "cell",
           reserve: true,
           highlight: true,
-          ..._ctx.$attrs.radioConfig || {}
+          ...unref(getAttr)("radio-config")
         },
         "scroll-y": {
           gt: 50,
-          ..._ctx.$attrs.scrollY || {}
+          ...unref(getAttr)("scroll-y")
         },
         "row-style": unref(getRowStyle),
         "edit-config": state.editConfig,
@@ -2379,7 +2380,7 @@ var _sfc_main = /* @__PURE__ */ defineComponent({
           toggleMethod: unref(toggleExpandMethod),
           iconOpen: "iconfont icon-a-xitongtubiaozhediejian",
           iconClose: "iconfont icon-a-xitongtubiaotianjia",
-          ..._ctx.$attrs.expandConfig || {}
+          ...unref(getAttr)("expand-config")
         },
         "keyboard-config": _ctx.columnConfig.keyboardConfig || {},
         "edit-rules": _ctx.columnConfig.editRules || {},

package/es/components/big-table/src/bigTableProps.d.ts

@@ -200,7 +200,7 @@ declare const bigTableProps: {
     resetInlineBatchEdit: FunctionConstructor;
     resetBatchEditRowStatus: FunctionConstructor;
     anchor: {
-        type: ArrayConstructor;
+        type: PropType<AnyObject[]>;
         default: () => never[];
     };
 };

package/es/components/big-table/src/hooks/useFormat.d.ts

@@ -1,4 +1,5 @@
-export declare const useFormat: (state: any) => {
+import { AnyObject } from '../../../../../es/shared/types';
+export declare const useFormat: (state: any, attr: AnyObject) => {
     formatData: (data?: {
         tableList: any[];
         fieldList: any[];
@@ -25,4 +26,5 @@ export declare const useFormat: (state: any) => {
         'border-color': any;
         color?: undefined;
     };
+    getAttr: (field: string) => any;
 };

package/es/components/big-table/src/hooks/useFormat2.js

@@ -1,7 +1,7 @@
 import XEUtils from 'xe-utils';
 import 'moment';
 
-const useFormat = (state) => {
+const useFormat = (state, attr) => {
   const formatData = (data = {
     tableList: [],
     fieldList: [],
@@ -482,10 +482,19 @@ const useFormat = (state) => {
       "border-color": v.color
     };
   };
+  function getAttr(field) {
+    if (attr[field])
+      return attr[field];
+    const newField = field.replace(/-(\w)/g, ($0, $1) => {
+      return $1.toUpperCase();
+    });
+    return attr[newField] || {};
+  }
   return {
     formatData,
     htmlToText,
-    getBtnStyle
+    getBtnStyle,
+    getAttr
   };
 };
 

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

@@ -1,4 +1,4 @@
-import { defineComponent, ref, createVNode, Teleport, withDirectives, vShow } from 'vue';
+import { defineComponent, ref, watch, createVNode, Teleport, withDirectives, vShow } from 'vue';
 import { NSpace, NInputNumber } from 'naive-ui';
 import useStyle from './useStyle2.js';
 import { onClickOutside } from '@vueuse/core';
@@ -31,9 +31,11 @@ var PopupMenu = defineComponent({
     slots,
     emit
   }) {
+    let setNoShow = false;
     const popupRef = ref(null);
     onClickOutside(popupRef, (event) => {
-      emit("update:show", false);
+      !setNoShow && emit("update:show", false);
+      setNoShow = false;
     });
     const {
       left
@@ -81,6 +83,11 @@ var PopupMenu = defineComponent({
         });
       }
     }
+    watch(() => props.show, (value) => {
+      if (value) {
+        setNoShow = true;
+      }
+    });
     return () => {
       return createVNode(Teleport, {
         "to": ".c-fabric-chart"

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

@@ -64,7 +64,9 @@ function useCenter(canvas, propItems, emits, cumputedX, cumputedY, getXValue, ge
     left.yScaleValue.forEach((scaleValue) => {
       drawPositionLine(scaleValue);
       scaleValue.dataList.forEach((item, dataIndex) => {
-        drawPolyLine(item, dataIndex, scaleValue);
+        if (scaleValue.type !== "temperature" || item.enable) {
+          drawPolyLine(item, dataIndex, scaleValue);
+        }
       });
     });
     drawShaDow();
@@ -228,13 +230,6 @@ function useCenter(canvas, propItems, emits, cumputedX, cumputedY, getXValue, ge
     });
   }
   function drawPolyLine(item, dataIndex, scaleValue) {
-    const {
-      pointAttr = {},
-      lineAttr = {},
-      type: pointType = "circle",
-      upArrowShow = false,
-      limitValueShow = false
-    } = item;
     const {
       type,
       noRiseStyle = {},
@@ -242,13 +237,22 @@ function useCenter(canvas, propItems, emits, cumputedX, cumputedY, getXValue, ge
       reduceStyle = {},
       pacemaker = {},
       upArrowStyle = {},
-      limitValueStyle = {}
+      limitValueStyle = {},
+      dataList = []
     } = scaleValue;
     const pointList = [];
     const lineList = [];
     const otherList = [];
     item.list.forEach((v, index) => {
-      var _a, _b;
+      var _a;
+      const _item = type !== "temperature" ? item : dataList.find((_v) => _v.key === v.key);
+      const {
+        pointAttr = {},
+        lineAttr = {},
+        type: pointType = "circle",
+        upArrowShow = false,
+        limitValueShow = false
+      } = _item;
       const points = getPointer(v, scaleValue);
       const nextV = item.list[index + 1];
       const nextPoint = getPointer(nextV, scaleValue);
@@ -330,9 +334,8 @@ function useCenter(canvas, propItems, emits, cumputedX, cumputedY, getXValue, ge
         line = drawLine([...points, ...nextPoint], {
           ...lineAttr
         });
-      } else if (points && !nextPoint && !v.breakpoint && type === "temperature" && dataIndex < scaleValue.dataList.length - 1 && index === item.list.length - 1) {
-        const nextV2 = (_b = scaleValue.dataList[dataIndex + 1].list) == null ? void 0 : _b[0];
-        const nextLinePoint = getPointer(nextV2, scaleValue);
+      } else if (points && !nextPoint && !v.breakpoint) {
+        const nextLinePoint = getPointer(nextV, scaleValue);
         line = nextLinePoint ? drawLine([...points, ...nextLinePoint], {
           ...lineAttr
         }) : null;
@@ -373,12 +376,6 @@ function useCenter(canvas, propItems, emits, cumputedX, cumputedY, getXValue, ge
       } else {
         if (points) {
           pointAttrNew.leftLine = null;
-          if (type == "temperature" && index === 0) {
-            const objLine = [...prevLines].find((v2) => v2.dataIndex === dataIndex - 1);
-            if (objLine) {
-              pointAttrNew.leftLine = objLine.line;
-            }
-          }
           point = drawPoint(currentPointType, {
             left: points[0],
             top: points[1],
@@ -536,6 +533,9 @@ function useCenter(canvas, propItems, emits, cumputedX, cumputedY, getXValue, ge
         value: target.origin.data.value
       };
       data[`${item.type}`] = item.value;
+      if (target.origin.type === "temperature") {
+        data["key"] = target.origin.key;
+      }
       emits("change", {
         ...target.origin,
         data

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

@@ -212,7 +212,7 @@ function useLeft(canvas, propItems, emits, setPopup, pointTipProps, getXValue, g
       });
       const icon = drawPoint(item.type, {
         left: leftX,
-        top: topY - (text.height || 30) / 2,
+        top: topY - (text.height || 30) / 2 - 1,
         ...item.pointAttr,
         originY: "center",
         originX: "right",
@@ -224,7 +224,7 @@ function useLeft(canvas, propItems, emits, setPopup, pointTipProps, getXValue, g
           key: item.key
         },
         originLeft: leftX,
-        originTop: topY - (text.height || 30) / 2,
+        originTop: topY - (text.height || 30) / 2 - 1,
         ...propItems.event
       });
       topY -= text.height || 30;

package/es/components/form-render/src/components/renderer/date.js

@@ -46,6 +46,10 @@ const script = defineComponent({
     function isTimeDisabled(time) {
       const checkDate = new Date(time);
       const currentDate = new Date();
+      const checkDateDuplicate = new Date(checkDate);
+      checkDateDuplicate.setHours(0);
+      checkDateDuplicate.setMinutes(0);
+      checkDateDuplicate.setSeconds(0);
       return {
         isHourDisabled,
         isMinuteDisabled
@@ -59,10 +63,17 @@ const script = defineComponent({
       function currentMinute() {
         return currentDate.getMinutes();
       }
+      function isOverDate() {
+        return checkDateDuplicate > currentDate;
+      }
       function isHourDisabled(hour) {
+        if (isOverDate())
+          return false;
         return minCurrentDate() && hour < currentHour() || maxCurrentDate() && hour > currentHour();
       }
       function isMinuteDisabled(minute) {
+        if (isOverDate())
+          return false;
         if (checkHour() === currentHour()) {
           return minCurrentDate() && minute < currentMinute() || maxCurrentDate() && minute > currentMinute();
         }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "cnhis-design-vue",
-  "version": "3.1.21-beta.4",
+  "version": "3.1.21-beta.6",
   "license": "ISC",
   "module": "./es/components/index.js",
   "main": "./es/components/index.js",
@@ -66,5 +66,5 @@
     "iOS 7",
     "last 3 iOS versions"
   ],
-  "gitHead": "7ef5767506d850cf000b061261bea68a2aaac601"
+  "gitHead": "35a72eb95288d77dc5cef7da908186ff8bce079a"
 }