cnhis-design-vue 3.1.12-beta.7 → 3.1.13-beta.1

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

@@ -21,6 +21,9 @@ const script = defineComponent({
     urlConfig: {
       type: Object
     },
+    onFocus: {
+      type: Function
+    },
     onChange: {},
     value: {}
   },
@@ -30,15 +33,12 @@ const script = defineComponent({
     emit
   }) {
     const _options = ref(null);
-    const {
-      title
-    } = useFormField();
     const asyncQueue = inject(InjectAsyncQueue);
     const {
-      field
+      field,
+      title
     } = useFormField();
     async function fetchData(option) {
-      var _a;
       if (!option && _options.value)
         return;
       const config = props.urlConfig;
@@ -48,56 +48,63 @@ const script = defineComponent({
         formRenderLog(`invalid urlConfig (${config}) in CASCADER => ${title.value}`, "warn");
         return;
       }
-      if ((option == null ? void 0 : option.depth) + 1 >= props.deep)
+      if (deepFor(option) + 1 >= props.deep)
         return;
-      const parentDepth = (_a = option == null ? void 0 : option.depth) != null ? _a : -1;
-      const params = {
-        lvlnr: parentDepth + 1 + ""
-      };
-      if (option) {
-        if (!config.dependKey) {
-          formRenderLog(`invalid urlConfig.dependKey ${config.dependKey} in CASCADER => ${title.value}`, "warn");
-          return;
-        }
-        arrayed(config.dependKey).forEach((key) => {
-          if (isString(key)) {
-            params[key] = option[valueKey.value];
-          } else if (isObject(key)) {
-            params[key.paramName] = option[key.paramValue];
-          }
-        });
-      }
       let data = await asyncQueue.addAsync({
-        ...config,
-        key: title.value,
-        params
+        ...createRequestParams(deepFor(option), config, option),
+        key: title.value
       });
       if (!Array.isArray(data)) {
         data = [];
       }
       if (!data.length && isObject(option)) {
         option.isLeaf = true;
-        let currentOption = option;
-        const result2 = [option];
+        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) {
+        const params = {
+          lvlnr: deep + 1 + ""
+        };
+        if (option2 && config2.dependKey) {
+          arrayed(config2.dependKey).forEach((key) => {
+            if (isString(key)) {
+              params[key] = option2[valueKey.value];
+            } else if (isObject(key)) {
+              params[key.paramName] = option2[key.paramValue];
+            }
+          });
+        }
+        return {
+          params,
+          ...config2
+        };
+      }
+      function getOptionChain(option2) {
+        let currentOption = option2;
+        const result2 = [option2];
         while (currentOption.parent) {
           result2.unshift(currentOption.parent);
           currentOption = currentOption.parent;
         }
-        updateValue(null, null, result2);
-        show.value = false;
-        return;
+        return result2;
       }
-      const result = data.reduce((res, d) => {
-        res.push({
-          [labelKey.value]: d[labelKey.value],
-          [valueKey.value]: d[valueKey.value],
-          depth: parentDepth + 1,
+      function optionNormalize(data2, deep) {
+        return {
+          [labelKey.value]: data2[labelKey.value],
+          [valueKey.value]: data2[valueKey.value],
+          depth: deep + 1,
           parent: option,
-          isLeaf: parentDepth + 2 >= props.deep
-        });
-        return res;
-      }, []);
-      option ? option.children = result : _options.value = result;
+          isLeaf: deep + 2 >= props.deep
+        };
+      }
     }
     const renderOptions = computed(() => {
       return _options.value || props.options || [];
@@ -134,23 +141,28 @@ const script = defineComponent({
       }
     });
     function updateValue(_, __, options) {
-      const payload = Array.isArray(options) ? options.map((option) => ({
-        ...option,
-        label: option[labelKey.value],
-        children: void 0,
-        parent: void 0
-      })) : options;
-      emit("update:value", payload);
+      emit("update:value", options.map(optionSimplify));
+      function optionSimplify(option) {
+        return {
+          ...option,
+          label: option[labelKey.value],
+          children: void 0,
+          parent: void 0
+        };
+      }
     }
     const show = ref(false);
     function updateShow(v) {
       show.value = !!v;
       v && fetchData();
     }
-    function onFocus() {
-      if (isField(field.value)) {
-        field.value.visited = true;
-      }
+    function focusDecorator(onFocus) {
+      return (...args) => {
+        if (isField(field.value)) {
+          field.value.visited = true;
+        }
+        onFocus == null ? void 0 : onFocus(...args);
+      };
     }
     return () => {
       return createVNode(NCascader, {
@@ -163,7 +175,7 @@ const script = defineComponent({
         "options": renderOptions.value,
         "checkStrategy": "child",
         "onLoad": fetchData,
-        "onFocus": onFocus,
+        "onFocus": focusDecorator(props.onFocus),
         "onUpdate:show": updateShow
       }, slots);
     };

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

@@ -1,4 +1,4 @@
-import { AnyObject } from '../../../../../../es/src/types';
+import { AnyObject, Func } from '../../../../../../es/src/types';
 import { FormRequestType } from '../../types';
 import { PropType } from 'vue';
 declare type UrlConfig = {
@@ -20,9 +20,10 @@ export declare const SELECT: import("vue").DefineComponent<{
     urlConfig: {
         type: PropType<UrlConfig>;
     };
-    onChange: {
-        type: FunctionConstructor;
+    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;
@@ -34,9 +35,10 @@ export declare const SELECT: import("vue").DefineComponent<{
     urlConfig: {
         type: PropType<UrlConfig>;
     };
-    onChange: {
-        type: FunctionConstructor;
+    onFocus: {
+        type: PropType<Func<any[], any>>;
     };
+    onChange: {};
 }>> & {
     "onUpdate:value"?: ((...args: any[]) => any) | undefined;
 }, {

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

@@ -1,4 +1,4 @@
-import { defineComponent, ref, inject, computed, watch, createVNode } from 'vue';
+import { defineComponent, ref, inject, computed, watch, nextTick, createVNode } from 'vue';
 import { isField } from '@formily/core';
 import { cloneDeep } from 'lodash-es';
 import { InjectAsyncQueue, InjectionFormItemDepsCollector, InjectionChangeContextCollector } from '../../constants/index.js';
@@ -21,17 +21,17 @@ const script = defineComponent({
     urlConfig: {
       type: Object
     },
-    onChange: {
+    onFocus: {
       type: Function
-    }
+    },
+    onChange: {}
   },
   emits: ["update:value"],
   setup(props, {
     slots,
     emit
   }) {
-    const _options = ref(null);
-    let cachedOptions = null;
+    const remoteOptions = ref(null);
     const lastSearch = ref("");
     const asyncQueue = inject(InjectAsyncQueue);
     const {
@@ -45,54 +45,46 @@ const script = defineComponent({
       });
     }
     async function fetchData(content) {
-      if (content === lastSearch.value) {
-        if (cachedOptions)
-          return;
-      } else {
-        lastSearch.value = content || "";
-      }
+      lastSearch.value = content || "";
+      if (remoteOptions.value)
+        return;
       const config = props.urlConfig;
       if (!config) {
-        return cachedOptions = _options.value = null;
+        return remoteOptions.value = null;
       }
       if (!isObject(config)) {
         formRenderLog(`invalid urlConfig (${config}) in SELECT => ${title.value}`, "warn");
-        return cachedOptions = _options.value = null;
-      }
-      if (cachedOptions) {
-        return _options.value = filterOption(cachedOptions, content);
+        return remoteOptions.value = null;
       }
       try {
-        const data = await asyncQueue.addAsync({
-          ...config,
-          key: title.value,
-          params: Object.assign({}, config.params, generateUrlParams(field.value, config.dependKey))
+        remoteOptions.value = await asyncQueue.addAsync({
+          ...createParams(config, field.value),
+          key: title.value
         });
-        _options.value = data.reduce((res, d) => {
-          var _a;
-          if (((_a = d[labelKey.value]) == null ? void 0 : _a.includes(content)) || !content) {
-            res.push(d);
-          }
-          return res;
-        }, []);
-        cachedOptions = _options.value;
       } catch (e) {
-        _options.value = null;
+        remoteOptions.value = null;
+      }
+      function createParams(config2, field2) {
+        return {
+          ...config2,
+          params: Object.assign({}, config2.params, generateUrlParams(field2, config2.dependKey))
+        };
       }
     }
     const parsedOptions = computed(() => {
-      if (_options.value)
-        return _options.value;
+      if (remoteOptions.value)
+        return filterOption(remoteOptions.value, lastSearch.value);
       if (!Array.isArray(props.options))
         return [];
       return filterOption(props.options, lastSearch.value);
     });
     const formItemDepsCollector = inject(InjectionFormItemDepsCollector);
     watch(() => props.urlConfig, (config) => {
-      cachedOptions = null;
-      config && formItemDepsCollector.setDeps(fieldKey.value, config.dependKey || [], () => {
-        cachedOptions = null;
-        props.value && fetchData();
+      remoteOptions.value = null;
+      config && formItemDepsCollector.setDeps(fieldKey.value, config.dependKey || [], async () => {
+        remoteOptions.value = null;
+        await nextTick();
+        props.value != null && await fetchData();
       });
     }, {
       immediate: true
@@ -121,10 +113,13 @@ const script = defineComponent({
       var _a, _b;
       return (_b = (_a = props.urlConfig) == null ? void 0 : _a.valueKey) != null ? _b : "value";
     });
-    function onFocus() {
-      if (isField(field.value)) {
-        field.value.visited = true;
-      }
+    function focusDecorator(onFocus) {
+      return (...args) => {
+        if (isField(field.value)) {
+          field.value.visited = true;
+        }
+        return onFocus == null ? void 0 : onFocus(...args);
+      };
     }
     return () => createVNode(NSelect, {
       "value": props.value,
@@ -135,7 +130,7 @@ const script = defineComponent({
       "valueField": valueKey.value,
       "onSearch": fetchData,
       "onUpdate:show": (show) => show && fetchData(),
-      "onFocus": onFocus,
+      "onFocus": focusDecorator(props.onFocus),
       "options": parsedOptions.value
     }, slots);
   }

package/es/packages/scale-view/src/hooks/scaleview-computed.js

@@ -120,12 +120,7 @@ const ScaleViewComputed = (props, state, config) => {
   const showAnswerParse = computed(() => (item) => {
     var _a;
     let { evaluateAnswer, checkAnswerMode, evaluateStartTime, evaluateTime } = ((_a = state.config) == null ? void 0 : _a.evaluateResultSetting) || {};
-    let arr = [
-      "EVALUATE_RADIO_BLOCK",
-      "EVALUATE_CHECKBOX_BLOCK",
-      "EVALUATE_SELECT",
-      "EVALUATE_INPUT"
-    ];
+    let arr = ["EVALUATE_RADIO_BLOCK", "EVALUATE_CHECKBOX_BLOCK", "EVALUATE_SELECT", "EVALUATE_INPUT"];
     let maxScore = (item == null ? void 0 : item.scoreConfigs) || 0;
     let isShow = evaluateAnswer && state.isFinished && arr.includes(item.type) && maxScore;
     if (!evaluateStartTime || !evaluateTime || checkAnswerMode && checkAnswerMode == 1) {
@@ -179,12 +174,12 @@ const ScaleViewComputed = (props, state, config) => {
     };
   });
   const comProsMap = {
-    "RSelectCom": selectProps.value,
-    "RCascaderCom": cascaderProps.value,
-    "RUploadCom": uploadProps.value,
-    "RMapCom": mapProps.value,
-    "RVodChunkUploadCom": vodChunkUploadProps.value,
-    "CSelectLabelCom": selectLabelProps.value
+    RSelectCom: selectProps.value,
+    RCascaderCom: cascaderProps.value,
+    RUploadCom: uploadProps.value,
+    RMapCom: mapProps.value,
+    RVodChunkUploadCom: vodChunkUploadProps.value,
+    CSelectLabelCom: selectLabelProps.value
   };
   const propsConfig = computed(() => (item, index) => {
     var _a;

package/es/packages/scale-view/src/hooks/scaleview-init.js

@@ -10,12 +10,7 @@ import { useDialog } from 'naive-ui';
 const ScaleViewInit = (props, state, emit, config) => {
   const dialog = useDialog();
   const { setNoData } = useNoData();
-  const {
-    hasEvaluateResultSetting,
-    hasparamsEvaluate,
-    hasDefault,
-    formKey
-  } = ScaleViewComputed(props, state, config);
+  const { hasEvaluateResultSetting, hasparamsEvaluate, hasDefault, formKey } = ScaleViewComputed(props, state, config);
   const { formatRules } = ScaleViewValidate(props, state, config);
   const { nextLogicEvent } = useEvent(props, state);
   const setEvaluateStartTime = (evaluateResultSetting) => {

package/package.json

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