pro-design-vue 1.2.17 → 1.2.19

package/dist/index.full.js

@@ -1,4 +1,4 @@
-/*! Pro Design Vue v1.2.17 */
+/*! 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.17";
+  const version$1 = "1.2.19";
 
   const makeInstaller = (components = []) => {
     const install = (app) => {
@@ -13563,22 +13563,24 @@
       default: "horizontal"
     },
     labelCol: {
-      type: Object
+      type: Object,
+      default: void 0
     },
     wrapperCol: {
-      type: Object
+      type: Object,
+      default: void 0
     },
     colon: {
       type: Boolean,
-      default: true
+      default: void 0
     },
     requiredMark: {
       type: [Boolean, String],
-      default: true
+      default: void 0
     },
     labelAlign: {
       type: String,
-      default: "right"
+      default: void 0
     },
     labelWrap: Boolean,
     disabled: {
@@ -14422,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;
     });
@@ -14455,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(
       () => {
@@ -14494,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);
@@ -14506,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);
@@ -14980,7 +14947,8 @@
   var FieldCheckboxGroup = /* @__PURE__ */ vue.defineComponent({
     name: "FieldCheckboxGroup",
     props: {
-      ...commonFieldProps()
+      ...commonFieldProps(),
+      fieldNames: Object
     },
     setup(props, {
       attrs
@@ -14996,6 +14964,7 @@
         options: props.options,
         valueEnum: props.valueEnum,
         dependencies: props.dependencies,
+        fieldNames: props.fieldNames,
         params: props.params
       });
       const readValue = vue.computed(() => {
@@ -15053,7 +15022,8 @@
       radioLabel: {
         type: String,
         default: ""
-      }
+      },
+      fieldNames: Object
     },
     setup(props, {
       attrs
@@ -15070,6 +15040,7 @@
         options: props.options,
         valueEnum: props.valueEnum,
         dependencies: props.dependencies,
+        fieldNames: props.fieldNames,
         params: props.params
       });
       const readValue = vue.computed(() => {
@@ -17734,6 +17705,9 @@
       expose,
       attrs
     }) {
+      const {
+        form
+      } = useProConfigInject();
       const mountedRef = vue.ref(false);
       const transformerMap = vue.shallowRef(/* @__PURE__ */ new Map());
       const formRef = vue.ref();
@@ -17761,7 +17735,7 @@
       const formProps = vue.computed(() => {
         var _a;
         return {
-          ...omitUndefined(omit(props, ["colProps", "submitter", "loading", "showLoading", "omitNil", "grid", "theme", "customUi", "gridSubmitter", "requestAbort", "isKeyPressSubmit", "formKey", "initialValues", "rowProps", "dateFormatter", "params", "readonly", "readonlyProps", "items", "request", "submitOnLoading", "onLoadingChange", "onFinish", "onValuesChange"])),
+          ...omitUndefined(omit(props, ["colProps", "submitter", "loading", "showLoading", "omitNil", "grid", "theme", "colon", "customUi", "gridSubmitter", "requestAbort", "isKeyPressSubmit", "formKey", "initialValues", "rowProps", "dateFormatter", "params", "readonly", "readonlyProps", "items", "request", "validateMessages", "requiredMark", "labelAlign", "labelCol", "wrapperCol", "submitOnLoading", "onLoadingChange", "onFinish", "onValuesChange"])),
           layout: (_a = props.layout) != null ? _a : "vertical"
         };
       });
@@ -17951,31 +17925,40 @@
           ...slots
         }
       }, {
-        default: () => [vue.createVNode(antDesignVue.Form, vue.mergeProps({
-          "ref": formRef
-        }, formProps.value, {
-          "class": formClass.value,
-          "model": formData.value,
-          "style": attrs.style
-        }), {
-          default: () => [vue.createVNode(antDesignVue.Spin, {
-            "spinning": props.showLoading && (requestLoading.value || loading.value)
-          }, {
-            default: () => [vue.createVNode(FormRowWrapper, null, {
-              default: () => [vue.createVNode(FormItems, {
-                "list": formItems.value
-              }, null), props.gridSubmitter && props.submitter !== false && vue.createVNode(antDesignVue.Col, submitterColProps.value, {
-                default: () => [vue.createVNode(antDesignVue.FormItem, {
-                  "label": " ",
-                  "colon": false,
-                  "class": `${prefixCls}-submitter-form-item`
-                }, {
-                  default: () => [submitterNode.value]
+        default: () => {
+          var _a, _b, _c, _d, _e, _f, _g, _h, _i, _j, _k, _l, _m, _n;
+          return [vue.createVNode(antDesignVue.Form, vue.mergeProps({
+            "ref": formRef
+          }, formProps.value, {
+            "class": formClass.value,
+            "model": formData.value,
+            "style": attrs.style,
+            "colon": (_c = (_b = props.colon) != null ? _b : (_a = form == null ? void 0 : form.value) == null ? void 0 : _a.colon) != null ? _c : true,
+            "requiredMark": (_f = (_e = props.requiredMark) != null ? _e : (_d = form == null ? void 0 : form.value) == null ? void 0 : _d.requiredMark) != null ? _f : true,
+            "validateMessages": (_h = props.validateMessages) != null ? _h : (_g = form == null ? void 0 : form.value) == null ? void 0 : _g.validateMessages,
+            "labelAlign": (_j = props.labelAlign) != null ? _j : (_i = form == null ? void 0 : form.value) == null ? void 0 : _i.labelAlign,
+            "labelCol": (_l = props.labelCol) != null ? _l : (_k = form == null ? void 0 : form.value) == null ? void 0 : _k.labelCol,
+            "wrapperCol": (_n = props.wrapperCol) != null ? _n : (_m = form == null ? void 0 : form.value) == null ? void 0 : _m.wrapperCol
+          }), {
+            default: () => [vue.createVNode(antDesignVue.Spin, {
+              "spinning": props.showLoading && (requestLoading.value || loading.value)
+            }, {
+              default: () => [vue.createVNode(FormRowWrapper, null, {
+                default: () => [vue.createVNode(FormItems, {
+                  "list": formItems.value
+                }, null), props.gridSubmitter && props.submitter !== false && vue.createVNode(antDesignVue.Col, submitterColProps.value, {
+                  default: () => [vue.createVNode(antDesignVue.FormItem, {
+                    "label": " ",
+                    "colon": false,
+                    "class": `${prefixCls}-submitter-form-item`
+                  }, {
+                    default: () => [submitterNode.value]
+                  })]
                 })]
-              })]
-            }), !props.gridSubmitter && submitterNode.value]
-          })]
-        })]
+              }), !props.gridSubmitter && submitterNode.value]
+            })]
+          })];
+        }
       });
     }
   });
