@king-one/antdv 1.2.21 → 2.0.0

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

@@ -1,134 +1,135 @@
-import { defineComponent as W, inject as j, toRefs as q, ref as f, onMounted as A, onUnmounted as K, computed as M, createElementBlock as m, openBlock as d, createVNode as n, unref as e, mergeProps as c, withCtx as o, createCommentVNode as v, Fragment as x, renderList as U, createBlock as X, normalizeProps as Y, guardReactiveProps as $, createElementVNode as G, createTextVNode as k } from "vue";
-import { Form as H, Row as J, Col as b, FormItem as E, Space as Q, 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 Z } from "./constants.mjs";
-import ee from "./field/field.vue2.mjs";
-const te = { class: "pro-table-form" }, ne = { style: { display: "flex", "justify-content": "flex-end" } }, fe = /* @__PURE__ */ W({
+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(oe, { expose: R }) {
-    const p = j(Z), { columns: _, pageData: I, handleRequest: N } = p, { loading: S, antdFormProps: T, formColNum: s, formState: B, buttonCol: L } = q(p), r = f(), a = f(typeof window < "u" ? window.innerWidth : 1200);
-    function w() {
-      a.value = window.innerWidth;
+  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;
     }
-    A(() => {
-      typeof window < "u" && window.addEventListener("resize", w);
-    }), K(() => {
-      typeof window < "u" && window.removeEventListener("resize", w);
-    });
-    function h(t) {
-      return t.valueType !== "option" && !t.hideInForm;
-    }
-    const O = (t) => t.dataIndex;
-    function y() {
-      I.pageNum = 1, N();
+    const itemName = (col) => col.dataIndex;
+    function onFilter() {
+      pageData.pageNum = 1;
+      handleRequest();
     }
-    function V() {
-      r.value && r.value.validate().then(() => {
-        y();
-      }).catch(console.error);
+    function onSubmit() {
+      if (formRef.value) {
+        formRef.value.validate().then(() => {
+          onFilter();
+        }).catch(console.error);
+      }
     }
-    function z() {
-      r.value && (r.value.resetFields(), y());
+    function resetForm() {
+      if (formRef.value) {
+        formRef.value.resetFields();
+        onFilter();
+      }
     }
-    const u = f((s == null ? void 0 : s.value) || 0), i = f(24 / u.value), P = M(() => {
-      const t = _.filter(h).length;
-      return (u.value - 1 - t % u.value) * i.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 D() {
-      return a.value < 768 ? (i.value = 24, u.value = 1) : a.value < 992 ? (i.value = 12, u.value = 2) : a.value < 1200 && (i.value = 8, u.value = 3), i.value;
+    function fieldCol(colProps, isButton = false) {
+      colProps = {
+        span: colSpan.value,
+        // 4 列
+        ...colProps || {}
+      };
+      if (isButton && colProps.offset == null) {
+        colProps.offset = buttonColOffset.value;
+      }
+      return colProps;
     }
-    function g(t, C = !1) {
-      return D(), t = {
-        ...{
-          xs: 24,
-          sm: a.value < 768 ? 24 : 12,
-          md: a.value < 992 ? 12 : 8,
-          lg: a.value < 1200 ? 8 : 6,
-          xl: i.value
-        },
-        ...t || {}
-      }, C && t.offset == null && (t.offset = P.value), t;
-    }
-    return R({
-      formRef: r
-    }), (t, C) => (d(), m("div", te, [
-      n(e(H), c({
-        ref_key: "formRef",
-        ref: r,
-        autocomplete: "off"
-      }, e(T), {
-        model: e(B),
-        "label-align": "right"
-      }), {
-        default: o(() => [
-          n(e(J), { gutter: [24, 16] }, {
-            default: o(() => [
-              v(" TODO 处理 key 的问题, 有的项没有 key, 有的项没有 dataIndex "),
-              (d(!0), m(
-                x,
-                null,
-                U(e(_), (l) => (d(), m(
-                  x,
+    __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,
-                  [
-                    h(l) ? (d(), X(
-                      e(b),
-                      c({
-                        key: l.key,
-                        ref_for: !0
-                      }, g(l.fieldCol)),
-                      {
-                        default: o(() => [
-                          n(e(E), c({
-                            label: l.title,
-                            name: O(l),
-                            ref_for: !0
-                          }, l.formItemProps), {
-                            default: o(() => [
-                              n(ee, { column: l }, 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"])
-                        ]),
-                        _: 2
-                        /* DYNAMIC */
-                      },
-                      1040
-                      /* FULL_PROPS, DYNAMIC_SLOTS */
-                    )) : v("v-if", !0)
-                  ],
-                  64
-                  /* STABLE_FRAGMENT */
-                ))),
-                256
-                /* UNKEYED_FRAGMENT */
-              )),
-              v(" 重置查询按钮 "),
-              n(
-                e(b),
-                Y($(g(e(L), !0))),
-                {
-                  default: o(() => [
-                    n(e(E), null, {
-                      default: o(() => [
-                        G("div", ne, [
-                          n(e(Q), null, {
-                            default: o(() => [
-                              n(e(F), { onClick: z }, {
-                                default: o(() => [
-                                  k(" 重置 ")
+                          },
+                          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 */
                               }),
-                              n(e(F), {
+                              createVNode(unref(Button), {
                                 type: "primary",
-                                loading: e(S),
-                                onClick: V
+                                loading: unref(loading),
+                                onClick: onSubmit
                               }, {
-                                default: o(() => [
-                                  k(" 查询 ")
+                                default: withCtx(() => [
+                                  createTextVNode(" 查询 ")
                                 ]),
                                 _: 1
                                 /* STABLE */
@@ -137,29 +138,29 @@ const te = { class: "pro-table-form" }, ne = { style: { display: "flex", "justif
                             _: 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 {
-  fe 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
 };

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

@@ -1,39 +1,57 @@
-import { computed as C, readonly as h, unref as q, onMounted as x } from "vue";
-import { handleFn as N, getAvailableVNode as O } from "../../utils.mjs";
-function B(d, n, { loading: o, pageData: t, formState: i, dataSource: f }) {
-  const { columns: c, request: m, requestImmediately: p } = d, y = C(
-    () => c.filter(({ hideInTable: e }) => !e)
-  ), u = async () => {
-    o.value = !0;
-    const e = await N(
-      m,
-      h({
-        pageSize: t.pageSize,
-        pageNum: t.pageNum,
-        ...q(i)
+import { computed, readonly, unref, onMounted } from "vue";
+import { handleFn, getAvailableVNode } from "../../utils.mjs";
+function useTable(props, slots, { loading, pageData, formState, dataSource }) {
+  const { columns, request, requestImmediately } = props;
+  const filteredColumns = computed(
+    () => columns.filter(({ hideInTable }) => !hideInTable)
+  );
+  const handleRequest = async () => {
+    loading.value = true;
+    const res = await handleFn(
+      request,
+      readonly({
+        pageSize: pageData.pageSize,
+        pageNum: pageData.pageNum,
+        ...unref(formState)
       })
     );
-    e && e.success && (t.total = e.total || 0, f.value = e.data), o.value = !1;
+    if (res && res.success) {
+      pageData.total = res.total || 0;
+      dataSource.value = res.data;
+    }
+    loading.value = false;
   };
-  x(() => {
-    p && u();
+  onMounted(() => {
+    if (requestImmediately) {
+      handleRequest();
+    }
   });
-  const s = (e, l) => {
-    var r;
-    if (l.valueType === "select" || l.valueEnum)
-      return (r = (l._fieldOptions || []).find((v) => v.value === e)) == null ? void 0 : r.label;
-  }, b = (e) => n.bodyCell ? !!O(n.bodyCell(a(e))).length : !1, a = (e) => ({
-    ...e,
-    labelText: s(e.text, e.column)
+  const getLabelByValue = (value, column) => {
+    var _a;
+    if (column.valueType === "select" || column.valueEnum) {
+      const fieldOptions = column._fieldOptions;
+      return (_a = (fieldOptions || []).find((opt) => opt.value === value)) == null ? void 0 : _a.label;
+    }
+    return void 0;
+  };
+  const hasCurrentColBodySlot = (originScope) => {
+    if (slots.bodyCell) {
+      return !!getAvailableVNode(slots.bodyCell(bodyCellProps(originScope))).length;
+    }
+    return false;
+  };
+  const bodyCellProps = (originScope) => ({
+    ...originScope,
+    labelText: getLabelByValue(originScope.text, originScope.column)
   });
   return {
-    filteredColumns: y,
-    handleRequest: u,
-    getLabelByValue: s,
-    hasCurrentColBodySlot: b,
-    bodyCellProps: a
+    filteredColumns,
+    handleRequest,
+    getLabelByValue,
+    hasCurrentColBodySlot,
+    bodyCellProps
   };
 }
 export {
-  B as useTable
+  useTable
 };

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

@@ -1,4 +1,4 @@
-import f from "./pro-table.vue2.mjs";
+import _sfc_main from "./pro-table.vue2.mjs";
 export {
-  f as default
+  _sfc_main as default
 };