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

package/es/packages/annotation-edit/index.d.ts

@@ -0,0 +1,17 @@
+import { SFCWithInstall } from '../../../es/src/types';
+declare const Annotation: SFCWithInstall<import("vue").DefineComponent<{
+    modelValue: {
+        type: StringConstructor;
+        default: string;
+    };
+}, () => JSX.Element, unknown, {}, {}, import("vue").ComponentOptionsMixin, import("vue").ComponentOptionsMixin, "update:modelValue"[], "update:modelValue", import("vue").VNodeProps & import("vue").AllowedComponentProps & import("vue").ComponentCustomProps, Readonly<import("vue").ExtractPropTypes<{
+    modelValue: {
+        type: StringConstructor;
+        default: string;
+    };
+}>> & {
+    "onUpdate:modelValue"?: ((...args: any[]) => any) | undefined;
+}, {
+    modelValue: string;
+}>>;
+export default Annotation;

package/es/packages/annotation-edit/index.js

@@ -0,0 +1,10 @@
+import { COMPONENT_NAMESPACE } from '../../src/global/variable';
+import { safeComponentRegister } from '../../src/utils';
+import script from './src/AnnotationEdit.js';
+
+const Annotation = script;
+Annotation.install = function(app) {
+  safeComponentRegister(app, Annotation, COMPONENT_NAMESPACE + "Annotation");
+};
+
+export { Annotation as default };

package/es/packages/annotation-edit/src/AnnotationEdit.d.ts

@@ -0,0 +1,16 @@
+declare const _default: import("vue").DefineComponent<{
+    modelValue: {
+        type: StringConstructor;
+        default: string;
+    };
+}, () => JSX.Element, unknown, {}, {}, import("vue").ComponentOptionsMixin, import("vue").ComponentOptionsMixin, "update:modelValue"[], "update:modelValue", import("vue").VNodeProps & import("vue").AllowedComponentProps & import("vue").ComponentCustomProps, Readonly<import("vue").ExtractPropTypes<{
+    modelValue: {
+        type: StringConstructor;
+        default: string;
+    };
+}>> & {
+    "onUpdate:modelValue"?: ((...args: any[]) => any) | undefined;
+}, {
+    modelValue: string;
+}>;
+export default _default;

package/es/packages/annotation-edit/src/AnnotationEdit.js

@@ -0,0 +1,119 @@
+import { defineComponent, computed, ref, createVNode, unref } from 'vue';
+import { FileTrayFull, FileTray } from '@vicons/ionicons5';
+import { NPopover, NIcon, NInput } from 'naive-ui';
+
+var script = defineComponent({
+  props: {
+    modelValue: {
+      type: String,
+      default: ""
+    }
+  },
+  emits: ["update:modelValue"],
+  setup(props, {
+    emit
+  }) {
+    const modelValue = computed({
+      get() {
+        return props.modelValue;
+      },
+      set(value) {
+        emit("update:modelValue", value);
+      }
+    });
+    const __showPopper = ref(false);
+    const showPopper = computed({
+      get() {
+        return __showPopper.value;
+      },
+      async set(value) {
+        __showPopper.value = value;
+        if (!value && isEdit.value) {
+          await new Promise((resolve) => setTimeout(resolve, 200));
+          isEdit.value = false;
+        }
+      }
+    });
+    const isEdit = ref(false);
+    let clickTimer;
+    function iconClick() {
+      clearTimeout(clickTimer);
+      if (showPopper.value && isEdit.value) {
+        showPopper.value = false;
+        return;
+      }
+      clickTimer = setTimeout(() => {
+        if (!unref(modelValue)) {
+          isEdit.value = showPopper.value = true;
+        }
+      }, 200);
+    }
+    function iconDbClick() {
+      clearTimeout(clickTimer);
+      if (!unref(modelValue))
+        return;
+      showPopper.value = true;
+      isEdit.value = true;
+    }
+    function iconMouseenter() {
+      if (!unref(modelValue))
+        return;
+      showPopper.value = true;
+    }
+    function iconMouseleave() {
+      if (!unref(modelValue) || isEdit.value)
+        return;
+      showPopper.value = false;
+    }
+    function renderAnnotation() {
+      return createVNode("section", {
+        "class": ["annotation-edit", {
+          "is-active": !!unref(modelValue)
+        }],
+        "style": {
+          "--icon-right": "-5"
+        },
+        "annotation-hover-show": !unref(modelValue) && !isEdit.value
+      }, [createVNode(NPopover, {
+        "style": {
+          maxWidth: "200px",
+          wordBreak: "break-all"
+        },
+        "show": showPopper.value,
+        "onUpdate:show": ($event) => showPopper.value = $event,
+        "trigger": "manual",
+        "duration": 100
+      }, {
+        default: renderDefault,
+        trigger: renderTrigger
+      })]);
+      function renderText() {
+        return createVNode("span", null, [unref(modelValue)]);
+      }
+      function renderTextarea() {
+        return createVNode(NInput, {
+          "type": "textarea",
+          "value": modelValue.value,
+          "onUpdate:value": ($event) => modelValue.value = $event
+        }, null);
+      }
+      function renderDefault() {
+        return createVNode("div", null, [isEdit.value ? renderTextarea() : renderText()]);
+      }
+      function renderTrigger() {
+        return createVNode("div", {
+          "class": "annotation-edit__icon",
+          "onMouseleave": iconMouseleave,
+          "onMouseenter": iconMouseenter,
+          "onDblclick": iconDbClick,
+          "onClick": iconClick
+        }, [createVNode(NIcon, {
+          "component": unref(modelValue) ? FileTrayFull : FileTray
+        }, null)]);
+      }
+    }
+    return renderAnnotation;
+  }
+});
+
+export { script as default };