@@ -21553,7 +21536,8 @@
       default: void 0
     },
     rowKey: {
-      type: [Function, String]
+      type: [Function, String],
+      default: void 0
     },
     customRow: {
       type: Function,
@@ -35497,17 +35481,19 @@
           }
           return true;
         }).map((item) => {
-          return omitKeysAndUndefined({
+          const mergeItem = merge({
             ...item,
             width: void 0,
             tooltip: item.headerTooltip,
             name: item.dataIndex
-          }, ["dataIndex", "width"]);
+          }, item.search);
+          return omitKeysAndUndefined(mergeItem, ["dataIndex", "width", "headerTooltip", "search"]);
         });
       });
       const preserveRecordsRef = vue.ref(/* @__PURE__ */ new Map());
       const getRowKey = vue.computed(() => typeof props.rowKey == "function" ? props.rowKey : (record) => {
-        return record == null ? void 0 : record[props.rowKey || "id"];
+        var _a2, _b2;
+        return record == null ? void 0 : record[(_b2 = props.rowKey) != null ? _b2 : ((_a2 = table == null ? void 0 : table.value) == null ? void 0 : _a2.rowKey) || "id"];
       });
       vue.watch([() => dataSource.value, getRowKey], () => {
         var _a2;
@@ -38058,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"