cnhis-design-vue 3.1.23-beta.12 → 3.1.23-beta.14

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

@@ -18,13 +18,13 @@ function useCanvasEvent(canvas, propItems, emits) {
       width,
       height,
       stroke: "transparent",
-      strokeWidth: 1,
       fill: "transparent",
       lockMovementX: true,
       lockMovementY: true,
       transparentCorners: false,
       hasControls: false,
-      ...selectionStyle
+      ...selectionStyle,
+      strokeWidth: 0
     });
     canvas.value.add(rect);
     return rect;
@@ -77,12 +77,15 @@ function useCanvasEvent(canvas, propItems, emits) {
           if (button == 1) {
             const _key = obj.key.replace("All", "");
             const key = pointer.x <= originX ? _key + "Title" : _key;
+            obj.sendToBack();
             select(key);
             emits("select", key);
           }
         });
       } else {
         obj.on("mousedown", () => {
+          resetStrokeWidth();
+          setActiveObj(obj);
           emits("select", obj.key);
         });
         setTimeout(() => {
@@ -95,18 +98,19 @@ function useCanvasEvent(canvas, propItems, emits) {
   }
   function addSelectionListener() {
     canvas.value.on("selection:cleared", selectionCB);
-    canvas.value.on("selection:updated", selectionCB);
     function selectionCB(event) {
       const { deselected = [] } = event;
       deselected.forEach((obj) => {
+        obj.set("strokeWidth", 0);
         obj.key.endsWith("All") && obj.sendToBack();
       });
     }
   }
   function select(key) {
     canvas.value.discardActiveObject().renderAll();
+    resetStrokeWidth();
     const obj = selections == null ? void 0 : selections.find((obj2) => obj2.key === key);
-    obj == null ? void 0 : obj.bringToFront();
+    setActiveObj(obj);
     obj && canvas.value.setActiveObject(obj);
   }
   function init() {
@@ -115,6 +119,16 @@ function useCanvasEvent(canvas, propItems, emits) {
     selections = initSelection();
     addSelectionListener();
   }
+  function resetStrokeWidth() {
+    selections.forEach((obj) => {
+      obj.set("strokeWidth", 0);
+      obj.key.endsWith("All") && obj.sendToBack();
+    });
+  }
+  function setActiveObj(obj) {
+    var _a;
+    obj == null ? void 0 : obj.bringToFront().set("strokeWidth", (_a = selectionStyle.strokeWidth) != null ? _a : 2);
+  }
   init();
   return { select };
 }

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

@@ -1,5 +1,5 @@
 import { defineComponent, computed, ref, inject, watch, createVNode } from 'vue';
-import { isEqual, isString, isEmpty } from 'lodash-es';
+import { isEqual, isString, isEmpty, isFunction, omit } from 'lodash-es';
 import '../../../index2.js';
 import { InjectAsyncQueue } from '../../constants/index2.js';
 import { useCommonInjection } from '../../hooks/useCommonInjection2.js';
@@ -46,6 +46,7 @@ const script = defineComponent({
       get: () => props.value,
       set: (v) => emit("update:value", v)
     });
+    const showRef = ref(false);
     const optionsRef = ref([]);
     const {
       field,
@@ -59,7 +60,7 @@ const script = defineComponent({
       var _a, _b;
       return (_b = (_a = props.wordbook) == null ? void 0 : _a.value_key) != null ? _b : "value";
     });
-    computed(() => {
+    const depth = computed(() => {
       var _a;
       return ((_a = props.wordbook) == null ? void 0 : _a.level_num) || Infinity;
     });
@@ -71,24 +72,16 @@ const script = defineComponent({
       try {
         if (node && !node.__keyword && node.isLeaf) {
           valueRef.value = createOptionValue(node);
-          return;
-        }
-        const result = await asyncQueue.addAsync(createParams(props.wordbook, props.autograph, field.value, node, fieldKey.value));
-        if (!node) {
-          optionsRef.value = result.map((option) => {
-            option.__keyword = !!keyword;
-            option.isLeaf = !!keyword;
-            return option;
-          });
-          return;
+          showRef.value = false;
+          return Promise.reject();
         }
         if (node == null ? void 0 : node.__keyword) {
           if (!isString(node.id_link))
-            return;
+            return Promise.reject();
           const linkList = parseLinkFromString2List(node.id_link);
           const primaryKeyOptions = await fetchPrimaryKeyValue(linkList);
           if (!primaryKeyOptions)
-            return;
+            return Promise.reject();
           const {
             lastOption,
             options
@@ -98,14 +91,25 @@ const script = defineComponent({
             valueRef.value = sortOptionWithIdList(primaryKeyOptions, linkList);
           } else {
             optionsRef.value = options;
+            return lastOption;
           }
         } else {
-          node.children = result.map((option) => {
-            return {
-              ...option,
-              parent: node
-            };
-          });
+          const result = await asyncQueue.addAsync(createParams(props.wordbook, props.autograph, field.value, node, fieldKey.value));
+          if (!node) {
+            optionsRef.value = result.map((option) => {
+              option.__keyword = !!keyword;
+              option.isLeaf = !!keyword;
+              return option;
+            });
+          } else {
+            node.children = result.map((option) => {
+              return {
+                ...option,
+                parent: node,
+                isLeaf: getNodeDepth(node) + 1 >= depth.value
+              };
+            });
+          }
         }
       } catch (e) {
         isString(e) && formRenderLog(e);
@@ -119,9 +123,15 @@ const script = defineComponent({
         let lastOption = options[0];
         const resultOption = idList.reduce((res, id, index) => {
           const option = getTargetOption(options, id);
-          if (index === 0)
+          if (index === 0) {
+            lastOption = option;
             return [option];
+          }
           lastOption = option;
+          Object.assign(option, {
+            parent: res[0],
+            isLeaf: index + 1 >= depth.value
+          });
           res[0].children = [option];
           return res;
         }, []);
@@ -133,21 +143,34 @@ const script = defineComponent({
           return options2.find((o) => o[valueKey.value] === value);
         }
       }
+      function getNodeDepth(node2) {
+        let result = 1;
+        let parent = node2.parent;
+        while (parent) {
+          result++;
+          parent = parent.parent;
+        }
+        return result;
+      }
       function parseLinkFromString2List(linkString) {
         return linkString.split("_").filter((s) => s);
       }
       function createParams(wordbook, autograph, field2, node2, key2) {
-        const params = {
-          autograph,
-          wordbookId: wordbook.id,
-          wordbookType: wordbook.type,
-          fieldKeys: wordbook.search_key ? JSON.stringify(wordbook.search_key) : void 0,
-          conObj: JSON.stringify(createConfigObject(wordbook), node2),
-          primaryKey: wordbook.primary_key,
-          levelKey: wordbook.level_key,
-          keyword,
-          page: 1
+        const paramsAdaptorMap = {
+          autograph: () => autograph,
+          wordbookId: "id",
+          wordbookType: "type",
+          fieldKeys: () => wordbook.search_key ? JSON.stringify(wordbook.search_key) : void 0,
+          conObj: () => JSON.stringify(createConfigObject(wordbook, node2)),
+          primaryKey: "primary_key",
+          levelKey: "level_key",
+          keyword: () => keyword,
+          page: () => 1
         };
+        const params = Object.entries(paramsAdaptorMap).reduce((res, [k, v]) => {
+          res[k] = isString(v) ? wordbook[v] : isFunction(v) ? v() : void 0;
+          return res;
+        }, {});
         return {
           ...getSearchRequestInfo(),
           params,
@@ -169,21 +192,21 @@ const script = defineComponent({
       if (!getSearchRequestInfo().primaryKeyUrl)
         return [];
       try {
-        const params = createParams(props.wordbook, props.autograph, primaryKeys, fieldKey.value);
-        return await asyncQueue.addAsync(params);
+        return await asyncQueue.addAsync(createParams(props.wordbook, props.autograph, primaryKeys, fieldKey.value));
       } catch (e) {
         isString(e) && formRenderLog(e);
       }
       function createParams(wordbook, autograph, primaryKeys2, key2) {
         const requestInfo = getSearchRequestInfo();
+        const params = {
+          autograph,
+          tableId: wordbook.id,
+          primaryKeyValue: primaryKeys2.join(","),
+          page: 1
+        };
         return {
           key: key2,
-          params: {
-            autograph,
-            tableId: wordbook.id,
-            primaryKeyValue: primaryKeys2.join(","),
-            page: 1
-          },
+          params,
           ...requestInfo,
           url: requestInfo.primaryKeyUrl
         };
@@ -193,8 +216,8 @@ const script = defineComponent({
       const result = [];
       let current = node;
       while (current) {
-        result.unshift(node);
-        current = node.parent;
+        result.unshift(omit(current, ["parent", "isLeaf", "__keyword", "children"]));
+        current = current.parent;
       }
       return result;
     }
@@ -219,6 +242,8 @@ const script = defineComponent({
     return () => createVNode(SearchCascader, {
       "value": valueRef.value,
       "onUpdate:value": ($event) => valueRef.value = $event,
+      "show": showRef.value,
+      "onUpdate:show": ($event) => showRef.value = $event,
       "options": optionsRef.value,
       "key": key.value,
       "labelKey": labelKey.value,

package/es/components/search-cascader/index.d.ts

@@ -3,6 +3,10 @@ declare const SearchCascader: SFCWithInstall<import("vue").DefineComponent<{
     value: {
         type: import("vue").PropType<string | import("../../../es/shared/types").AnyObject[]>;
     };
+    show: {
+        type: BooleanConstructor;
+        default: boolean;
+    };
     clearable: {
         type: BooleanConstructor;
         default: boolean;
@@ -42,6 +46,10 @@ declare const SearchCascader: SFCWithInstall<import("vue").DefineComponent<{
         value: {
             type: import("vue").PropType<string | import("../../../es/shared/types").AnyObject[]>;
         };
+        show: {
+            type: BooleanConstructor;
+            default: boolean;
+        };
         clearable: {
             type: BooleanConstructor;
             default: boolean;
@@ -79,15 +87,16 @@ declare const SearchCascader: SFCWithInstall<import("vue").DefineComponent<{
     }>> & {
         onFocus?: ((...args: any[]) => any) | undefined;
         "onUpdate:value"?: ((...args: any[]) => any) | undefined;
+        "onUpdate:show"?: ((...args: any[]) => any) | undefined;
     }>>;
-    emits: (event: "update:value" | "focus", ...args: any[]) => void;
+    emits: (event: "update:value" | "update:show" | "focus", ...args: any[]) => void;
     emitValue: (value: string | import("../../../es/shared/types").AnyObject[]) => void;
     onClear: () => void;
     cssVariable: {
         '--menu-width': number;
     };
     uuid: string;
-    show: import("vue").Ref<boolean>;
+    show: import("vue").WritableComputedRef<boolean>;
     patternContent: import("vue").Ref<string>;
     displayValue: import("vue").WritableComputedRef<string>;
     onFocus: (focusEvt: Event) => void;
@@ -143,10 +152,14 @@ declare const SearchCascader: SFCWithInstall<import("vue").DefineComponent<{
         childKey: string;
         labelKey: string;
     }>;
-}, unknown, {}, {}, import("vue").ComponentOptionsMixin, import("vue").ComponentOptionsMixin, ("update:value" | "focus")[], "focus" | "update:value", import("vue").VNodeProps & import("vue").AllowedComponentProps & import("vue").ComponentCustomProps, Readonly<import("vue").ExtractPropTypes<{
+}, unknown, {}, {}, import("vue").ComponentOptionsMixin, import("vue").ComponentOptionsMixin, ("update:value" | "update:show" | "focus")[], "focus" | "update:value" | "update:show", import("vue").VNodeProps & import("vue").AllowedComponentProps & import("vue").ComponentCustomProps, Readonly<import("vue").ExtractPropTypes<{
     value: {
         type: import("vue").PropType<string | import("../../../es/shared/types").AnyObject[]>;
     };
+    show: {
+        type: BooleanConstructor;
+        default: boolean;
+    };
     clearable: {
         type: BooleanConstructor;
         default: boolean;
@@ -184,7 +197,9 @@ declare const SearchCascader: SFCWithInstall<import("vue").DefineComponent<{
 }>> & {
     onFocus?: ((...args: any[]) => any) | undefined;
     "onUpdate:value"?: ((...args: any[]) => any) | undefined;
+    "onUpdate:show"?: ((...args: any[]) => any) | undefined;
 }, {
+    show: boolean;
     options: import("../../../es/shared/types").AnyObject[];
     placeholder: string;
     valueKey: string;

package/es/components/search-cascader/src/SearchCascader.js

@@ -1,7 +1,7 @@
-import { defineComponent, ref, computed, provide, nextTick, openBlock, createBlock, unref, normalizeStyle, withCtx, createVNode, isRef, createElementVNode, renderSlot } from 'vue';
+import { defineComponent, computed, ref, provide, nextTick, openBlock, createBlock, unref, isRef, normalizeStyle, withCtx, createVNode, createElementVNode, renderSlot } from 'vue';
 import { uuidGenerator } from '../../../shared/utils/index2.js';
 import { onClickOutside, useDebounceFn } from '@vueuse/core';
-import { isString, isArray, isFunction } from 'lodash-es';
+import { isString, isArray, isFunction, isObject } from 'lodash-es';
 import { NPopover, NInput } from 'naive-ui';
 import { InjectionSearchCascaderLoadingNode } from './constants/index2.js';
 import { useCssVariable } from './hooks/useCssVariable2.js';
@@ -13,6 +13,7 @@ const _sfc_main = /* @__PURE__ */ defineComponent({
   __name: "SearchCascader",
   props: {
     value: { type: [String, Array] },
+    show: { type: Boolean, default: false },
     clearable: { type: Boolean, default: false },
     childKey: { type: String, default: "children" },
     placeholder: { type: String, default: "\u8BF7\u9009\u62E9" },
@@ -23,7 +24,7 @@ const _sfc_main = /* @__PURE__ */ defineComponent({
     valueKey: { type: String, default: "value" },
     beforeSetValue: { type: Function }
   },
-  emits: ["update:value", "focus"],
+  emits: ["update:value", "focus", "update:show"],
   setup(__props, { emit: emits }) {
     const props = __props;
     function emitValue(value) {
@@ -37,7 +38,14 @@ const _sfc_main = /* @__PURE__ */ defineComponent({
     }
     const cssVariable = useCssVariable();
     const uuid = uuidGenerator();
-    const show = ref(false);
+    const show = computed({
+      get() {
+        return props.show;
+      },
+      set(value) {
+        emits("update:show", value);
+      }
+    });
     const patternContent = ref("");
     const displayValue = computed({
       get() {
@@ -110,8 +118,8 @@ const _sfc_main = /* @__PURE__ */ defineComponent({
       var _a;
       try {
         loadingNode.value = node;
-        await (isFunction(props.search) && props.search(node, keyword));
-        currentNode.value = node;
+        const result = await (isFunction(props.search) && props.search(node, keyword));
+        currentNode.value = isObject(result) ? result : node;
       } finally {
         loadingNode.value = null;
         await nextTick();
@@ -122,8 +130,8 @@ const _sfc_main = /* @__PURE__ */ defineComponent({
       return openBlock(), createBlock(unref(NPopover), {
         class: "search-cascader",
         trigger: "manual",
-        show: show.value,
-        "onUpdate:show": _cache[1] || (_cache[1] = ($event) => show.value = $event),
+        show: unref(show),
+        "onUpdate:show": _cache[1] || (_cache[1] = ($event) => isRef(show) ? show.value = $event : null),
         "show-arrow": false,
         placement: "bottom-start",
         style: normalizeStyle(unref(cssVariable)),
@@ -133,7 +141,7 @@ const _sfc_main = /* @__PURE__ */ defineComponent({
       }, {
         trigger: withCtx(() => [
           createVNode(unref(NInput), {
-            placeholder: show.value ? __props.editPlaceholder : __props.placeholder,
+            placeholder: unref(show) ? __props.editPlaceholder : __props.placeholder,
             clearable: __props.clearable,
             onClear,
             value: unref(displayValue),

package/es/components/search-cascader/src/SearchCascader.vue.d.ts

@@ -5,6 +5,10 @@ declare const _default: import("vue").DefineComponent<{
     value: {
         type: PropType<ValueType>;
     };
+    show: {
+        type: BooleanConstructor;
+        default: boolean;
+    };
     clearable: {
         type: BooleanConstructor;
         default: boolean;
@@ -44,6 +48,10 @@ declare const _default: import("vue").DefineComponent<{
         value: {
             type: PropType<ValueType>;
         };
+        show: {
+            type: BooleanConstructor;
+            default: boolean;
+        };
         clearable: {
             type: BooleanConstructor;
             default: boolean;
@@ -81,15 +89,16 @@ declare const _default: import("vue").DefineComponent<{
     }>> & {
         onFocus?: ((...args: any[]) => any) | undefined;
         "onUpdate:value"?: ((...args: any[]) => any) | undefined;
+        "onUpdate:show"?: ((...args: any[]) => any) | undefined;
     }>>;
-    emits: (event: "update:value" | "focus", ...args: any[]) => void;
+    emits: (event: "update:value" | "update:show" | "focus", ...args: any[]) => void;
     emitValue: (value: ValueType) => void;
     onClear: () => void;
     cssVariable: {
         '--menu-width': number;
     };
     uuid: string;
-    show: import("vue").Ref<boolean>;
+    show: import("vue").WritableComputedRef<boolean>;
     patternContent: import("vue").Ref<string>;
     displayValue: import("vue").WritableComputedRef<string>;
     onFocus: (focusEvt: Event) => void;
@@ -145,10 +154,14 @@ declare const _default: import("vue").DefineComponent<{
         childKey: string;
         labelKey: string;
     }>;
-}, unknown, {}, {}, import("vue").ComponentOptionsMixin, import("vue").ComponentOptionsMixin, ("update:value" | "focus")[], "focus" | "update:value", import("vue").VNodeProps & import("vue").AllowedComponentProps & import("vue").ComponentCustomProps, Readonly<import("vue").ExtractPropTypes<{
+}, unknown, {}, {}, import("vue").ComponentOptionsMixin, import("vue").ComponentOptionsMixin, ("update:value" | "update:show" | "focus")[], "focus" | "update:value" | "update:show", import("vue").VNodeProps & import("vue").AllowedComponentProps & import("vue").ComponentCustomProps, Readonly<import("vue").ExtractPropTypes<{
     value: {
         type: PropType<ValueType>;
     };
+    show: {
+        type: BooleanConstructor;
+        default: boolean;
+    };
     clearable: {
         type: BooleanConstructor;
         default: boolean;
@@ -186,7 +199,9 @@ declare const _default: import("vue").DefineComponent<{
 }>> & {
     onFocus?: ((...args: any[]) => any) | undefined;
     "onUpdate:value"?: ((...args: any[]) => any) | undefined;
+    "onUpdate:show"?: ((...args: any[]) => any) | undefined;
 }, {
+    show: boolean;
     options: AnyObject[];
     placeholder: string;
     valueKey: string;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "cnhis-design-vue",
-  "version": "3.1.23-beta.12",
+  "version": "3.1.23-beta.14",
   "license": "ISC",
   "module": "./es/components/index.js",
   "main": "./es/components/index.js",
@@ -66,5 +66,5 @@
     "iOS 7",
     "last 3 iOS versions"
   ],
-  "gitHead": "f819538beb54e1a0cac4986b22568eadb3331662"
+  "gitHead": "112bf14c5aaabbb89b6c5d96e1d89bbbd4158e19"
 }