package/es/packages/annotation-edit/style/index.css

@@ -0,0 +1,15 @@
+.annotation-edit {
+  cursor: pointer;
+  color: #0067ee;
+  font-size: 16px;
+  user-select: none;
+  display: inline-flex;
+  align-items: center;
+}
+.annotation-edit.is-active {
+  color: rgba(255, 152, 40);
+}
+.annotation-edit__icon {
+  display: inline-flex;
+  align-items: center;
+}

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

@@ -1091,9 +1091,6 @@ declare const _default: import("vue").DefineComponent<{
                 textColorGhostHoverSuccess: string;
                 textColorGhostPressedSuccess: string;
                 textColorGhostFocusSuccess: string;
-                /**
-                 * 删除选中scan数据
-                 */
                 textColorGhostDisabledSuccess: string;
                 borderSuccess: string;
                 borderHoverSuccess: string;
@@ -1136,14 +1133,7 @@ declare const _default: import("vue").DefineComponent<{
                 textColorHoverError: string;
                 textColorPressedError: string;
                 textColorFocusError: string;
-                textColorDisabledError: string; /**
-                 * 初始化props
-                 * @param {*} unionItem
-                 * @param {*} row
-                 * @param {*} column
-                 * @param {*} $rowIndex
-                 * @returns
-                 */
+                textColorDisabledError: string;
                 textColorTextError: string;
                 textColorTextHoverError: string;
                 textColorTextPressedError: string;
@@ -1315,7 +1305,7 @@ declare const _default: import("vue").DefineComponent<{
                 colorWarning: string;
                 colorHoverWarning: string;
                 colorPressedWarning: string;
-                colorFocusWarning: string;
+                colorFocusWarning: string; /** string */
                 colorDisabledWarning: string;
                 textColorWarning: string;
                 textColorHoverWarning: string;

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

@@ -518,7 +518,6 @@ var script = /* @__PURE__ */ defineComponent({
       return columns;
     };
     const formatterEdit = (params, col) => {
-      console.log(params, col);
       let {
         row,
         column,
@@ -2303,7 +2302,8 @@ var script = /* @__PURE__ */ defineComponent({
           visibleMethod: unref(visibleMethod),
           trigger: "cell",
           reserve: true,
-          highlight: true
+          highlight: true,
+          ..._ctx.$attrs.checkboxConfig || {}
         },
         "radio-config": {
           checkField: "checked",

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

@@ -140,7 +140,7 @@ const reScrollFilterWrap = () => {
   });
 };
 const showFilter = (field, columnName, event, props, state) => {
-  var _a;
+  var _a, _b, _c;
   if (props.isInlineOperating)
     return false;
   const target = event.target;
@@ -161,7 +161,7 @@ const showFilter = (field, columnName, event, props, state) => {
   field.top = btnRectTop + FILTER_BOX_TOP_OFFSET + (props.filterTopOffset || 0) + "px";
   field.visible = !field.visible;
   const len = (_a = state.filterFields[columnName]) == null ? void 0 : _a.CONVERT.length;
-  field.checkAll = len === field.setting.showSetting.length;
+  field.checkAll = len === ((_c = (_b = state.filterFields[columnName]) == null ? void 0 : _b.filterItems) == null ? void 0 : _c.length);
   field.indeterminate = !!len && len !== field.setting.showSetting.length;
   field.searchFilterText = "";
 };

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

@@ -88,19 +88,26 @@ function useCenter(canvas, propItems, emits, cumputedX, cumputedY, getXValue, ge
       }
       const [data1, data2] = copyDataList;
       const getPoint = (item) => {
-        return item.x && item.y ? {
-          x: item.x,
-          y: item.y
-        } : {
-          x: cumputedX(item.time),
-          y: cumputedY(pulseObj.type, pulseObj.list, item.value)
-        };
+        if (item.x && item.y) {
+          return {
+            x: item.x,
+            y: item.y
+          };
+        }
+        if (isEffectiveNode(item) && isLimit(item.time)) {
+          let y = cumputedY(pulseObj.type, pulseObj.list, item.value);
+          y = y < vitalSignsOriginY.originY ? vitalSignsOriginY.originY : y > vitalSignsOriginY.endY ? vitalSignsOriginY.endY : y;
+          return {
+            x: cumputedX(item.time),
+            y
+          };
+        }
       };
       data1.list.forEach((item, index) => {
         const point1 = getPoint(item);
         const item2 = data2.list[index];
         const point2 = item2 ? getPoint(item2) : null;
-        if (point2 && point1.x === point2.x && point1.y !== point2.y) {
+        if (point1 && point2 && point1.x === point2.x && point1.y !== point2.y) {
           points1.push(point1);
           points2.push(point2);
           const itemPrev = data1.list[index - 1];
@@ -108,12 +115,12 @@ function useCenter(canvas, propItems, emits, cumputedX, cumputedY, getXValue, ge
           const itemNext2 = data2.list[index + 1];
           if (itemPrev && points1.length === 1) {
             const point = getPoint(itemPrev);
-            points1.unshift(point);
+            point && points1.unshift(point);
           }
           if (itemNext && itemNext2) {
             const pointNext = getPoint(itemNext);
             const pointNext2 = getPoint(itemNext2);
-            if (pointNext.x === pointNext2.x && pointNext.y === pointNext2.y) {
+            if (pointNext && pointNext2 && pointNext.x === pointNext2.x && pointNext.y === pointNext2.y) {
               points1.push(pointNext);
             }
           } else {
@@ -349,13 +356,11 @@ function useCenter(canvas, propItems, emits, cumputedX, cumputedY, getXValue, ge
           coolPoint && otherList.push(coolPoint);
         }
       }
-      let line;
       let point;
-      let previousLine;
-      line = points && nextPoint && !v.breakpoint ? drawLine([...points, ...nextPoint], {
+      const line = points && nextPoint && !v.breakpoint ? drawLine([...points, ...nextPoint], {
         ...lineAttr
       }) : null;
-      previousLine = lineList[index - 1];
+      const previousLine = lineList[index - 1];
       const pointAttrNew = {
         origin: {
           data: v,

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

@@ -409,7 +409,7 @@ declare const FormRender: SFCWithInstall<import("vue").DefineComponent<{
     }[]>;
     formHeight: import("vue").ComputedRef<any>;
     scrollTo: (id: string) => Promise<void>;
-    onScroll: () => Promise<void>;
+    onScroll: () => void;
     bindInfo: (info: import("../../../es/src/types").AnyObject) => import("../../../es/src/types").AnyObject;
     queryWidget: (key: string, wrapperElement: HTMLElement, fieldList: import("./src/types").FieldItem[]) => Promise<{
         widgetElement: HTMLInputElement | null | undefined;

package/es/packages/form-render/src/FormRender.vue.d.ts

@@ -409,7 +409,7 @@ declare const _default: import("vue").DefineComponent<{
     }[]>;
     formHeight: import("vue").ComputedRef<any>;
     scrollTo: (id: string) => Promise<void>;
-    onScroll: () => Promise<void>;
+    onScroll: () => void;
     bindInfo: (info: AnyObject) => AnyObject;
     queryWidget: (key: string, wrapperElement: HTMLElement, fieldList: FieldItem[]) => Promise<{
         widgetElement: HTMLInputElement | null | undefined;

package/es/packages/form-render/src/components/renderer/formItem.js

@@ -1,9 +1,9 @@
-import { defineComponent, inject, computed, ref, createVNode } from 'vue';
+import { defineComponent, inject, computed, createVNode } from 'vue';
 import { isVoidField } from '@formily/core';
 import { connect, mapProps } from '@formily/vue';
-import { FileTrayFull, FileTray } from '@vicons/ionicons5';
 import { isBoolean } from 'lodash-es';
-import { NFormItem, NPopover, NIcon, NInput } from 'naive-ui';
+import { NFormItem } from 'naive-ui';
+import AnnotationEdit from '../../../../../packages/annotation-edit';
 import { InjectionAnnotation } from '../../../../../packages/form-render/src/constants';
 
 const script = defineComponent({
@@ -27,96 +27,12 @@ const script = defineComponent({
         };
       }
     });
-    function renderTextarea() {
-      return createVNode(NInput, {
-        "type": "textarea",
-        "value": annotationContent.value,
-        "onUpdate:value": ($event) => annotationContent.value = $event
-      }, null);
-    }
-    const __showPopper = ref(false);
-    const showPopper = computed({
-      get() {
-        return __showPopper.value;
-      },
-      async set(value) {
-        __showPopper.value = value;
-        if (!value && isEdit.value) {
-          await new Promise((resolve) => setTimeout(resolve, 200));
-          isEdit.value = false;
-        }
-      }
-    });
-    const isEdit = ref(false);
-    let clickTimer;
-    function iconClick() {
-      clearTimeout(clickTimer);
-      if (showPopper.value && isEdit.value) {
-        showPopper.value = false;
-        return;
-      }
-      clickTimer = setTimeout(() => {
-        if (!annotationContent.value) {
-          isEdit.value = showPopper.value = true;
-        }
-      }, 200);
-    }
-    function iconDbClick() {
-      clearTimeout(clickTimer);
-      if (!annotationContent.value)
-        return;
-      showPopper.value = true;
-      isEdit.value = true;
-    }
-    function iconMouseenter() {
-      if (!annotationContent.value)
-        return;
-      showPopper.value = true;
-    }
-    function iconMouseleave() {
-      if (!annotationContent.value || isEdit.value)
-        return;
-      showPopper.value = false;
-    }
     function renderAnnotation() {
-      return createVNode("section", {
-        "class": ["form-render__formItemLabel--annotation", {
-          "is-active": !!annotationContent.value
-        }],
-        "style": {
-          "--icon-right": "-5"
-        },
-        "form-item-hover-show": !annotationContent.value && !isEdit.value
-      }, [createVNode(NPopover, {
-        "style": {
-          maxWidth: "200px",
-          wordBreak: "break-all"
-        },
-        "show": showPopper.value,
-        "onUpdate:show": ($event) => showPopper.value = $event,
-        "trigger": "manual",
-        "duration": 100
-      }, {
-        default: renderDefault,
-        trigger: renderTrigger
-      })]);
-      function renderText() {
-        return createVNode("span", null, [annotationContent.value]);
-      }
-      function renderDefault() {
-        return createVNode("div", null, [isEdit.value ? renderTextarea() : renderText()]);
-      }
-      function renderTrigger() {
-        return createVNode("div", {
-          "class": "form-render__formItemLabel--icon",
-          "onMouseleave": iconMouseleave,
-          "onMouseenter": iconMouseenter,
-          "onDblclick": iconDbClick,
-          "onClick": iconClick
-        }, [createVNode(NIcon, {
-          "component": annotationContent.value ? FileTrayFull : FileTray
-        }, null)]);
-      }
+      return createVNode(AnnotationEdit, {
+        "class": "form-render__formItemLabel--annotation",
+        "modelValue": annotationContent.value,
+        "onUpdate:modelValue": ($event) => annotationContent.value = $event
+      }, null);
     }
     const showAnnotation = computed(() => {
       return annotation.value && (!isBoolean(props.annotation) || props.annotation);

package/es/packages/form-render/src/hooks/useAnchor.d.ts

@@ -3,7 +3,7 @@ import { ISchema } from '@formily/json-schema/esm/types';
 import { FormItemDepsCollector } from '../../../../../es/packages/form-render';
 export declare function useAnchor(props: Readonly<AnyObject>, collector: FormItemDepsCollector): {
     currentAnchor: import("vue").WritableComputedRef<string>;
-    onScroll: () => Promise<void>;
+    onScroll: () => void;
     formHeight: import("vue").ComputedRef<any>;
     anchorIdList: import("vue").Ref<{
         name: string;

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

@@ -3,7 +3,7 @@ import { useDebounceFn } from '@vueuse/core';
 import { isNumber } from 'lodash-es';
 import { ref, computed, watch, nextTick } from 'vue';
 import { FormItemLineBarDepKeyPrepend } from '../../../../packages/form-render/src/constants';
-import { traverseSchema, createLinebarId } from '../../../../packages/form-render/src/utils';
+import { createLinebarId, traverseSchema } from '../../../../packages/form-render/src/utils';
 
 function useAnchor(props, collector) {
   const __currentAnchor = ref("");
@@ -44,13 +44,13 @@ function useAnchor(props, collector) {
       scrollLock = false;
     }
   }
-  const onScroll = useDebounceFn(async function() {
+  const onScroll = useDebounceFn(function() {
     var _a;
     if (scrollLock || !scrollbarRef.value)
       return;
     const { scrollTop, clientHeight } = scrollbarRef.value;
     const result = anchorIdList.value.find((anchor) => {
-      const node = scrollbarRef.value.querySelector(`#${anchor.name}`);
+      const node = scrollbarRef.value.querySelector(`#${createLinebarId(anchor.name)}`);
       if (!node)
         return;
       return node.offsetTop >= scrollTop || node.offsetTop < scrollTop && node.clientHeight + node.offsetTop > scrollTop + clientHeight;

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

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

package/es/packages/form-render/style/index.css

@@ -1,3 +1,18 @@
+.annotation-edit {
+  cursor: pointer;
+  color: #0067ee;
+  font-size: 16px;
+  user-select: none;
+  display: inline-flex;
+  align-items: center;
+}
+.annotation-edit.is-active {
+  color: rgba(255, 152, 40);
+}
+.annotation-edit__icon {
+  display: inline-flex;
+  align-items: center;
+}
 .form-render__wrapper {
   display: grid !important;
   grid-template-columns: repeat(var(--column), minmax(0px, 1fr));
@@ -21,24 +36,11 @@
 .form-render__formItemLabel--text.has-annotation {
   margin-right: 15px;
 }
-.form-render__formItemLabel--icon {
-  display: inline-flex;
-  align-items: center;
-}
 .form-render__formItemLabel--annotation {
   position: absolute;
   top: 50%;
   transform: translateY(-50%);
   right: calc(var(--icon-right) * 1px);
-  cursor: pointer;
-  color: #0067ee;
-  font-size: 16px;
-  user-select: none;
-  display: inline-flex;
-  align-items: center;
-}
-.form-render__formItemLabel--annotation.is-active {
-  color: rgba(255, 152, 40);
 }
 .form-render__linebar {
   grid-column: span var(--column) / span var(--column);
@@ -132,9 +134,9 @@
 .form-render .n-form-item-label {
   display: inline-flex;
 }
-.form-render .n-form-item-label [form-item-hover-show='true'] {
+.form-render .n-form-item-label [annotation-hover-show='true'] {
   visibility: hidden;
 }
-.form-render .n-form-item-label:hover [form-item-hover-show='true'] {
+.form-render .n-form-item-label:hover [annotation-hover-show='true'] {
   visibility: visible;
 }

package/es/packages/index.css

@@ -2646,6 +2646,21 @@ body > .vxe-table--tooltip-wrapper {
   font-size: 14px;
   text-decoration: none !important;
 }
+.annotation-edit {
+  cursor: pointer;
+  color: #0067ee;
+  font-size: 16px;
+  user-select: none;
+  display: inline-flex;
+  align-items: center;
+}
+.annotation-edit.is-active {
+  color: rgba(255, 152, 40);
+}
+.annotation-edit__icon {
+  display: inline-flex;
+  align-items: center;
+}
 .form-render__wrapper {
   display: grid !important;
   grid-template-columns: repeat(var(--column), minmax(0px, 1fr));
@@ -2669,24 +2684,11 @@ body > .vxe-table--tooltip-wrapper {
 .form-render__formItemLabel--text.has-annotation {
   margin-right: 15px;
 }
-.form-render__formItemLabel--icon {
-  display: inline-flex;
-  align-items: center;
-}
 .form-render__formItemLabel--annotation {
   position: absolute;
   top: 50%;
   transform: translateY(-50%);
   right: calc(var(--icon-right) * 1px);
-  cursor: pointer;
-  color: #0067ee;
-  font-size: 16px;
-  user-select: none;
-  display: inline-flex;
-  align-items: center;
-}
-.form-render__formItemLabel--annotation.is-active {
-  color: rgba(255, 152, 40);
 }
 .form-render__linebar {
   grid-column: span var(--column) / span var(--column);
@@ -2780,10 +2782,10 @@ body > .vxe-table--tooltip-wrapper {
 .form-render .n-form-item-label {
   display: inline-flex;
 }
-.form-render .n-form-item-label [form-item-hover-show='true'] {
+.form-render .n-form-item-label [annotation-hover-show='true'] {
   visibility: hidden;
 }
-.form-render .n-form-item-label:hover [form-item-hover-show='true'] {
+.form-render .n-form-item-label:hover [annotation-hover-show='true'] {
   visibility: visible;
 }
 .c-fabric-chart-popup-tip,

package/package.json

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