@king-one/antdv 1.1.9 → 1.1.11

package/dist/es/components/pro-table/src/field/field.vue2.mjs

@@ -1,124 +1,149 @@
-import { defineComponent as T, inject as P, toRefs as C, computed as p, reactive as y, ref as I, watchEffect as N, readonly as S, provide as w, createElementBlock as v, openBlock as a, Fragment as c, createCommentVNode as u, createElementVNode as B, createBlock as m, resolveDynamicComponent as F, unref as D, normalizeProps as _, mergeProps as U, guardReactiveProps as $ } from "vue";
-import { TABLE_CONTEXT_PROVIDE_KEY as q, FIELD_CONTEXT_PROVIDE_KEY as A } from "../constants.mjs";
-import { getAvailableVNode as K, handleFn as j } from "../../utils.mjs";
+import { defineComponent, inject, toRefs, computed, reactive, ref, watchEffect, readonly, provide, createElementBlock, openBlock, Fragment, createCommentVNode, createElementVNode, createBlock, resolveDynamicComponent, unref, normalizeProps, mergeProps, guardReactiveProps } from "vue";
+import { TABLE_CONTEXT_PROVIDE_KEY, FIELD_CONTEXT_PROVIDE_KEY } from "../constants.mjs";
+import { getAvailableVNode, handleFn } from "../../utils.mjs";
 import "./field-input/field-input.vue.mjs";
 import "./field-select/field-select.vue.mjs";
 import "./field-radio/field-radio.vue.mjs";
 import "./field-date-range/field-date-range.vue.mjs";
