cnhis-design-vue 3.1.14-beta.10 → 3.1.14-beta.11

package/es/packages/fabric-chart/src/FabricChart.vue_vue_type_script_setup_true_lang.js

@@ -287,7 +287,8 @@ var script = /* @__PURE__ */ defineComponent({
       canvas.value = null;
     });
     expose({
-      select
+      select,
+      canvas
     });
     return (_ctx, _cache) => {
       return openBlock(), createElementBlock(Fragment, null, [

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

@@ -38,6 +38,7 @@ function useCenter(canvas, propItems, emits, cumputedX, cumputedY, getXValue, ge
   const shadowLinesCache = /* @__PURE__ */ new Set();
   const maiboPoints = /* @__PURE__ */ new Set();
   const otherPoints = /* @__PURE__ */ new Set();
+  const prevLines = /* @__PURE__ */ new Set();
   onMounted(() => {
     nextTick(() => {
       init();
@@ -47,6 +48,7 @@ function useCenter(canvas, propItems, emits, cumputedX, cumputedY, getXValue, ge
     drawShaDow();
     maiboPoints.clear();
     otherPoints.clear();
+    prevLines.clear();
     left.yScaleValue.forEach((scaleValue) => {
       drawPositionLine(scaleValue);
       scaleValue.dataList.forEach((item, dataIndex) => {
@@ -94,12 +96,11 @@ function useCenter(canvas, propItems, emits, cumputedX, cumputedY, getXValue, ge
             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;
+        const point = getPointer(item, pulseObj);
+        if (point == null ? void 0 : point.length) {
           return {
-            x: cumputedX(item.time),
-            y
+            x: point[0],
+            y: point[1]
           };
         }
       };
@@ -278,24 +279,10 @@ function useCenter(canvas, propItems, emits, cumputedX, cumputedY, getXValue, ge
     const lineList = [];
     const otherList = [];
     item.list.forEach((v, index) => {
-      const newY = scaleValue.type === "pain" ? painOriginY : vitalSignsOriginY;
-      let points = null;
-      if (isEffectiveNode(v)) {
-        const x = cumputedX(v.time);
-        const y = cumputedY(scaleValue.type, scaleValue.list, v.value);
-        if (isLimit(v.time)) {
-          points = [x, y < newY.originY ? newY.originY : y > newY.endY ? newY.endY : y];
-        }
-      }
+      var _a;
+      const points = getPointer(v, scaleValue);
       const nextV = item.list[index + 1];
-      let nextPoint = null;
-      if (isEffectiveNode(nextV)) {
-        const nextX = cumputedX(nextV.time);
-        const nextY = cumputedY(scaleValue.type, scaleValue.list, nextV.value);
-        if (isLimit(nextV.time)) {
-          nextPoint = [nextX, nextY < newY.originY ? newY.originY : nextY > newY.endY ? newY.endY : nextY];
-        }
-      }
+      const nextPoint = getPointer(nextV, scaleValue);
       let coolLine, coolPoint, noRiseText, arrowGroup, verifiedText;
       if (points && scaleValue.type === "temperature") {
         if (v.noRise) {
@@ -357,9 +344,22 @@ function useCenter(canvas, propItems, emits, cumputedX, cumputedY, getXValue, ge
         }
       }
       let point;
-      const line = points && nextPoint && !v.breakpoint ? drawLine([...points, ...nextPoint], {
-        ...lineAttr
-      }) : null;
+      let line;
+      if (points && nextPoint && !v.breakpoint) {
+        line = drawLine([...points, ...nextPoint], {
+          ...lineAttr
+        });
+      } else if (points && !nextPoint && !v.breakpoint && scaleValue.type === "temperature" && dataIndex < scaleValue.dataList.length - 1 && index === item.list.length - 1) {
+        const nextV2 = (_a = scaleValue.dataList[dataIndex + 1].list) == null ? void 0 : _a[0];
+        const nextLinePoint = getPointer(nextV2, scaleValue);
+        line = nextLinePoint ? drawLine([...points, ...nextLinePoint], {
+          ...lineAttr
+        }) : null;
+        nextLinePoint && prevLines.add({
+          dataIndex,
+          line
+        });
+      }
       const previousLine = lineList[index - 1];
       const pointAttrNew = {
         origin: {
@@ -390,6 +390,12 @@ function useCenter(canvas, propItems, emits, cumputedX, cumputedY, getXValue, ge
       } else {
         if (points) {
           pointAttrNew.leftLine = null;
+          if (scaleValue.type === "temperature" && index === 0) {
+            const objLine = [...prevLines].find((v2) => v2.dataIndex === dataIndex - 1);
+            if (objLine) {
+              pointAttrNew.leftLine = objLine.line;
+            }
+          }
           point = drawPoint(type, {
             left: points[0],
             top: points[1],
@@ -521,6 +527,16 @@ function useCenter(canvas, propItems, emits, cumputedX, cumputedY, getXValue, ge
     const getTime = new Date(time).getTime();
     return getTime >= minMinute && getTime <= maxMinute;
   }
+  function getPointer(v, scaleValue) {
+    let points;
+    const objOriginY = scaleValue.type === "pain" ? painOriginY : vitalSignsOriginY;
+    if (isEffectiveNode(v) && isLimit(v.time)) {
+      const x = cumputedX(v.time);
+      const y = cumputedY(scaleValue.type, scaleValue.list, v.value);
+      points = [x, y < objOriginY.originY ? objOriginY.originY : y > objOriginY.endY ? objOriginY.endY : y];
+    }
+    return points;
+  }
   function clickMenu({ item, target }) {
     if (!target) {
       emits("add", {

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

@@ -23,6 +23,7 @@ function useCanvasEvent(canvas, propItems, emits) {
       lockMovementX: true,
       lockMovementY: true,
       transparentCorners: false,
+      hasControls: false,
       ...selectionStyle
     });
     canvas.value.add(rect);
@@ -37,9 +38,9 @@ function useCanvasEvent(canvas, propItems, emits) {
     const selections2 = [];
     selections2.push(drawRect({
       left: iconsWidth,
-      top: originY,
+      top: originY + 1,
       width: originX - iconsWidth,
-      height: endY
+      height: endY - originY - 3
     }, "left"));
     let topY = 0;
     topList.forEach((item, index) => {
@@ -48,16 +49,16 @@ function useCanvasEvent(canvas, propItems, emits) {
       }
       selections2.push(drawRect({
         left: iconsWidth,
-        top: topY,
+        top: topY + 1,
         width: endX - iconsWidth,
-        height: propItems[`${item.key}Height`]
+        height: propItems[`${item.key}Height`] - 1
       }, item.key));
     });
     selections2.push(drawRect({
       left: originX,
-      top: originY,
+      top: originY + 1,
       width: endX - originX,
-      height: endY - originY
+      height: endY - originY - 3
     }, "grid"));
     canvas.value.renderAll();
     return selections2;
@@ -67,7 +68,7 @@ function useCanvasEvent(canvas, propItems, emits) {
     canvas.value.discardActiveObject();
     canvas.value.renderAll();
     const obj = selections == null ? void 0 : selections.find((obj2) => obj2.key === key);
-    obj && obj.bringToFront();
+    obj == null ? void 0 : obj.bringToFront();
     obj && canvas.value.setActiveObject(obj);
   }
   return { select };

package/es/packages/form-render/src/components/renderer/cascader.d.ts

@@ -17,7 +17,7 @@ export declare const SEARCH_CASCADE: import("vue").DefineComponent<{
         type: PropType<AnyObject[]>;
         default: () => never[];
     };
-    deep: {
+    depth: {
         type: (NumberConstructor | StringConstructor)[];
         required: true;
     };
@@ -34,7 +34,7 @@ export declare const SEARCH_CASCADE: import("vue").DefineComponent<{
         type: PropType<AnyObject[]>;
         default: () => never[];
     };
-    deep: {
+    depth: {
         type: (NumberConstructor | StringConstructor)[];
         required: true;
     };

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

@@ -1,8 +1,8 @@
 import { defineComponent, ref, inject, computed, watch, createVNode } from 'vue';
 import { isField } from '@formily/core';
-import { isObject } from 'lodash-es';
+import { isEqual } from 'lodash-es';
 import { InjectAsyncQueue } from '../../constants/index.js';
-import { assignUpdateValue, formRenderLog, traverseDependKey } from '../../utils/index.js';
+import { assignUpdateValue, traverseDependKey } from '../../utils/index.js';
 import { connect, mapProps } from '@formily/vue';
 import { NCascader } from 'naive-ui';
 import { useFormField } from '../../hooks/useFormField.js';
@@ -14,7 +14,7 @@ const script = defineComponent({
       type: Array,
       default: () => []
     },
-    deep: {
+    depth: {
       type: [Number, String],
       required: true
     },
@@ -32,55 +32,41 @@ const script = defineComponent({
     slots,
     emit
   }) {
-    const _options = ref(null);
+    const remoteOptions = ref(null);
     const asyncQueue = inject(InjectAsyncQueue);
     const {
       field,
       title
     } = useFormField();
     async function fetchData(option) {
-      if (!option && _options.value)
+      if (!option && remoteOptions.value)
         return;
-      const config = props.urlConfig;
-      if (!config)
+      if (!configFor(props))
         return;
-      if (!isObject(config)) {
-        formRenderLog(`invalid urlConfig (${config}) in CASCADER => ${title.value}`, "warn");
+      if (deepFor(option) + 1 >= deepFor(props))
         return;
-      }
-      if (deepFor(option) + 1 >= props.deep)
-        return;
-      let data = await asyncQueue.addAsync({
-        ...createRequestParams(deepFor(option), config, option),
-        key: title.value
-      });
-      if (!Array.isArray(data)) {
-        data = [];
-      }
-      if (!data.length && isObject(option)) {
+      const data = await asyncQueue.addAsync(createRequestParams(deepFor(option), configFor(props), title.value, option));
+      if (!data.length && option) {
         option.isLeaf = true;
         updateValue(null, null, getOptionChain(option));
         show.value = false;
         return;
       }
       const result = data.map((item) => optionNormalize(item, deepFor(option)));
-      option ? option.children = result : _options.value = result;
-      function deepFor(option2) {
-        var _a;
-        return (_a = option2 == null ? void 0 : option2.depth) != null ? _a : -1;
-      }
-      function createRequestParams(deep, config2, option2) {
+      option ? option.children = result : remoteOptions.value = result;
+      function createRequestParams(deep, config, key, option2) {
         const params = {
           lvlnr: deep + 1 + ""
         };
-        if (option2 && config2.dependKey) {
-          traverseDependKey(config2.dependKey, (dependKey, valueKey2) => {
+        if (option2 && config.dependKey) {
+          traverseDependKey(config.dependKey, (dependKey, valueKey2) => {
             params[valueKey2] = option2[dependKey];
           });
         }
         return {
           params,
-          ...config2
+          ...config,
+          key
         };
       }
       function getOptionChain(option2) {
@@ -92,30 +78,39 @@ const script = defineComponent({
         }
         return result2;
       }
-      function optionNormalize(data2, deep) {
+      function optionNormalize(data2, depth) {
         return {
           [labelKey.value]: data2[labelKey.value],
           [valueKey.value]: data2[valueKey.value],
-          depth: deep + 1,
+          depth: depth + 1,
           parent: option,
-          isLeaf: deep + 2 >= props.deep
+          isLeaf: depth + 2 >= deepFor(props)
         };
       }
+      function configFor(target) {
+        return target.urlConfig;
+      }
+      function deepFor(target) {
+        var _a;
+        return (_a = target == null ? void 0 : target.depth) != null ? _a : -1;
+      }
     }
-    const renderOptions = computed(() => {
-      return _options.value || props.options || [];
+    const parsedOptions = computed(() => {
+      return remoteOptions.value || props.options || [];
     });
     watch(() => props.value, (n, o) => {
       var _a, _b;
-      if (n != null && o == null) {
-        fetchData();
-      }
-      if (isField(field.value) && field.value.visited) {
-        (_b = (_a = field.value).validate) == null ? void 0 : _b.call(_a);
-      }
+      n != null && o == null && fetchData();
+      isField(field.value) && field.value.visited && ((_b = (_a = field.value).validate) == null ? void 0 : _b.call(_a));
     }, {
       immediate: true
     });
+    watch(() => props.urlConfig, async (config, oldConfig) => {
+      if (isEqual(config, oldConfig))
+        return;
+      remoteOptions.value = null;
+      await fetchData();
+    });
     const labelKey = computed(() => {
       var _a, _b;
       return (_b = (_a = props.urlConfig) == null ? void 0 : _a.nameKey) != null ? _b : "text";
@@ -127,13 +122,11 @@ const script = defineComponent({
     const _value = computed(() => {
       try {
         const parsed = Array.isArray(props.value) ? props.value : JSON.parse(props.value || "");
-        if (Array.isArray(parsed)) {
-          return parsed.map((option) => option[labelKey.value]).join(" / ");
-        } else {
-          return [];
-        }
+        if (!Array.isArray(parsed) || !parsed.length)
+          return null;
+        return parsed.map((option) => option[labelKey.value]).join(" / ");
       } catch (e) {
-        return "";
+        return null;
       }
     });
     function updateValue(_, __, options) {
@@ -168,7 +161,7 @@ const script = defineComponent({
         "remote": true,
         "labelField": labelKey.value,
         "valueField": valueKey.value,
-        "options": renderOptions.value,
+        "options": parsedOptions.value,
         "checkStrategy": "child",
         "onLoad": fetchData,
         "onFocus": focusDecorator(props.onFocus),

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

@@ -1,9 +1,8 @@
-import { defineComponent, ref, inject, computed, watch, nextTick, createVNode } from 'vue';
+import { defineComponent, ref, watch, inject, computed, nextTick, createVNode } from 'vue';
 import { isField } from '@formily/core';
-import { cloneDeep } from 'lodash-es';
+import { isEqual, cloneDeep } from 'lodash-es';
 import { InjectAsyncQueue, InjectionFormItemDepsCollector, InjectionChangeContextCollector } from '../../constants/index.js';
-import { assignUpdateValue, formRenderLog, traverseDependKey } from '../../utils/index.js';
-import { isObject } from '@vueuse/core';
+import { assignUpdateValue, traverseDependKey } from '../../utils/index.js';
 import { connect, mapProps } from '@formily/vue';
 import { NSelect } from 'naive-ui';
 import { useFormField } from '../../hooks/useFormField.js';
@@ -32,6 +31,7 @@ const script = defineComponent({
     emit
   }) {
     const remoteOptions = ref(null);
+    watch(remoteOptions, (o) => console.log("remoteOption", o));
     const lastSearch = ref("");
     const asyncQueue = inject(InjectAsyncQueue);
     const {
@@ -52,10 +52,6 @@ const script = defineComponent({
       if (!config) {
         return remoteOptions.value = null;
       }
-      if (!isObject(config)) {
-        formRenderLog(`invalid urlConfig (${config}) in SELECT => ${title.value}`, "warn");
-        return remoteOptions.value = null;
-      }
       try {
         remoteOptions.value = await asyncQueue.addAsync({
           ...createParams(config, field.value),
@@ -86,13 +82,16 @@ const script = defineComponent({
       return filterOption(props.options, lastSearch.value);
     });
     const formItemDepsCollector = inject(InjectionFormItemDepsCollector);
-    watch(() => props.urlConfig, (config) => {
+    watch(() => props.urlConfig, (config, oldConfig) => {
+      if (isEqual(config, oldConfig))
+        return;
       remoteOptions.value = null;
       config && formItemDepsCollector.setDeps(fieldKey.value, config.dependKey || [], async () => {
         remoteOptions.value = null;
         await nextTick();
         props.value != null && await fetchData();
       });
+      config && fetchData();
     }, {
       immediate: true
     });

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

@@ -120,7 +120,7 @@ function useAsyncQueue() {
           const { data, success } = res;
           if (!success)
             throw res;
-          cb(void 0, data);
+          cb(void 0, Array.isArray(data) ? data : []);
         } catch (e) {
           cb(new Error(`Request error => ${e}`));
           removeCache();

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

@@ -80,7 +80,7 @@ function useFieldListAdaptor(collector, uuid) {
     const schema = createStandardSchema(item);
     Object.assign(schema["x-component-props"], {
       urlConfig: item.urlConfig,
-      deep: (_a = item.wordbook) == null ? void 0 : _a.level_num,
+      depth: (_a = item.wordbook) == null ? void 0 : _a.level_num,
       options: item.option
     });
     return schema;

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

@@ -1,7 +1,7 @@
-import { Func } from '../../../../../es/src/types';
+import { ArrayAble, Func } from '../../../../../es/src/types';
 export declare class FormItemDepsCollector {
     private readonly collector;
-    setDeps(key: string, dependKey: string | string[], callback: Func): void;
+    setDeps(key: string, dependKeys: ArrayAble<string> | Record<string, string> | ArrayAble<Record<'paramName' | 'paramValue', string>>, callback: Func): void;
     trigger(dependKey: string, payload?: any): void;
 }
 export declare function useFormItemDeps(): {

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

@@ -1,16 +1,15 @@
 import { isFunction } from 'lodash-es';
-import { arrayed } from '../../../../packages/form-render/src/utils';
+import { traverseDependKey } from '../../../../packages/form-render/src/utils';
 
 class FormItemDepsCollector {
   constructor() {
     this.collector = /* @__PURE__ */ new Map();
   }
-  setDeps(key, dependKey, callback) {
-    dependKey = arrayed(dependKey);
-    dependKey.forEach((dependKey2) => {
-      const map = this.collector.get(dependKey2) || /* @__PURE__ */ new Map();
+  setDeps(key, dependKeys, callback) {
+    traverseDependKey(dependKeys, (dependKey) => {
+      const map = this.collector.get(dependKey) || /* @__PURE__ */ new Map();
       map.set(key, callback);
-      this.collector.set(dependKey2, map);
+      this.collector.set(dependKey, map);
     });
   }
   trigger(dependKey, payload) {

package/global.d.ts

@@ -1,8 +1,8 @@
-import * as NaiveUI from 'naive-ui';
-
-declare module 'naive-ui' {
-  // @ts-ignore
-  export const NTree: any;
-}
-
-export {};
+import * as NaiveUI from 'naive-ui';
+
+declare module 'naive-ui' {
+  // @ts-ignore
+  export const NTree: any;
+}
+
+export {};

package/package.json

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