@funcho/ui 1.1.2 → 1.1.4

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

@@ -99,7 +99,7 @@ const _sfc_main = /* @__PURE__ */ vue.defineComponent({
     actions: { default: () => [] },
     tools: { default: () => [] }
   },
-  setup(__props) {
+  setup(__props, { expose: __expose }) {
     const ns = useNamespace.useNamespace("data-table");
     const formRef = vue.ref();
     const { height: formHeight } = core.useElementSize(formRef);
@@ -158,7 +158,9 @@ const _sfc_main = /* @__PURE__ */ vue.defineComponent({
         const params = formRef.value?.model || {};
         try {
           tableLoading.value = true;
-          const { data } = await props.request(params);
+          const { data } = await props.request(
+            props.isPagination ? { ...params, page: pagination.value.currentPage, size: pagination.value.pageSize } : params
+          );
           tableData.value = Array.isArray(data) ? data : data.list || [];
           pagination.value.total = Array.isArray(data) ? data.length : data.total || 0;
         } catch (error) {
@@ -185,6 +187,10 @@ const _sfc_main = /* @__PURE__ */ vue.defineComponent({
       pagination.value.pageSize = pageSize;
       loadData();
     };
+    __expose({
+      loadData,
+      tableData
+    });
     return (_ctx, _cache) => {
       const _directive_loading = vue.resolveDirective("loading");
       return vue.openBlock(), vue.createElementBlock("div", {
@@ -206,7 +212,7 @@ const _sfc_main = /* @__PURE__ */ vue.defineComponent({
             fields: searchFormFields.value,
             class: vue.normalizeClass(vue.unref(ns).e("query-form")),
             "label-position": "right",
-            "label-width": hasMoreContent.value && !isExpanded.value ? "fit-content" : "auto"
+            "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"))

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

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

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

@@ -95,7 +95,7 @@ const _sfc_main = /* @__PURE__ */ defineComponent({
     actions: { default: () => [] },
     tools: { default: () => [] }
   },
-  setup(__props) {
+  setup(__props, { expose: __expose }) {
     const ns = useNamespace("data-table");
     const formRef = ref();
     const { height: formHeight } = useElementSize(formRef);
@@ -154,7 +154,9 @@ const _sfc_main = /* @__PURE__ */ defineComponent({
         const params = formRef.value?.model || {};
         try {
           tableLoading.value = true;
-          const { data } = await props.request(params);
+          const { data } = await props.request(
+            props.isPagination ? { ...params, page: pagination.value.currentPage, size: pagination.value.pageSize } : params
+          );
           tableData.value = Array.isArray(data) ? data : data.list || [];
           pagination.value.total = Array.isArray(data) ? data.length : data.total || 0;
         } catch (error) {
@@ -181,6 +183,10 @@ const _sfc_main = /* @__PURE__ */ defineComponent({
       pagination.value.pageSize = pageSize;
       loadData();
     };
+    __expose({
+      loadData,
+      tableData
+    });
     return (_ctx, _cache) => {
       const _directive_loading = resolveDirective("loading");
       return openBlock(), createElementBlock("div", {
@@ -202,7 +208,7 @@ const _sfc_main = /* @__PURE__ */ defineComponent({
             fields: searchFormFields.value,
             class: normalizeClass(unref(ns).e("query-form")),
             "label-position": "right",
-            "label-width": hasMoreContent.value && !isExpanded.value ? "fit-content" : "auto"
+            "label-width": hasMoreContent.value && isExpanded.value ? "auto" : "fit-content"
           }, null, 8, ["fields", "class", "label-width"]),
           createElementVNode("div", {
             class: normalizeClass(unref(ns).e("tools"))

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

@@ -1,3 +1,3 @@
-const version = "1.1.2";
+const version = "1.1.4";
 
 export { version };

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

@@ -29,7 +29,10 @@ type __VLS_Props = {
         hidden?: boolean | (() => boolean);
     }>;
 };
-declare const _default: import('vue').DefineComponent<__VLS_Props, {}, {}, {}, {}, import('vue').ComponentOptionsMixin, import('vue').ComponentOptionsMixin, {}, string, import('vue').PublicProps, Readonly<__VLS_Props> & Readonly<{}>, {
+declare const _default: import('vue').DefineComponent<__VLS_Props, {
+    loadData: () => Promise<void>;
+    tableData: import('vue').Ref<any[], any[]>;
+}, {}, {}, {}, import('vue').ComponentOptionsMixin, import('vue').ComponentOptionsMixin, {}, string, import('vue').PublicProps, Readonly<__VLS_Props> & Readonly<{}>, {
     height: number;
     fields: Array<TProFormField>;
     tools: Array<{

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

@@ -25,7 +25,10 @@ export declare const FcProDataTable: {
             disabled?: boolean | (() => boolean);
             hidden?: boolean | (() => boolean);
         }>;
-    }> & Readonly<{}>, {}, {}, {}, {}, import('vue').ComponentOptionsMixin, import('vue').ComponentOptionsMixin, {}, import('vue').PublicProps, {
+    }> & Readonly<{}>, {
+        loadData: () => Promise<void>;
+        tableData: import('vue').Ref<any[], any[]>;
+    }, {}, {}, {}, import('vue').ComponentOptionsMixin, import('vue').ComponentOptionsMixin, {}, import('vue').PublicProps, {
         height: number;
         fields: Array<import('..').TProFormField>;
         tools: Array<{
@@ -1826,7 +1829,10 @@ export declare const FcProDataTable: {
             disabled?: boolean | (() => boolean);
             hidden?: boolean | (() => boolean);
         }>;
-    }> & Readonly<{}>, {}, {}, {}, {}, {
+    }> & Readonly<{}>, {
+        loadData: () => Promise<void>;
+        tableData: import('vue').Ref<any[], any[]>;
+    }, {}, {}, {}, {
         height: number;
         fields: Array<import('..').TProFormField>;
         tools: Array<{
@@ -1882,7 +1888,10 @@ export declare const FcProDataTable: {
         disabled?: boolean | (() => boolean);
         hidden?: boolean | (() => boolean);
     }>;
-}> & Readonly<{}>, {}, {}, {}, {}, import('vue').ComponentOptionsMixin, import('vue').ComponentOptionsMixin, {}, string, {
+}> & Readonly<{}>, {
+    loadData: () => Promise<void>;
+    tableData: import('vue').Ref<any[], any[]>;
+}, {}, {}, {}, import('vue').ComponentOptionsMixin, import('vue').ComponentOptionsMixin, {}, string, {
     height: number;
     fields: Array<import('..').TProFormField>;
     tools: Array<{

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "@funcho/ui",
   "description": "@funcho ui library",
-  "version": "1.1.2",
+  "version": "1.1.4",
   "type": "module",
   "main": "dist/cjs/index.js",
   "module": "dist/esm/index.mjs",