@funcho/ui 1.1.33 → 1.1.35

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

@@ -98,6 +98,7 @@ const _sfc_main = /* @__PURE__ */ vue.defineComponent({
     columns: { default: () => [] },
     isPagination: { type: Boolean, default: true },
     fields: { default: () => [] },
+    data: { default: void 0 },
     request: { type: Function, default: () => Promise.resolve({ data: { list: [], total: 0 } }) },
     actions: { default: () => [] },
     actionsWidth: { default: 0 },
@@ -106,6 +107,11 @@ const _sfc_main = /* @__PURE__ */ vue.defineComponent({
   setup(__props, { expose: __expose }) {
     const ns = useNamespace.useNamespace("data-table");
     const props = __props;
+    const showPagination = vue.computed(() => {
+      if (!props.isPagination) return false;
+      if (props.data !== void 0) return false;
+      return true;
+    });
     const renderActions = (actions, row, index) => {
       return vue.h(
         "div",
@@ -146,7 +152,13 @@ const _sfc_main = /* @__PURE__ */ vue.defineComponent({
     const getIndex = (i) => {
       return (pagination.value.currentPage - 1) * pagination.value.pageSize + i + 1;
     };
-    const tableData = vue.ref([]);
+    const requestTableData = vue.ref([]);
+    const tableData = vue.computed(() => {
+      if (props.data !== void 0) {
+        return props.data || [];
+      }
+      return requestTableData.value;
+    });
     const tableLoading = vue.ref(false);
     const loadData = async () => {
       if (props.request) {
@@ -159,7 +171,7 @@ const _sfc_main = /* @__PURE__ */ vue.defineComponent({
           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 || [];
+          requestTableData.value = Array.isArray(data) ? data : data.list || [];
           pagination.value.total = Array.isArray(data) ? data.length : data.total || 0;
         } catch (error) {
           console.log("获取数据失败", error);
@@ -292,7 +304,7 @@ const _sfc_main = /* @__PURE__ */ vue.defineComponent({
           ]),
           key: "0"
         } : void 0,
-        __props.isPagination ? {
+        showPagination.value ? {
           name: "footer",
           fn: vue.withCtx(() => [
             vue.createVNode(vue.unref(index$2.FcPagination), {

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

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

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

@@ -1,4 +1,4 @@
-import { defineComponent, ref, onMounted, resolveComponent, resolveDirective, createBlock, openBlock, normalizeClass, unref, createSlots, withCtx, withDirectives, mergeProps, createCommentVNode, createElementBlock, Fragment, renderList, resolveDynamicComponent, createVNode, renderSlot, h } from 'vue';
+import { defineComponent, computed, ref, onMounted, resolveComponent, resolveDirective, createBlock, openBlock, normalizeClass, unref, createSlots, withCtx, withDirectives, mergeProps, createCommentVNode, createElementBlock, Fragment, renderList, resolveDynamicComponent, createVNode, renderSlot, h } from 'vue';
 import { useNamespace } from '../../hooks/use-namespace.mjs';
 import { FcDangerButton, FcLinkButton } from '../../components/Button/index.mjs';
 import '../../components/Dialog/index.mjs';
@@ -94,6 +94,7 @@ const _sfc_main = /* @__PURE__ */ defineComponent({
     columns: { default: () => [] },
     isPagination: { type: Boolean, default: true },
     fields: { default: () => [] },
+    data: { default: void 0 },
     request: { type: Function, default: () => Promise.resolve({ data: { list: [], total: 0 } }) },
     actions: { default: () => [] },
     actionsWidth: { default: 0 },
@@ -102,6 +103,11 @@ const _sfc_main = /* @__PURE__ */ defineComponent({
   setup(__props, { expose: __expose }) {
     const ns = useNamespace("data-table");
     const props = __props;
+    const showPagination = computed(() => {
+      if (!props.isPagination) return false;
+      if (props.data !== void 0) return false;
+      return true;
+    });
     const renderActions = (actions, row, index) => {
       return h(
         "div",
@@ -142,7 +148,13 @@ const _sfc_main = /* @__PURE__ */ defineComponent({
     const getIndex = (i) => {
       return (pagination.value.currentPage - 1) * pagination.value.pageSize + i + 1;
     };
-    const tableData = ref([]);
+    const requestTableData = ref([]);
+    const tableData = computed(() => {
+      if (props.data !== void 0) {
+        return props.data || [];
+      }
+      return requestTableData.value;
+    });
     const tableLoading = ref(false);
     const loadData = async () => {
       if (props.request) {
@@ -155,7 +167,7 @@ const _sfc_main = /* @__PURE__ */ defineComponent({
           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 || [];
+          requestTableData.value = Array.isArray(data) ? data : data.list || [];
           pagination.value.total = Array.isArray(data) ? data.length : data.total || 0;
         } catch (error) {
           console.log("获取数据失败", error);
@@ -288,7 +300,7 @@ const _sfc_main = /* @__PURE__ */ defineComponent({
           ]),
           key: "0"
         } : void 0,
-        __props.isPagination ? {
+        showPagination.value ? {
           name: "footer",
           fn: withCtx(() => [
             createVNode(unref(FcPagination), {

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

@@ -1,3 +1,3 @@
-const version = "1.1.33";
+const version = "1.1.35";
 
 export { version };

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

@@ -32,6 +32,7 @@ export type TFcProDataTableProps = {
     }>;
     isPagination?: boolean;
     fields?: Array<TProFormField>;
+    data?: any[] | undefined;
     request?: (params: any) => Promise<RequestResult<any>>;
     actions?: Array<ButtonProps>;
     actionsWidth?: number;

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

@@ -1471,11 +1471,12 @@ declare function __VLS_template(): {
 type __VLS_TemplateResult = ReturnType<typeof __VLS_template>;
 declare const __VLS_component: import('vue').DefineComponent<TFcProDataTableProps, {
     loadData: () => Promise<void>;
-    tableData: import('vue').Ref<any[], any[]>;
+    tableData: import('vue').ComputedRef<any[]>;
     reload: () => void;
     resetSearch: () => void;
     selectedRows: import('vue').Ref<any[], any[]>;
 }, {}, {}, {}, import('vue').ComponentOptionsMixin, import('vue').ComponentOptionsMixin, {}, string, import('vue').PublicProps, Readonly<TFcProDataTableProps> & Readonly<{}>, {
+    data: any[];
     height: number;
     fields: Array<import('..').TProFormField>;
     tools: Array<ButtonProps>;

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

@@ -1,11 +1,12 @@
 export declare const FcProDataTable: {
     new (...args: any[]): import('vue').CreateComponentPublicInstanceWithMixins<Readonly<import('./DataTable.types').TFcProDataTableProps> & Readonly<{}>, {
         loadData: () => Promise<void>;
-        tableData: import('vue').Ref<any[], any[]>;
+        tableData: import('vue').ComputedRef<any[]>;
         reload: () => void;
         resetSearch: () => void;
         selectedRows: import('vue').Ref<any[], any[]>;
     }, {}, {}, {}, import('vue').ComponentOptionsMixin, import('vue').ComponentOptionsMixin, {}, import('vue').PublicProps, {
+        data: any[];
         height: number;
         fields: Array<import('..').TProFormField>;
         tools: Array<import('./DataTable.types').ButtonProps>;
@@ -1491,11 +1492,12 @@ export declare const FcProDataTable: {
         Defaults: {};
     }, Readonly<import('./DataTable.types').TFcProDataTableProps> & Readonly<{}>, {
         loadData: () => Promise<void>;
-        tableData: import('vue').Ref<any[], any[]>;
+        tableData: import('vue').ComputedRef<any[]>;
         reload: () => void;
         resetSearch: () => void;
         selectedRows: import('vue').Ref<any[], any[]>;
     }, {}, {}, {}, {
+        data: any[];
         height: number;
         fields: Array<import('..').TProFormField>;
         tools: Array<import('./DataTable.types').ButtonProps>;
@@ -1517,11 +1519,12 @@ export declare const FcProDataTable: {
     __isSuspense?: never;
 } & import('vue').ComponentOptionsBase<Readonly<import('./DataTable.types').TFcProDataTableProps> & Readonly<{}>, {
     loadData: () => Promise<void>;
-    tableData: import('vue').Ref<any[], any[]>;
+    tableData: import('vue').ComputedRef<any[]>;
     reload: () => void;
     resetSearch: () => void;
     selectedRows: import('vue').Ref<any[], any[]>;
 }, {}, {}, {}, import('vue').ComponentOptionsMixin, import('vue').ComponentOptionsMixin, {}, string, {
+    data: any[];
     height: number;
     fields: Array<import('..').TProFormField>;
     tools: Array<import('./DataTable.types').ButtonProps>;

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

@@ -52,6 +52,7 @@ declare const _default: import('vue').DefineComponent<__VLS_Props, {
             }> | undefined;
             readonly isPagination?: boolean | undefined;
             readonly fields?: Array<import('..').TProFormField> | undefined;
+            readonly data?: any[] | undefined | undefined;
             readonly request?: ((params: any) => Promise<import('..').RequestResult<any>>) | undefined;
             readonly actions?: Array<import('..').ButtonProps> | undefined;
             readonly actionsWidth?: number | undefined;
@@ -1534,11 +1535,12 @@ declare const _default: import('vue').DefineComponent<__VLS_Props, {
         $el: any;
         $options: import('vue').ComponentOptionsBase<Readonly<import('..').TFcProDataTableProps> & Readonly<{}>, {
             loadData: () => Promise<void>;
-            tableData: import('vue').Ref<any[], any[]>;
+            tableData: import('vue').ComputedRef<any[]>;
             reload: () => void;
             resetSearch: () => void;
             selectedRows: import('vue').Ref<any[], any[]>;
         }, {}, {}, {}, import('vue').ComponentOptionsMixin, import('vue').ComponentOptionsMixin, {}, string, {
+            data: any[];
             height: number;
             fields: Array<import('..').TProFormField>;
             tools: Array<import('..').ButtonProps>;
@@ -1575,6 +1577,7 @@ declare const _default: import('vue').DefineComponent<__VLS_Props, {
         $nextTick: typeof import('vue').nextTick;
         $watch<T extends string | ((...args: any) => any)>(source: T, cb: T extends (...args: any) => infer R ? (...args: [R, R, import('@vue/reactivity').OnCleanup]) => any : (...args: [any, any, import('@vue/reactivity').OnCleanup]) => any, options?: import('vue').WatchOptions): import('vue').WatchStopHandle;
     } & Readonly<{
+        data: any[];
         height: number;
         fields: Array<import('..').TProFormField>;
         tools: Array<import('..').ButtonProps>;
@@ -1590,9 +1593,9 @@ declare const _default: import('vue').DefineComponent<__VLS_Props, {
         request: (params: any) => Promise<import('..').RequestResult<any>>;
         actions: Array<import('..').ButtonProps>;
         actionsWidth: number;
-    }> & Omit<Readonly<import('..').TFcProDataTableProps> & Readonly<{}>, "loadData" | "tableData" | "reload" | "resetSearch" | "selectedRows" | ("height" | "fields" | "tools" | "columns" | "selectable" | "hasIndex" | "isPagination" | "request" | "actions" | "actionsWidth")> & import('vue').ShallowUnwrapRef<{
+    }> & Omit<Readonly<import('..').TFcProDataTableProps> & Readonly<{}>, "loadData" | "tableData" | "reload" | "resetSearch" | "selectedRows" | ("data" | "height" | "fields" | "tools" | "columns" | "selectable" | "hasIndex" | "isPagination" | "request" | "actions" | "actionsWidth")> & import('vue').ShallowUnwrapRef<{
         loadData: () => Promise<void>;
-        tableData: import('vue').Ref<any[], any[]>;
+        tableData: import('vue').ComputedRef<any[]>;
         reload: () => void;
         resetSearch: () => void;
         selectedRows: import('vue').Ref<any[], any[]>;

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

@@ -52,6 +52,7 @@ export declare const FcProDataTableDialog: {
                 }> | undefined;
                 readonly isPagination?: boolean | undefined;
                 readonly fields?: Array<import('..').TProFormField> | undefined;
+                readonly data?: any[] | undefined | undefined;
                 readonly request?: ((params: any) => Promise<import('..').RequestResult<any>>) | undefined;
                 readonly actions?: Array<import('..').ButtonProps> | undefined;
                 readonly actionsWidth?: number | undefined;
@@ -1534,11 +1535,12 @@ export declare const FcProDataTableDialog: {
             $el: any;
             $options: import('vue').ComponentOptionsBase<Readonly<import('..').TFcProDataTableProps> & Readonly<{}>, {
                 loadData: () => Promise<void>;
-                tableData: import('vue').Ref<any[], any[]>;
+                tableData: import('vue').ComputedRef<any[]>;
                 reload: () => void;
                 resetSearch: () => void;
                 selectedRows: import('vue').Ref<any[], any[]>;
             }, {}, {}, {}, import('vue').ComponentOptionsMixin, import('vue').ComponentOptionsMixin, {}, string, {
+                data: any[];
                 height: number;
                 fields: Array<import('..').TProFormField>;
                 tools: Array<import('..').ButtonProps>;
@@ -1575,6 +1577,7 @@ export declare const FcProDataTableDialog: {
             $nextTick: typeof import('vue').nextTick;
             $watch<T extends string | ((...args: any) => any)>(source: T, cb: T extends (...args: any) => infer R ? (...args: [R, R, import('@vue/reactivity').OnCleanup]) => any : (...args: [any, any, import('@vue/reactivity').OnCleanup]) => any, options?: import('vue').WatchOptions): import('vue').WatchStopHandle;
         } & Readonly<{
+            data: any[];
             height: number;
             fields: Array<import('..').TProFormField>;
             tools: Array<import('..').ButtonProps>;
@@ -1590,9 +1593,9 @@ export declare const FcProDataTableDialog: {
             request: (params: any) => Promise<import('..').RequestResult<any>>;
             actions: Array<import('..').ButtonProps>;
             actionsWidth: number;
-        }> & Omit<Readonly<import('..').TFcProDataTableProps> & Readonly<{}>, "loadData" | "tableData" | "reload" | "resetSearch" | "selectedRows" | ("height" | "fields" | "tools" | "columns" | "selectable" | "hasIndex" | "isPagination" | "request" | "actions" | "actionsWidth")> & import('vue').ShallowUnwrapRef<{
+        }> & Omit<Readonly<import('..').TFcProDataTableProps> & Readonly<{}>, "loadData" | "tableData" | "reload" | "resetSearch" | "selectedRows" | ("data" | "height" | "fields" | "tools" | "columns" | "selectable" | "hasIndex" | "isPagination" | "request" | "actions" | "actionsWidth")> & import('vue').ShallowUnwrapRef<{
             loadData: () => Promise<void>;
-            tableData: import('vue').Ref<any[], any[]>;
+            tableData: import('vue').ComputedRef<any[]>;
             reload: () => void;
             resetSearch: () => void;
             selectedRows: import('vue').Ref<any[], any[]>;

package/package.json

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