@funcho/ui 1.1.1 → 1.1.3

package/dist/cjs/business/DataTable/DataTable.vue.js

@@ -95,8 +95,9 @@ const _sfc_main = /* @__PURE__ */ vue.defineComponent({
     columns: { default: () => [] },
     isPagination: { type: Boolean, default: true },
     fields: { default: () => [] },
-    request: { type: Function, default: () => Promise.resolve({ list: [], total: 0 }) },
-    actions: { default: () => [] }
+    request: { type: Function, default: () => Promise.resolve({ data: { list: [], total: 0 } }) },
+    actions: { default: () => [] },
+    tools: { default: () => [] }
   },
   setup(__props) {
     const ns = useNamespace.useNamespace("data-table");
@@ -157,9 +158,9 @@ const _sfc_main = /* @__PURE__ */ vue.defineComponent({
         const params = formRef.value?.model || {};
         try {
           tableLoading.value = true;
-          const { list, total } = await props.request(params);
-          tableData.value = list || [];
-          pagination.value.total = total || 0;
+          const { data } = await props.request(params);
+          tableData.value = Array.isArray(data) ? data : data.list || [];
+          pagination.value.total = Array.isArray(data) ? data.length : data.total || 0;
         } catch (error) {
           console.log("获取数据失败", error);
         } finally {
@@ -205,8 +206,8 @@ const _sfc_main = /* @__PURE__ */ vue.defineComponent({
             fields: searchFormFields.value,
             class: vue.normalizeClass(vue.unref(ns).e("query-form")),
             "label-position": "right",
-            "label-width": "auto"
-          }, null, 8, ["fields", "class"]),
+            "label-width": hasMoreContent.value && isExpanded.value ? "auto" : "fit-content"
+          }, null, 8, ["fields", "class", "label-width"]),
           vue.createElementVNode("div", {
             class: vue.normalizeClass(vue.unref(ns).e("tools"))
           }, [
@@ -244,7 +245,22 @@ const _sfc_main = /* @__PURE__ */ vue.defineComponent({
                 vue.createTextVNode("查询", -1)
               ])]),
               _: 1
-            }, 8, ["disabled"])
+            }, 8, ["disabled"]),
+            (vue.openBlock(true), vue.createElementBlock(vue.Fragment, null, vue.renderList(props.tools, (tool, i) => {
+              return vue.openBlock(), vue.createElementBlock(vue.Fragment, { key: i }, [
+                (typeof tool.hidden === "function" ? !tool.hidden() : !tool.hidden) ? (vue.openBlock(), vue.createBlock(vue.unref(index.FcButton), {
+                  key: 0,
+                  type: tool.type || "primary",
+                  disabled: typeof tool.disabled === "function" ? tool.disabled() : tool.disabled,
+                  onClick: tool.onClick
+                }, {
+                  default: vue.withCtx(() => [
+                    vue.createTextVNode(vue.toDisplayString(tool.label), 1)
+                  ]),
+                  _: 2
+                }, 1032, ["type", "disabled", "onClick"])) : vue.createCommentVNode("", true)
+              ], 64);
+            }), 128))
           ], 2)
         ], 6)) : vue.createCommentVNode("", true),
         vue.withDirectives((vue.openBlock(), vue.createBlock(vue.unref(index$2.FcTable), vue.mergeProps(_ctx.$attrs, {

package/dist/cjs/packages/ui/package.json.js

@@ -2,6 +2,6 @@
 
 Object.defineProperty(exports, Symbol.toStringTag, { value: 'Module' });
 
-const version = "1.1.1";
+const version = "1.1.3";
 
 exports.version = version;

package/dist/esm/business/DataTable/DataTable.vue.mjs

@@ -1,4 +1,4 @@
-import { defineComponent, ref, computed, onMounted, resolveDirective, createElementBlock, openBlock, normalizeClass, unref, createCommentVNode, withDirectives, normalizeStyle, createVNode, createElementVNode, createBlock, withCtx, createTextVNode, toDisplayString, mergeProps, Fragment, renderList, createSlots, resolveDynamicComponent } from 'vue';
+import { defineComponent, ref, computed, onMounted, resolveDirective, createElementBlock, openBlock, normalizeClass, unref, createCommentVNode, withDirectives, normalizeStyle, createVNode, createElementVNode, createBlock, withCtx, createTextVNode, toDisplayString, Fragment, renderList, mergeProps, createSlots, resolveDynamicComponent } from 'vue';
 import { useNamespace } from '../../hooks/use-namespace.mjs';
 import { FcButton, FcDangerButton, FcLinkButton } from '../../components/Button/index.mjs';
 import '../../components/Dialog/index.mjs';
@@ -91,8 +91,9 @@ const _sfc_main = /* @__PURE__ */ defineComponent({
     columns: { default: () => [] },
     isPagination: { type: Boolean, default: true },
     fields: { default: () => [] },
-    request: { type: Function, default: () => Promise.resolve({ list: [], total: 0 }) },
-    actions: { default: () => [] }
+    request: { type: Function, default: () => Promise.resolve({ data: { list: [], total: 0 } }) },
+    actions: { default: () => [] },
+    tools: { default: () => [] }
   },
   setup(__props) {
     const ns = useNamespace("data-table");
@@ -153,9 +154,9 @@ const _sfc_main = /* @__PURE__ */ defineComponent({
         const params = formRef.value?.model || {};
         try {
           tableLoading.value = true;
-          const { list, total } = await props.request(params);
-          tableData.value = list || [];
-          pagination.value.total = total || 0;
+          const { data } = await props.request(params);
+          tableData.value = Array.isArray(data) ? data : data.list || [];
+          pagination.value.total = Array.isArray(data) ? data.length : data.total || 0;
         } catch (error) {
           console.log("获取数据失败", error);
         } finally {
@@ -201,8 +202,8 @@ const _sfc_main = /* @__PURE__ */ defineComponent({
             fields: searchFormFields.value,
             class: normalizeClass(unref(ns).e("query-form")),
             "label-position": "right",
-            "label-width": "auto"
-          }, null, 8, ["fields", "class"]),
+            "label-width": hasMoreContent.value && isExpanded.value ? "auto" : "fit-content"
+          }, null, 8, ["fields", "class", "label-width"]),
           createElementVNode("div", {
             class: normalizeClass(unref(ns).e("tools"))
           }, [
@@ -240,7 +241,22 @@ const _sfc_main = /* @__PURE__ */ defineComponent({
                 createTextVNode("查询", -1)
               ])]),
               _: 1
-            }, 8, ["disabled"])
+            }, 8, ["disabled"]),
+            (openBlock(true), createElementBlock(Fragment, null, renderList(props.tools, (tool, i) => {
+              return openBlock(), createElementBlock(Fragment, { key: i }, [
+                (typeof tool.hidden === "function" ? !tool.hidden() : !tool.hidden) ? (openBlock(), createBlock(unref(FcButton), {
+                  key: 0,
+                  type: tool.type || "primary",
+                  disabled: typeof tool.disabled === "function" ? tool.disabled() : tool.disabled,
+                  onClick: tool.onClick
+                }, {
+                  default: withCtx(() => [
+                    createTextVNode(toDisplayString(tool.label), 1)
+                  ]),
+                  _: 2
+                }, 1032, ["type", "disabled", "onClick"])) : createCommentVNode("", true)
+              ], 64);
+            }), 128))
           ], 2)
         ], 6)) : createCommentVNode("", true),
         withDirectives((openBlock(), createBlock(unref(FcTable), mergeProps(_ctx.$attrs, {

package/dist/esm/packages/ui/package.json.mjs

@@ -1,3 +1,3 @@
-const version = "1.1.1";
+const version = "1.1.3";
 
 export { version };

package/dist/types/business/DataTable/DataTable.types.d.ts

@@ -3,6 +3,8 @@ export type TFcProDataTableProps = {
     searchSchema?: Array<any>;
 };
 export type RequestResult<T = any> = {
-    list: T[];
-    total: number;
+    data: T[] | {
+        list: T[];
+        total: number;
+    };
 };