cnhis-design-vue 3.1.32 → 3.1.33-beta.0

package/es/components/recommend-search/src/components/RecommendMenu.vue.js

@@ -7,12 +7,12 @@ import _export_sfc from '../../../../_virtual/plugin-vue_export-helper.js';
 const _hoisted_1 = { class: "recommend-search__menuRecommend" };
 const _hoisted_2 = {
   key: 0,
-  class: "recommend-search__recentRecommend"
+  class: "recommend-search__commonRecommend"
 };
 const _hoisted_3 = { class: "recommend-search__menuRecommendList" };
 const _hoisted_4 = {
   key: 1,
-  class: "recommend-search__commonRecommend"
+  class: "recommend-search__recentRecommend"
 };
 const _hoisted_5 = { class: "recommend-search__menuRecommendList" };
 const _sfc_main = /* @__PURE__ */ defineComponent({
@@ -45,20 +45,20 @@ const _sfc_main = /* @__PURE__ */ defineComponent({
     }
     return (_ctx, _cache) => {
       return openBlock(), createElementBlock("section", _hoisted_1, [
-        __props.commonList.length ? (openBlock(), createElementBlock("section", _hoisted_2, [
+        __props.recentList.length ? (openBlock(), createElementBlock("section", _hoisted_2, [
           createElementVNode("header", null, [
-            createTextVNode(" \u5E38\u7528\u641C\u7D22 "),
+            createTextVNode(" \u6700\u8FD1\u641C\u7D22 "),
             __props.deletable ? (openBlock(), createBlock(unref(NIcon), {
               key: 0,
               component: unref(TrashOutline),
-              onClick: deleteRecentTag
+              onClick: deleteCommonTag
             }, null, 8, ["component"])) : createCommentVNode("v-if", true)
           ]),
           createElementVNode("div", _hoisted_3, [
-            (openBlock(true), createElementBlock(Fragment, null, renderList(__props.commonList, (item) => {
+            (openBlock(true), createElementBlock(Fragment, null, renderList(__props.recentList, (item) => {
               return openBlock(), createBlock(unref(NTag), {
                 size: "small",
-                onClick: ($event) => clickCommonTag(item),
+                onClick: ($event) => clickRecentTag(item),
                 type: "primary",
                 key: item.itemObj
               }, {
@@ -70,20 +70,20 @@ const _sfc_main = /* @__PURE__ */ defineComponent({
             }), 128))
           ])
         ])) : createCommentVNode("v-if", true),
-        __props.recentList.length ? (openBlock(), createElementBlock("section", _hoisted_4, [
+        __props.commonList.length ? (openBlock(), createElementBlock("section", _hoisted_4, [
           createElementVNode("header", null, [
-            createTextVNode(" \u6700\u8FD1\u641C\u7D22 "),
+            createTextVNode(" \u5E38\u7528\u641C\u7D22 "),
             __props.deletable ? (openBlock(), createBlock(unref(NIcon), {
               key: 0,
               component: unref(TrashOutline),
-              onClick: deleteCommonTag
+              onClick: deleteRecentTag
             }, null, 8, ["component"])) : createCommentVNode("v-if", true)
           ]),
           createElementVNode("div", _hoisted_5, [
-            (openBlock(true), createElementBlock(Fragment, null, renderList(__props.recentList, (item) => {
+            (openBlock(true), createElementBlock(Fragment, null, renderList(__props.commonList, (item) => {
               return openBlock(), createBlock(unref(NTag), {
                 size: "small",
-                onClick: ($event) => clickRecentTag(item),
+                onClick: ($event) => clickCommonTag(item),
                 type: "primary",
                 key: item.itemObj
               }, {

package/es/components/recommend-search/src/components/RecommendSelect.vue.d.ts

@@ -79,7 +79,6 @@ declare const _default: import("vue").DefineComponent<{
     showRef: import("vue").Ref<boolean>;
     displayPlaceholder: import("vue").ComputedRef<string>;
     currentOption: import("vue").Ref<AnyObject | undefined>;
-    jsonParse: import("@vueuse/core").UseMemoizedFn<any, [value: string]>;
     getRecommendOption: (item: RecommendItem) => any;
     commonOptions: import("vue").ComputedRef<any[]>;
     recentOptions: import("vue").ComputedRef<any[]>;

package/es/components/recommend-search/src/components/RecommendSelect.vue.js

@@ -1,6 +1,7 @@
 import { defineComponent, ref, computed, openBlock, createElementBlock, createVNode, mergeProps, unref, isRef, withCtx, createElementVNode, normalizeProps, guardReactiveProps, Fragment, renderList, normalizeClass, toDisplayString, createBlock, createCommentVNode, renderSlot } from 'vue';
+import { jsonParse } from '../../../../shared/utils/index.js';
 import { Checkmark } from '@vicons/ionicons5';
-import { useMemoize, useVModel, useVirtualList } from '@vueuse/core';
+import { useVModel, useVirtualList } from '@vueuse/core';
 import { isObject } from 'lodash-es';
 import BaseSearch from './BaseSearch.vue.js';
 import { NIcon } from 'naive-ui';
@@ -30,16 +31,6 @@ const _sfc_main = /* @__PURE__ */ defineComponent({
       return showRef.value ? props.editPlaceholder : props.placeholder;
     });
     const currentOption = ref();
-    const jsonParse = useMemoize(
-      (value) => {
-        try {
-          return JSON.parse(value);
-        } catch (e) {
-          return {};
-        }
-      },
-      { getKey: (value) => value }
-    );
     function getRecommendOption(item) {
       return jsonParse(item.itemObj);
     }

package/es/shared/utils/index.d.ts

@@ -12,3 +12,4 @@ export declare function separateMetaModule<T extends AnyObject>(modules: Record<
 export declare function findAncestor(ele: HTMLElement | null, finder: (ele: HTMLElement) => boolean): HTMLElement | null;
 export declare function widthAppend(value: string | number, append?: string): string;
 export declare function targetStringIncludes(arr: string[], target: string): boolean;
+export declare const jsonParse: import("@vueuse/core").UseMemoizedFn<any, [value: string]>;

package/es/shared/utils/index.js

@@ -139,5 +139,15 @@ function widthAppend(value, append = "px") {
 function targetStringIncludes(arr, target) {
   return arr.some((value) => target.includes(value));
 }
+const jsonParse = useMemoize(
+  (value) => {
+    try {
+      return JSON.parse(value);
+    } catch (e) {
+      return {};
+    }
+  },
+  { getKey: (value) => value }
+);
 
-export { DMZ, arrayed, deepOmit, findAncestor, generateTimeFormat, getStringWidth, safeComponentRegister, separateMetaModule, targetStringIncludes, traverse, uuidGenerator, widthAppend };
+export { DMZ, arrayed, deepOmit, findAncestor, generateTimeFormat, getStringWidth, jsonParse, safeComponentRegister, separateMetaModule, targetStringIncludes, traverse, uuidGenerator, widthAppend };

package/package.json

@@ -1,6 +1,6 @@
 {
 	"name": "cnhis-design-vue",
-	"version": "3.1.32",
+	"version": "3.1.33-beta.0",
 	"license": "ISC",
 	"module": "./es/components/index.js",
 	"main": "./es/components/index.js",
@@ -61,5 +61,5 @@
 		"iOS 7",
 		"last 3 iOS versions"
 	],
-	"gitHead": "2aef54bde794e488a37c8447b18c442bb402d3d6"
+	"gitHead": "772c8fae6e11c1010a9b1c3e1e047de233ad2ad3"
 }

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

@@ -1 +0,0 @@
-export declare const LABEL: import("vue").DefineComponent<{}, () => string, {}, {}, {}, import("vue").ComponentOptionsMixin, import("vue").ComponentOptionsMixin, {}, string, import("vue").VNodeProps & import("vue").AllowedComponentProps & import("vue").ComponentCustomProps, Readonly<import("vue").ExtractPropTypes<{}>>, {}>;

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

@@ -1,18 +0,0 @@
-import { connect, mapProps } from '@formily/vue';
-import { defineComponent } from 'vue';
-
-const script = defineComponent({
-  name: "FormLabel",
-  setup(props) {
-    return () => {
-      return "";
-    };
-  }
-});
-const LABEL = connect(script, mapProps((props, field) => {
-  return {
-    ...props
-  };
-}));
-
-export { LABEL };

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

@@ -1,131 +0,0 @@
-import { AnyObject } from '../../../../../../es/shared/types';
-import { PropType } from 'vue';
-import { RecommendIds } from '../../../../../../es/components/form-render';
-export declare const RECOMMEND_SELECT: import("vue").DefineComponent<{
-    value: {
-        type: StringConstructor;
-    };
-    commonList: {
-        type: PropType<AnyObject[]>;
-    };
-    recentList: {
-        type: PropType<AnyObject[]>;
-    };
-    options: {
-        type: PropType<AnyObject[]>;
-        default: () => never[];
-    };
-    autograph: {
-        type: StringConstructor;
-    };
-    lazyRequest: {
-        type: BooleanConstructor;
-        default: boolean;
-    };
-    requestCache: {
-        type: BooleanConstructor;
-        default: boolean;
-    };
-    wordbook: {
-        type: PropType<Partial<{
-            level_num: number;
-            id: string;
-            name: string;
-            render_key: string[];
-            search_key: string[];
-            primary_key: string;
-            type: string;
-            value_key: string;
-            level_key: string;
-            link_key: string;
-            link_key_split: string;
-            show_key: string[];
-            conObj: AnyObject[];
-            conObjFirstLevel: AnyObject[];
-        }>>;
-    };
-    getRecommendInfo: {
-        type: PropType<() => RecommendIds>;
-    };
-    recommendNum: {
-        type: NumberConstructor;
-        default: number;
-    };
-    recommendCache: {
-        type: BooleanConstructor;
-        default: boolean;
-    };
-    recommendDeletable: {
-        type: BooleanConstructor;
-        default: boolean;
-    };
-}, () => JSX.Element, unknown, {}, {}, import("vue").ComponentOptionsMixin, import("vue").ComponentOptionsMixin, ("update:value" | "postRecommend" | "deleteRecommend")[], "update:value" | "postRecommend" | "deleteRecommend", import("vue").VNodeProps & import("vue").AllowedComponentProps & import("vue").ComponentCustomProps, Readonly<import("vue").ExtractPropTypes<{
-    value: {
-        type: StringConstructor;
-    };
-    commonList: {
-        type: PropType<AnyObject[]>;
-    };
-    recentList: {
-        type: PropType<AnyObject[]>;
-    };
-    options: {
-        type: PropType<AnyObject[]>;
-        default: () => never[];
-    };
-    autograph: {
-        type: StringConstructor;
-    };
-    lazyRequest: {
-        type: BooleanConstructor;
-        default: boolean;
-    };
-    requestCache: {
-        type: BooleanConstructor;
-        default: boolean;
-    };
-    wordbook: {
-        type: PropType<Partial<{
-            level_num: number;
-            id: string;
-            name: string;
-            render_key: string[];
-            search_key: string[];
-            primary_key: string;
-            type: string;
-            value_key: string;
-            level_key: string;
-            link_key: string;
-            link_key_split: string;
-            show_key: string[];
-            conObj: AnyObject[];
-            conObjFirstLevel: AnyObject[];
-        }>>;
-    };
-    getRecommendInfo: {
-        type: PropType<() => RecommendIds>;
-    };
-    recommendNum: {
-        type: NumberConstructor;
-        default: number;
-    };
-    recommendCache: {
-        type: BooleanConstructor;
-        default: boolean;
-    };
-    recommendDeletable: {
-        type: BooleanConstructor;
-        default: boolean;
-    };
-}>> & {
-    "onUpdate:value"?: ((...args: any[]) => any) | undefined;
-    onPostRecommend?: ((...args: any[]) => any) | undefined;
-    onDeleteRecommend?: ((...args: any[]) => any) | undefined;
-}, {
-    options: AnyObject[];
-    lazyRequest: boolean;
-    requestCache: boolean;
-    recommendDeletable: boolean;
-    recommendNum: number;
-    recommendCache: boolean;
-}>;

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

@@ -1,213 +0,0 @@
-import { defineComponent, inject, createVNode, ref, computed } from 'vue';
-import { connect, mapProps } from '@formily/vue';
-import { useVModel } from '@vueuse/core';
-import { isFunction, omit } from 'lodash-es';
-import '../../../index.js';
-import { InjectionAsyncQueue } from '../../constants/index.js';
-import RecommendSearch from '../../../../recommend-search/index.js';
-import { useFormField } from '../../hooks/useFormField.js';
-import { useAutographOptions } from '../../hooks/useAutographOptions.js';
-import { assignUpdateValue, assignClearBindVisited } from '../../utils/schema.js';
-import { useCommonInjection } from '../../hooks/useCommonInjection.js';
-import { useFormRequest } from '../../hooks/useFormRequest.js';
-
-function createPropRef(props, key) {
-  const _list = ref();
-  return computed({
-    get() {
-      if (_list.value)
-        return _list.value;
-      return props[key];
-    },
-    set(value) {
-      _list.value = value;
-    }
-  });
-}
-const script = defineComponent({
-  name: "FormRecommendSearch",
-  props: {
-    value: {
-      type: String
-    },
-    commonList: {
-      type: Array
-    },
-    recentList: {
-      type: Array
-    },
-    options: {
-      type: Array,
-      default: () => []
-    },
-    autograph: {
-      type: String
-    },
-    lazyRequest: {
-      type: Boolean,
-      default: false
-    },
-    requestCache: {
-      type: Boolean,
-      default: true
-    },
-    wordbook: {
-      type: Object
-    },
-    getRecommendInfo: {
-      type: Function
-    },
-    recommendNum: {
-      type: Number,
-      default: 5
-    },
-    recommendCache: {
-      type: Boolean,
-      default: false
-    },
-    recommendDeletable: {
-      type: Boolean,
-      default: true
-    }
-  },
-  emits: ["update:value", "postRecommend", "deleteRecommend"],
-  setup(props, {
-    emit
-  }) {
-    const valueRef = useVModel(props, "value", emit);
-    const {
-      fieldKey
-    } = useFormField();
-    const {
-      labelKey,
-      valueKey,
-      options,
-      fetchData: fetchOptions
-    } = useAutographOptions(props, valueRef);
-    const commonListRef = createPropRef(props, "commonList");
-    const recentListRef = createPropRef(props, "recentList");
-    const asyncQueue = inject(InjectionAsyncQueue);
-    const {
-      getRecommendRequestInfo,
-      getHttpInstance
-    } = useFormRequest();
-    function getRecommendConfig(type) {
-      const {
-        url,
-        getRecommendIds
-      } = getRecommendRequestInfo();
-      const globInfo = isFunction(getRecommendIds) ? getRecommendIds() : {};
-      const widgetInfo = isFunction(props.getRecommendInfo) ? props.getRecommendInfo() : {};
-      return {
-        url: url[type],
-        info: Object.assign({}, globInfo, widgetInfo)
-      };
-    }
-    async function getRecommend() {
-      if (commonListRef.value && recentListRef.value && props.recommendCache)
-        return;
-      const list = await asyncQueue.addAsync(createParams(fieldKey.value, props.recommendCache));
-      const {
-        commonly,
-        recently
-      } = classifyList(list);
-      commonListRef.value = commonly;
-      recentListRef.value = recently;
-      function classifyList(list2) {
-        return list2.reduce((res, item) => {
-          if (item.type === "commonly") {
-            res.commonly.push(omit(item, ["type"]));
-          } else if (item.type === "recently") {
-            res.recently.push(omit(item, ["type"]));
-          }
-          return res;
-        }, {
-          commonly: [],
-          recently: []
-        });
-      }
-      function createParams(key2, cache) {
-        const {
-          url,
-          info
-        } = getRecommendConfig("get");
-        return {
-          url,
-          method: "get",
-          key: key2,
-          cache,
-          params: {
-            ...info,
-            recNum: props.recommendNum,
-            keyword: ""
-          }
-        };
-      }
-    }
-    async function postRecommend({
-      option
-    }) {
-      const http = getHttpInstance();
-      if (!http)
-        return;
-      const {
-        url,
-        info
-      } = getRecommendConfig("post");
-      emit("postRecommend", await http.post(url, {
-        ...info,
-        keyword: "",
-        itemId: valueKey.value,
-        itemObj: JSON.stringify(option)
-      }));
-    }
-    async function deleteRecommend(recType) {
-      const http = getHttpInstance();
-      if (!http)
-        return;
-      const {
-        url,
-        info
-      } = getRecommendConfig("delete");
-      if (recType === "COMMONLY")
-        commonListRef.value = [];
-      else if (recType === "RECENTLY")
-        recentListRef.value = [];
-      emit("deleteRecommend", await http.delete(url, {
-        ...info,
-        keyword: "",
-        recType
-      }));
-    }
-    async function fetchData(content = "") {
-      fetchOptions(content);
-      getRecommend();
-    }
-    const {
-      injectValueBindKey
-    } = useCommonInjection();
-    const key = injectValueBindKey(valueRef);
-    return () => {
-      return createVNode(RecommendSearch, {
-        "mode": "select",
-        "value": valueRef.value,
-        "onUpdate:value": ($event) => valueRef.value = $event,
-        "label-key": labelKey.value,
-        "value-key": valueKey.value,
-        "key": key.value,
-        "options": options.value,
-        "common-list": commonListRef.value,
-        "recent-list": recentListRef.value,
-        "recommend-deletable": props.recommendDeletable,
-        "onSearch": fetchData,
-        "onChoose": postRecommend,
-        "onDelete": deleteRecommend
-      }, null);
-    };
-  }
-});
-const RECOMMEND_SELECT = connect(script, mapProps({
-  dataSource: "options"
-}, assignUpdateValue, assignClearBindVisited));
-
-export { RECOMMEND_SELECT };

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

@@ -1,86 +0,0 @@
-import { Func } from '../../../../../../es/shared/types';
-import { PropType } from 'vue';
-export declare const SEARCH: import("vue").DefineComponent<{
-    value: {
-        type: StringConstructor;
-    };
-    autograph: {
-        type: StringConstructor;
-        required: true;
-    };
-    lazyRequest: {
-        type: BooleanConstructor;
-        default: boolean;
-    };
-    requestCache: {
-        type: BooleanConstructor;
-        default: boolean;
-    };
-    wordbook: {
-        type: PropType<Partial<{
-            level_num: number;
-            id: string;
-            name: string;
-            render_key: string[];
-            search_key: string[];
-            primary_key: string;
-            type: string;
-            value_key: string;
-            level_key: string;
-            link_key: string;
-            link_key_split: string;
-            show_key: string[];
-            conObj: import("../../../../../../es/shared/types").AnyObject[];
-            conObjFirstLevel: import("../../../../../../es/shared/types").AnyObject[];
-        }>>;
-        required: true;
-    };
-    onFocus: {
-        type: PropType<Func<any[], any>>;
-    };
-    onChange: {};
-}, () => JSX.Element, unknown, {}, {}, import("vue").ComponentOptionsMixin, import("vue").ComponentOptionsMixin, "update:value"[], "update:value", import("vue").VNodeProps & import("vue").AllowedComponentProps & import("vue").ComponentCustomProps, Readonly<import("vue").ExtractPropTypes<{
-    value: {
-        type: StringConstructor;
-    };
-    autograph: {
-        type: StringConstructor;
-        required: true;
-    };
-    lazyRequest: {
-        type: BooleanConstructor;
-        default: boolean;
-    };
-    requestCache: {
-        type: BooleanConstructor;
-        default: boolean;
-    };
-    wordbook: {
-        type: PropType<Partial<{
-            level_num: number;
-            id: string;
-            name: string;
-            render_key: string[];
-            search_key: string[];
-            primary_key: string;
-            type: string;
-            value_key: string;
-            level_key: string;
-            link_key: string;
-            link_key_split: string;
-            show_key: string[];
-            conObj: import("../../../../../../es/shared/types").AnyObject[];
-            conObjFirstLevel: import("../../../../../../es/shared/types").AnyObject[];
-        }>>;
-        required: true;
-    };
-    onFocus: {
-        type: PropType<Func<any[], any>>;
-    };
-    onChange: {};
-}>> & {
-    "onUpdate:value"?: ((...args: any[]) => any) | undefined;
-}, {
-    lazyRequest: boolean;
-    requestCache: boolean;
-}>;