pro-design-vue 1.2.18 → 1.2.19

package/dist/index.full.js

@@ -1,4 +1,4 @@
-/*! Pro Design Vue v1.2.18 */
+/*! Pro Design Vue v1.2.19 */
 
 (function (global, factory) {
   typeof exports === 'object' && typeof module !== 'undefined' ? factory(exports, require('ant-design-vue'), require('vue'), require('ant-design-vue/es/locale/zh_CN.js')) :
@@ -32,7 +32,7 @@
   const DEFAULT_NAMESPACE = "pro";
   const DEFAULT_LOCALE = "zh-CN";
 
-  const version$1 = "1.2.18";
+  const version$1 = "1.2.19";
 
   const makeInstaller = (components = []) => {
     const install = (app) => {
@@ -14424,19 +14424,22 @@
     });
     return enumArray;
   };
-  const formatOptions = (options) => {
+  const formatOptions = (options, fieldNames) => {
     return options == null ? void 0 : options.map((opt) => {
       if (!isObject$4(opt)) {
         return { label: opt, value: opt };
       }
+      opt.label = opt[fieldNames.label];
+      opt.value = opt[fieldNames.value];
+      opt.children = opt[fieldNames.children];
       if (opt == null ? void 0 : opt.text) {
         opt.label = opt == null ? void 0 : opt.text;
       }
       if (Array.isArray(opt.options) && opt.options.length) {
-        opt.options = formatOptions(opt.options);
+        opt.options = formatOptions(opt.options, fieldNames);
       }
       if (Array.isArray(opt.children) && opt.children.length) {
-        opt.children = formatOptions(opt.children);
+        opt.children = formatOptions(opt.children, fieldNames);
       }
       return opt;
     });
@@ -14457,7 +14460,7 @@
     const runOptions = vue.computed(() => runFunction(options, formData.value, rowData == null ? void 0 : rowData.value));
     const mergeOptions = vue.ref([]);
     const fieldNames = vue.computed(() => {
-      return fieldNamesConfig != null ? fieldNamesConfig : { label: "label", value: "value", children: "children" };
+      return { label: "label", value: "value", children: "children", ...fieldNamesConfig };
     });
     const [innerParams, setInnerParams] = useState(
       () => {
@@ -14496,7 +14499,7 @@
       () => {
         var _a;
         if (Array.isArray(runOptions.value) && ((_a = runOptions.value) == null ? void 0 : _a.length) > 0) {
-          mergeOptions.value = formatOptions(runOptions.value);
+          mergeOptions.value = formatOptions(runOptions.value, fieldNames.value);
         } else {
           const optionsEnum = runFunction(valueEnum, formData.value);
           mergeOptions.value = fieldParsingValueEnumToArray(optionsEnum);
@@ -14508,48 +14511,10 @@
     );
     const fetchData = useFetchData$1({ request });
     const requestOptions = debounce(async () => {
-      var _a;
       loading.value = true;
       const result = await fetchData(mergeParams.value, index == null ? void 0 : index.value);
       if (Array.isArray(result)) {
-        mergeOptions.value = result.map((opt) => {
-          if (opt == null ? void 0 : opt.text) {
-            opt.label = opt == null ? void 0 : opt.text;
-          }
-          return opt;
-        });
-      } else if (isObject$4(result)) {
-        const { success, total: dataTotal, data } = result;
-        if (success) {
-          if (paginationConfig == null ? void 0 : paginationConfig.value) {
-            total.value = dataTotal;
-            if (((_a = innerParams == null ? void 0 : innerParams.value) == null ? void 0 : _a.current) === 1) {
-              mergeOptions.value = data.map((opt) => {
-                if (opt == null ? void 0 : opt.text) {
-                  opt.label = opt == null ? void 0 : opt.text;
-                }
-                return opt;
-              });
-            } else {
-              mergeOptions.value = [
-                ...mergeOptions.value,
-                ...data.map((opt) => {
-                  if (opt == null ? void 0 : opt.text) {
-                    opt.label = opt == null ? void 0 : opt.text;
-                  }
-                  return opt;
-                })
-              ];
-            }
-          } else {
-            mergeOptions.value = data.map((opt) => {
-              if (opt == null ? void 0 : opt.text) {
-                opt.label = opt == null ? void 0 : opt.text;
-              }
-              return opt;
-            });
-          }
-        }
+        mergeOptions.value = formatOptions(result, fieldNames.value);
       }
       loading.value = false;
     }, 200);
@@ -14982,7 +14947,8 @@
   var FieldCheckboxGroup = /* @__PURE__ */ vue.defineComponent({
     name: "FieldCheckboxGroup",
     props: {
-      ...commonFieldProps()
+      ...commonFieldProps(),
+      fieldNames: Object
     },
     setup(props, {
       attrs
@@ -14998,6 +14964,7 @@
         options: props.options,
         valueEnum: props.valueEnum,
         dependencies: props.dependencies,
+        fieldNames: props.fieldNames,
         params: props.params
       });
       const readValue = vue.computed(() => {
@@ -15055,7 +15022,8 @@
       radioLabel: {
         type: String,
         default: ""
-      }
+      },
+      fieldNames: Object
     },
     setup(props, {
       attrs
@@ -15072,6 +15040,7 @@
         options: props.options,
         valueEnum: props.valueEnum,
         dependencies: props.dependencies,
+        fieldNames: props.fieldNames,
         params: props.params
       });
       const readValue = vue.computed(() => {
@@ -38075,13 +38044,14 @@
       "onUpdate:searchValue"
     ],
     checkbox: ["id", "autofocus", "disabled", "indeterminate"],
-    checkboxGroup: ["id", "disabled", "name", "options"],
+    checkboxGroup: ["id", "disabled", "name", "options", "fieldNames"],
     radioGroup: [
       "id",
       "class",
       "disabled",
       "name",
       "options",
+      "fieldNames",
       "optionType",
       "buttonStyle",
       "radioLabel"