-import L from "./field-input/field-input.vue2.mjs";
-import M from "./field-select/field-select.vue2.mjs";
-import X from "./field-radio/field-radio.vue2.mjs";
-import Y from "./field-date-range/field-date-range.vue2.mjs";
-const h = { class: "field" }, ne = /* @__PURE__ */ T({
+import _sfc_main$1 from "./field-input/field-input.vue2.mjs";
+import _sfc_main$2 from "./field-select/field-select.vue2.mjs";
+import _sfc_main$3 from "./field-radio/field-radio.vue2.mjs";
+import _sfc_main$4 from "./field-date-range/field-date-range.vue2.mjs";
+const _hoisted_1 = { class: "field" };
+const _sfc_main = /* @__PURE__ */ defineComponent({
   __name: "field",
   props: {
     column: {}
   },
-  setup(k) {
-    const { column: l } = k, V = P(q), { tableSlots: s } = V, { formState: d } = C(V), E = l.dataIndex, t = p({
+  setup(__props) {
+    const { column } = __props;
+    const tableContext = inject(TABLE_CONTEXT_PROVIDE_KEY);
+    const { tableSlots } = tableContext;
+    const { formState } = toRefs(tableContext);
+    const formStateKey = column.dataIndex;
+    const modelValue = computed({
       get() {
-        return d.value[E];
+        return formState.value[formStateKey];
       },
-      set(n) {
-        d.value[E] = n;
+      set(val) {
+        formState.value[formStateKey] = val;
+      }
+    });
+    const slotProps = reactive({
+      column,
+      value: modelValue.value,
+      formState
+    });
+    const isShowFormItemSlot = computed(() => {
+      if (tableSlots.formField) {
+        return !!getAvailableVNode(tableSlots.formField(slotProps)).length;
+      }
+      return false;
+    });
+    const valueType = computed(
+      () => column.valueType || (column.valueEnum ? "select" : "text")
+    );
+    const fieldOptions = ref([]);
+    function handleOptionsInFirstTime() {
+      if (column.request) {
+        handleRequest();
+      } else {
+        handleValueEnum();
       }
-    }), f = y({
-      column: l,
-      value: t.value,
-      formState: d
-    }), b = p(() => s.formField ? !!K(s.formField(f)).length : !1), r = p(
-      () => l.valueType || (l.valueEnum ? "select" : "text")
-    ), i = I([]);
-    function R() {
-      l.request ? x() : g();
     }
-    R(), N(() => {
-      l._fieldOptions = S(i.value);
+    handleOptionsInFirstTime();
+    watchEffect(() => {
+      column._fieldOptions = readonly(fieldOptions.value);
     });
-    function g() {
-      if (l.valueEnum) {
-        const n = new Map(Object.entries(l.valueEnum));
-        i.value = Array.from(n).map(([o, e]) => ({
-          text: e.text,
-          value: o,
-          label: e.text,
-          disabled: e.disabled
+    function handleValueEnum() {
+      if (column.valueEnum) {
+        const valueEnumMap = new Map(Object.entries(column.valueEnum));
+        fieldOptions.value = Array.from(valueEnumMap).map(([key, item]) => ({
+          text: item.text,
+          value: key,
+          label: item.text,
+          disabled: item.disabled
         }));
       }
     }
-    async function x() {
-      const n = await j(l.request, {});
-      n && (i.value = n);
+    async function handleRequest() {
+      const res = await handleFn(column.request, {});
+      if (res) {
+        fieldOptions.value = res;
+      }
     }
-    const O = y({
-      fieldOptions: i,
-      column: l
+    const context = reactive({
+      fieldOptions,
+      column
     });
-    return w(
-      A,
-      O
-    ), (n, o) => (a(), v(
-      c,
-      null,
-      [
-        u(" eslint-disable vue/component-name-in-template-casing "),
-        B("div", h, [
-          b.value ? (a(), m(
-            F(D(s).formField),
-            _(U({ key: 0 }, f)),
-            null,
-            16
-            /* FULL_PROPS */
-          )) : n.column.customFormFieldRender ? (a(), v(
-            c,
-            { key: 1 },
-            [
-              u(' <column.customFormFieldRender v-bind="slotProps" /> '),
-              (a(), m(
-                F(n.column.customFormFieldRender),
-                _($(f)),
-                null,
-                16
-                /* FULL_PROPS */
-              ))
-            ],
-            64
-            /* STABLE_FRAGMENT */
-          )) : (a(), v(
-            c,
-            { key: 2 },
-            [
-              r.value === "text" ? (a(), m(L, {
-                key: 0,
-                modelValue: t.value,
-                "onUpdate:modelValue": o[0] || (o[0] = (e) => t.value = e)
-              }, null, 8, ["modelValue"])) : u("v-if", !0),
-              r.value === "select" ? (a(), m(M, {
-                key: 1,
-                modelValue: t.value,
-                "onUpdate:modelValue": o[1] || (o[1] = (e) => t.value = e)
-              }, null, 8, ["modelValue"])) : u("v-if", !0),
-              r.value === "radio" ? (a(), m(X, {
-                key: 2,
-                modelValue: t.value,
-                "onUpdate:modelValue": o[2] || (o[2] = (e) => t.value = e)
-              }, null, 8, ["modelValue"])) : u("v-if", !0),
-              r.value === "dateRange" ? (a(), m(Y, {
-                key: 3,
-                modelValue: t.value,
-                "onUpdate:modelValue": o[3] || (o[3] = (e) => t.value = e)
-              }, null, 8, ["modelValue"])) : u("v-if", !0)
-            ],
-            64
-            /* STABLE_FRAGMENT */
-          ))
-        ])
-      ],
-      2112
-      /* STABLE_FRAGMENT, DEV_ROOT_FRAGMENT */
-    ));
+    provide(
+      FIELD_CONTEXT_PROVIDE_KEY,
+      context
+    );
+    return (_ctx, _cache) => {
+      return openBlock(), createElementBlock(
+        Fragment,
+        null,
+        [
+          createCommentVNode(" eslint-disable vue/component-name-in-template-casing "),
+          createElementVNode("div", _hoisted_1, [
+            isShowFormItemSlot.value ? (openBlock(), createBlock(
+              resolveDynamicComponent(unref(tableSlots).formField),
+              normalizeProps(mergeProps({ key: 0 }, slotProps)),
+              null,
+              16
+              /* FULL_PROPS */
+            )) : _ctx.column.customFormFieldRender ? (openBlock(), createElementBlock(
+              Fragment,
+              { key: 1 },
+              [
+                createCommentVNode(' <column.customFormFieldRender v-bind="slotProps" /> '),
+                (openBlock(), createBlock(
+                  resolveDynamicComponent(_ctx.column.customFormFieldRender),
+                  normalizeProps(guardReactiveProps(slotProps)),
+                  null,
+                  16
+                  /* FULL_PROPS */
+                ))
+              ],
+              64
+              /* STABLE_FRAGMENT */
+            )) : (openBlock(), createElementBlock(
+              Fragment,
+              { key: 2 },
+              [
+                valueType.value === "text" ? (openBlock(), createBlock(_sfc_main$1, {
+                  key: 0,
+                  modelValue: modelValue.value,
+                  "onUpdate:modelValue": _cache[0] || (_cache[0] = ($event) => modelValue.value = $event)
+                }, null, 8, ["modelValue"])) : createCommentVNode("v-if", true),
+                valueType.value === "select" ? (openBlock(), createBlock(_sfc_main$2, {
+                  key: 1,
+                  modelValue: modelValue.value,
+                  "onUpdate:modelValue": _cache[1] || (_cache[1] = ($event) => modelValue.value = $event)
+                }, null, 8, ["modelValue"])) : createCommentVNode("v-if", true),
+                valueType.value === "radio" ? (openBlock(), createBlock(_sfc_main$3, {
+                  key: 2,
+                  modelValue: modelValue.value,
+                  "onUpdate:modelValue": _cache[2] || (_cache[2] = ($event) => modelValue.value = $event)
+                }, null, 8, ["modelValue"])) : createCommentVNode("v-if", true),
+                valueType.value === "dateRange" ? (openBlock(), createBlock(_sfc_main$4, {
+                  key: 3,
+                  modelValue: modelValue.value,
+                  "onUpdate:modelValue": _cache[3] || (_cache[3] = ($event) => modelValue.value = $event)
+                }, null, 8, ["modelValue"])) : createCommentVNode("v-if", true)
+              ],
+              64
+              /* STABLE_FRAGMENT */
+            ))
+          ])
+        ],
+        2112
+        /* STABLE_FRAGMENT, DEV_ROOT_FRAGMENT */
+      );
+    };
   }
 });
 export {
-  ne as default
+  _sfc_main as default
 };

package/dist/es/components/pro-table/src/form-render.css

@@ -1 +1,3 @@
-.pro-table .pro-table-form .ant-form .ant-form-item{margin-bottom:0}
+.pro-table .pro-table-form .ant-form .ant-form-item {
+  margin-bottom: 0;
+}

package/dist/es/components/pro-table/src/form-render.vue.mjs

@@ -1,5 +1,5 @@
-import o from "./form-render.vue2.mjs";
+import _sfc_main from "./form-render.vue2.mjs";
 /* empty css                  */
 export {
-  o as default
+  _sfc_main as default
 };

package/dist/es/components/pro-table/src/form-render.vue2.mjs

@@ -1,145 +1,166 @@
-import { defineComponent as L, inject as A, toRefs as P, ref as j, computed as m, createElementBlock as i, openBlock as l, createVNode as o, unref as e, mergeProps as d, withCtx as n, createCommentVNode as s, Fragment as k, renderList as q, createBlock as z, normalizeProps as K, guardReactiveProps as X, createTextVNode as y } from "vue";
-import { Form as Y, Row as $, Col as x, FormItem as b, Space as G, Button as F } from "ant-design-vue";
+import { defineComponent, inject, toRefs, ref, computed, createElementBlock, openBlock, createVNode, unref, mergeProps, withCtx, createCommentVNode, Fragment, renderList, createBlock, normalizeProps, guardReactiveProps, createTextVNode } from "vue";
+import { Form, Row, Col, FormItem, Space, Button } from "ant-design-vue";
 import "./field/field.vue.mjs";
-import { TABLE_CONTEXT_PROVIDE_KEY as H } from "./constants.mjs";
-import J from "./field/field.vue2.mjs";
-const M = { class: "pro-table-form" }, oe = /* @__PURE__ */ L({
+import { TABLE_CONTEXT_PROVIDE_KEY } from "./constants.mjs";
+import _sfc_main$1 from "./field/field.vue2.mjs";
+const _hoisted_1 = { class: "pro-table-form" };
+const _sfc_main = /* @__PURE__ */ defineComponent({
   __name: "form-render",
-  setup(Q, { expose: I }) {
-    const c = A(H), { columns: p, pageData: R, handleRequest: N } = c, { loading: T, antdFormProps: B, formColNum: u, formState: E, buttonCol: O } = P(c), a = j();
-    function _(t) {
-      return t.valueType !== "option" && !t.hideInForm;
+  setup(__props, { expose: __expose }) {
+    const tableContext = inject(TABLE_CONTEXT_PROVIDE_KEY);
+    const { columns, pageData, handleRequest } = tableContext;
+    const { loading, antdFormProps, formColNum, formState, buttonCol } = toRefs(tableContext);
+    const formRef = ref();
+    function isShowItem(col) {
+      return col.valueType !== "option" && !col.hideInForm;
     }
-    const S = (t) => t.dataIndex;
-    function v() {
-      R.pageNum = 1, N();
+    const itemName = (col) => col.dataIndex;
+    function onFilter() {
+      pageData.pageNum = 1;
+      handleRequest();
     }
-    function w() {
-      a.value && a.value.validate().then(() => {
-        v();
-      }).catch(console.error);
+    function onSubmit() {
+      if (formRef.value) {
+        formRef.value.validate().then(() => {
+          onFilter();
+        }).catch(console.error);
+      }
     }
-    function V() {
-      a.value && (a.value.resetFields(), v());
+    function resetForm() {
+      if (formRef.value) {
+        formRef.value.resetFields();
+        onFilter();
+      }
     }
-    const f = m(() => (u == null ? void 0 : u.value) || 0), g = m(() => 24 / f.value), D = m(() => {
-      const t = p.filter(_).length;
-      return (f.value - 1 - t % f.value) * g.value;
+    const colNum = computed(() => (formColNum == null ? void 0 : formColNum.value) || 0);
+    const colSpan = computed(() => 24 / colNum.value);
+    const buttonColOffset = computed(() => {
+      const displayedColLen = columns.filter(isShowItem).length;
+      return (colNum.value - 1 - displayedColLen % colNum.value) * colSpan.value;
     });
-    function C(t, h = !1) {
-      return t = {
-        span: g.value,
+    function fieldCol(colProps, isButton = false) {
+      colProps = {
+        span: colSpan.value,
         // 4 列
-        ...t || {}
-      }, h && t.offset == null && (t.offset = D.value), t;
+        ...colProps || {}
+      };
+      if (isButton && colProps.offset == null) {
+        colProps.offset = buttonColOffset.value;
+      }
+      return colProps;
     }
-    return I({
-      formRef: a
-    }), (t, h) => (l(), i("div", M, [
-      o(e(Y), d({
-        ref_key: "formRef",
-        ref: a,
-        autocomplete: "off",
-        "label-col": { span: 5 }
-      }, e(B), { model: e(E) }), {
-        default: n(() => [
-          o(e($), { gutter: [0, 24] }, {
-            default: n(() => [
-              s(" TODO 处理 key 的问题, 有的项没有 key, 有的项没有 dataIndex "),
-              (l(!0), i(
-                k,
-                null,
-                q(e(p), (r) => (l(), i(
-                  k,
+    __expose({
+      formRef
+    });
+    return (_ctx, _cache) => {
+      return openBlock(), createElementBlock("div", _hoisted_1, [
+        createVNode(unref(Form), mergeProps({
+          ref_key: "formRef",
+          ref: formRef,
+          autocomplete: "off",
+          "label-col": { span: 5 }
+        }, unref(antdFormProps), { model: unref(formState) }), {
+          default: withCtx(() => [
+            createVNode(unref(Row), { gutter: [0, 24] }, {
+              default: withCtx(() => [
+                createCommentVNode(" TODO 处理 key 的问题, 有的项没有 key, 有的项没有 dataIndex "),
+                (openBlock(true), createElementBlock(
+                  Fragment,
                   null,
-                  [
-                    _(r) ? (l(), z(
-                      e(x),
-                      d({
-                        key: r.key,
-                        ref_for: !0
-                      }, C(r.fieldCol)),
-                      {
-                        default: n(() => [
-                          o(e(b), d({
-                            label: r.title,
-                            name: S(r),
-                            ref_for: !0
-                          }, r.formItemProps), {
-                            default: n(() => [
-                              o(J, { column: r }, null, 8, ["column"])
+                  renderList(unref(columns), (col) => {
+                    return openBlock(), createElementBlock(
+                      Fragment,
+                      null,
+                      [
+                        isShowItem(col) ? (openBlock(), createBlock(
+                          unref(Col),
+                          mergeProps({
+                            key: col.key,
+                            ref_for: true
+                          }, fieldCol(col.fieldCol)),
+                          {
+                            default: withCtx(() => [
+                              createVNode(unref(FormItem), mergeProps({
+                                label: col.title,
+                                name: itemName(col),
+                                ref_for: true
+                              }, col.formItemProps), {
+                                default: withCtx(() => [
+                                  createVNode(_sfc_main$1, { column: col }, null, 8, ["column"])
+                                ]),
+                                _: 2
+                                /* DYNAMIC */
+                              }, 1040, ["label", "name"])
                             ]),
                             _: 2
                             /* DYNAMIC */
-                          }, 1040, ["label", "name"])
+                          },
+                          1040
+                          /* FULL_PROPS, DYNAMIC_SLOTS */
+                        )) : createCommentVNode("v-if", true)
+                      ],
+                      64
+                      /* STABLE_FRAGMENT */
+                    );
+                  }),
+                  256
+                  /* UNKEYED_FRAGMENT */
+                )),
+                createCommentVNode(" 重置查询按钮 "),
+                createVNode(
+                  unref(Col),
+                  normalizeProps(guardReactiveProps(fieldCol(unref(buttonCol), true))),
+                  {
+                    default: withCtx(() => [
+                      createVNode(unref(FormItem), { "wrapper-col": { style: { textAlign: "right" } } }, {
+                        default: withCtx(() => [
+                          createVNode(unref(Space), null, {
+                            default: withCtx(() => [
+                              createVNode(unref(Button), { onClick: resetForm }, {
+                                default: withCtx(() => [
+                                  createTextVNode(" 重置 ")
+                                ]),
+                                _: 1
+                                /* STABLE */
+                              }),
+                              createVNode(unref(Button), {
+                                type: "primary",
+                                loading: unref(loading),
+                                onClick: onSubmit
+                              }, {
+                                default: withCtx(() => [
+                                  createTextVNode(" 查询 ")
+                                ]),
+                                _: 1
+                                /* STABLE */
+                              }, 8, ["loading"])
+                            ]),
+                            _: 1
+                            /* STABLE */
+                          })
                         ]),
-                        _: 2
-                        /* DYNAMIC */
-                      },
-                      1040
-                      /* FULL_PROPS, DYNAMIC_SLOTS */
-                    )) : s("v-if", !0)
-                  ],
-                  64
-                  /* STABLE_FRAGMENT */
-                ))),
-                256
-                /* UNKEYED_FRAGMENT */
-              )),
-              s(" 重置查询按钮 "),
-              o(
-                e(x),
-                K(X(C(e(O), !0))),
-                {
-                  default: n(() => [
-                    o(e(b), { "wrapper-col": { style: { textAlign: "right" } } }, {
-                      default: n(() => [
-                        o(e(G), null, {
-                          default: n(() => [
-                            o(e(F), { onClick: V }, {
-                              default: n(() => [
-                                y(" 重置 ")
-                              ]),
-                              _: 1
-                              /* STABLE */
-                            }),
-                            o(e(F), {
-                              type: "primary",
-                              loading: e(T),
-                              onClick: w
-                            }, {
-                              default: n(() => [
-                                y(" 查询 ")
-                              ]),
-                              _: 1
-                              /* STABLE */
-                            }, 8, ["loading"])
-                          ]),
-                          _: 1
-                          /* STABLE */
-                        })
-                      ]),
-                      _: 1
-                      /* STABLE */
-                    })
-                  ]),
-                  _: 1
-                  /* STABLE */
-                },
-                16
-                /* FULL_PROPS */
-              )
-            ]),
-            _: 1
-            /* STABLE */
-          })
-        ]),
-        _: 1
-        /* STABLE */
-      }, 16, ["model"])
-    ]));
+                        _: 1
+                        /* STABLE */
+                      })
+                    ]),
+                    _: 1
+                    /* STABLE */
+                  },
+                  16
+                  /* FULL_PROPS */
+                )
+              ]),
+              _: 1
+              /* STABLE */
+            })
+          ]),
+          _: 1
+          /* STABLE */
+        }, 16, ["model"])
+      ]);
+    };
   }
 });
 export {
-  oe as default
+  _sfc_main as default
 };

package/dist/es/components/pro-table/src/hooks/use-form.mjs

@@ -1,22 +1,25 @@
-import { ref as o } from "vue";
-function m(n) {
-  const { columns: r } = n, a = o({}), u = ["dateRange"];
+import { ref } from "vue";
+function useForm(props) {
+  const { columns } = props;
+  const formState = ref({});
+  const arrayValueTypes = ["dateRange"];
+  const genFormState = () => {
+    formState.value = columns.reduce(
+      (init, col) => {
+        if (col.dataIndex && !col.hideInForm) {
+          const initValue = col.valueType && arrayValueTypes.includes(col.valueType) ? [] : "";
+          init[col.dataIndex] = formState.value[col.dataIndex] || col.initialValue || initValue;
+        }
+        return init;
+      },
+      {}
+    );
+  };
   return {
-    formState: a,
-    genFormState: () => {
-      a.value = r.reduce(
-        (t, e) => {
-          if (e.dataIndex && !e.hideInForm) {
-            const d = e.valueType && u.includes(e.valueType) ? [] : "";
-            t[e.dataIndex] = a.value[e.dataIndex] || e.initialValue || d;
-          }
-          return t;
-        },
-        {}
-      );
-    }
+    formState,
+    genFormState
   };
 }
 export {
-  m as useForm
+  useForm
 };