@funcho/ui 1.1.34 → 1.1.36

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

@@ -152,15 +152,16 @@ const _sfc_main = /* @__PURE__ */ vue.defineComponent({
     const getIndex = (i) => {
       return (pagination.value.currentPage - 1) * pagination.value.pageSize + i + 1;
     };
-    const tableData = vue.ref([]);
-    const displayData = vue.computed(() => {
+    const requestTableData = vue.ref([]);
+    const tableData = vue.computed(() => {
       if (props.data !== void 0) {
         return props.data || [];
       }
-      return tableData.value;
+      return requestTableData.value;
     });
     const tableLoading = vue.ref(false);
     const loadData = async () => {
+      if (props.data !== void 0) return;
       if (props.request) {
         if (tableLoading.value) {
           return;
@@ -171,7 +172,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);
@@ -223,7 +224,7 @@ const _sfc_main = /* @__PURE__ */ vue.defineComponent({
       }, vue.createSlots({
         body: vue.withCtx(({ height: bodyHeight }) => [
           vue.withDirectives((vue.openBlock(), vue.createBlock(vue.unref(index.FcTable), vue.mergeProps(_ctx.$attrs, {
-            data: displayData.value,
+            data: tableData.value,
             border: "",
             "max-height": bodyHeight,
             onSelectionChange: handleSelectionChange

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

@@ -10,6 +10,7 @@ const Dialog_vue_vue_type_script_setup_true_lang = require('../../components/Dia
 const DataTable_vue_vue_type_script_setup_true_lang = require('../DataTable/DataTable.vue.js');
 ;/* empty css                           */
 const index = require('../../components/Notification/index.js');
+const useNamespace = require('../../hooks/use-namespace.js');
 
 const _sfc_main = /* @__PURE__ */ vue.defineComponent({
   ...{
@@ -26,12 +27,14 @@ const _sfc_main = /* @__PURE__ */ vue.defineComponent({
     showCancelButton: { type: Boolean, default: true },
     showConfirmButton: { type: Boolean, default: true },
     isPagination: { type: Boolean, default: false },
+    selectable: { type: Boolean, default: false },
     submitApi: { type: Function, default: void 0 },
     successMessage: { default: "提交成功！" },
     showSuccessMessage: { type: Boolean, default: true }
   },
   emits: ["submit", "cancel"],
   setup(__props, { expose: __expose, emit: __emit }) {
+    const ns = useNamespace.useNamespace("pro-data-table-dialog");
     const tableRef = vue.ref();
     const props = __props;
     const containerHeight = vue.computed(() => {
@@ -43,6 +46,10 @@ const _sfc_main = /* @__PURE__ */ vue.defineComponent({
     const visible = vue.ref(false);
     const emits = __emit;
     const submitting = vue.ref(false);
+    const confirmBtnDisabled = vue.computed(() => {
+      if (!props.selectable) return false;
+      return !tableRef.value?.selectedRows || tableRef.value.selectedRows.length === 0;
+    });
     const handleConfirmClick = async () => {
       try {
         const tableData = tableRef.value?.tableData;
@@ -87,7 +94,11 @@ const _sfc_main = /* @__PURE__ */ vue.defineComponent({
         modelValue: visible.value,
         "onUpdate:modelValue": _cache[0] || (_cache[0] = ($event) => visible.value = $event),
         title: __props.title,
-        width: __props.width
+        width: __props.width,
+        class: vue.normalizeClass({
+          [vue.unref(ns).b()]: true,
+          [vue.unref(ns).is("no-body-padding-bottom")]: __props.showCancelButton || __props.showConfirmButton
+        })
       }, vue.createSlots({
         default: vue.withCtx(() => [
           vue.createElementVNode("div", {
@@ -96,7 +107,10 @@ const _sfc_main = /* @__PURE__ */ vue.defineComponent({
             vue.createVNode(DataTable_vue_vue_type_script_setup_true_lang.default, vue.mergeProps({
               ref_key: "tableRef",
               ref: tableRef
-            }, _ctx.$attrs, { "is-pagination": __props.isPagination }), null, 16, ["is-pagination"])
+            }, _ctx.$attrs, {
+              "is-pagination": __props.isPagination,
+              selectable: __props.selectable
+            }), null, 16, ["is-pagination", "selectable"])
           ], 4)
         ]),
         _: 2
@@ -117,17 +131,18 @@ const _sfc_main = /* @__PURE__ */ vue.defineComponent({
               key: 1,
               type: "primary",
               loading: submitting.value,
+              disabled: confirmBtnDisabled.value,
               onClick: handleConfirmClick
             }, {
               default: vue.withCtx(() => [
                 vue.createTextVNode(vue.toDisplayString(__props.confirmButtonText), 1)
               ]),
               _: 1
-            }, 8, ["loading"])) : vue.createCommentVNode("", true)
+            }, 8, ["loading", "disabled"])) : vue.createCommentVNode("", true)
           ]),
           key: "0"
         } : void 0
-      ]), 1032, ["modelValue", "title", "width"]);
+      ]), 1032, ["modelValue", "title", "width", "class"]);
     };
   }
 });

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

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

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

@@ -148,15 +148,16 @@ const _sfc_main = /* @__PURE__ */ defineComponent({
     const getIndex = (i) => {
       return (pagination.value.currentPage - 1) * pagination.value.pageSize + i + 1;
     };
-    const tableData = ref([]);
-    const displayData = computed(() => {
+    const requestTableData = ref([]);
+    const tableData = computed(() => {
       if (props.data !== void 0) {
         return props.data || [];
       }
-      return tableData.value;
+      return requestTableData.value;
     });
     const tableLoading = ref(false);
     const loadData = async () => {
+      if (props.data !== void 0) return;
       if (props.request) {
         if (tableLoading.value) {
           return;
@@ -167,7 +168,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);
@@ -219,7 +220,7 @@ const _sfc_main = /* @__PURE__ */ defineComponent({
       }, createSlots({
         body: withCtx(({ height: bodyHeight }) => [
           withDirectives((openBlock(), createBlock(unref(FcTable), mergeProps(_ctx.$attrs, {
-            data: displayData.value,
+            data: tableData.value,
             border: "",
             "max-height": bodyHeight,
             onSelectionChange: handleSelectionChange

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

@@ -1,4 +1,4 @@
-import { defineComponent, ref, computed, createBlock, openBlock, createSlots, withCtx, createElementVNode, normalizeStyle, createVNode, mergeProps, createCommentVNode, createTextVNode, toDisplayString } from 'vue';
+import { defineComponent, ref, computed, createBlock, openBlock, normalizeClass, unref, createSlots, withCtx, createElementVNode, normalizeStyle, createVNode, mergeProps, createCommentVNode, createTextVNode, toDisplayString } from 'vue';
 import _sfc_main$3 from '../../components/Button/Button.vue.mjs';
 /* empty css                                   */
 import _sfc_main$1 from '../../components/Dialog/Dialog.vue.mjs';
@@ -6,6 +6,7 @@ import _sfc_main$1 from '../../components/Dialog/Dialog.vue.mjs';
 import _sfc_main$2 from '../DataTable/DataTable.vue.mjs';
 /* empty css                           */
 import { FcNotification } from '../../components/Notification/index.mjs';
+import { useNamespace } from '../../hooks/use-namespace.mjs';
 
 const _sfc_main = /* @__PURE__ */ defineComponent({
   ...{
@@ -22,12 +23,14 @@ const _sfc_main = /* @__PURE__ */ defineComponent({
     showCancelButton: { type: Boolean, default: true },
     showConfirmButton: { type: Boolean, default: true },
     isPagination: { type: Boolean, default: false },
+    selectable: { type: Boolean, default: false },
     submitApi: { type: Function, default: void 0 },
     successMessage: { default: "提交成功！" },
     showSuccessMessage: { type: Boolean, default: true }
   },
   emits: ["submit", "cancel"],
   setup(__props, { expose: __expose, emit: __emit }) {
+    const ns = useNamespace("pro-data-table-dialog");
     const tableRef = ref();
     const props = __props;
     const containerHeight = computed(() => {
@@ -39,6 +42,10 @@ const _sfc_main = /* @__PURE__ */ defineComponent({
     const visible = ref(false);
     const emits = __emit;
     const submitting = ref(false);
+    const confirmBtnDisabled = computed(() => {
+      if (!props.selectable) return false;
+      return !tableRef.value?.selectedRows || tableRef.value.selectedRows.length === 0;
+    });
     const handleConfirmClick = async () => {
       try {
         const tableData = tableRef.value?.tableData;
@@ -83,7 +90,11 @@ const _sfc_main = /* @__PURE__ */ defineComponent({
         modelValue: visible.value,
         "onUpdate:modelValue": _cache[0] || (_cache[0] = ($event) => visible.value = $event),
         title: __props.title,
-        width: __props.width
+        width: __props.width,
+        class: normalizeClass({
+          [unref(ns).b()]: true,
+          [unref(ns).is("no-body-padding-bottom")]: __props.showCancelButton || __props.showConfirmButton
+        })
       }, createSlots({
         default: withCtx(() => [
           createElementVNode("div", {
@@ -92,7 +103,10 @@ const _sfc_main = /* @__PURE__ */ defineComponent({
             createVNode(_sfc_main$2, mergeProps({
               ref_key: "tableRef",
               ref: tableRef
-            }, _ctx.$attrs, { "is-pagination": __props.isPagination }), null, 16, ["is-pagination"])
+            }, _ctx.$attrs, {
+              "is-pagination": __props.isPagination,
+              selectable: __props.selectable
+            }), null, 16, ["is-pagination", "selectable"])
           ], 4)
         ]),
         _: 2
@@ -113,17 +127,18 @@ const _sfc_main = /* @__PURE__ */ defineComponent({
               key: 1,
               type: "primary",
               loading: submitting.value,
+              disabled: confirmBtnDisabled.value,
               onClick: handleConfirmClick
             }, {
               default: withCtx(() => [
                 createTextVNode(toDisplayString(__props.confirmButtonText), 1)
               ]),
               _: 1
-            }, 8, ["loading"])) : createCommentVNode("", true)
+            }, 8, ["loading", "disabled"])) : createCommentVNode("", true)
           ]),
           key: "0"
         } : void 0
-      ]), 1032, ["modelValue", "title", "width"]);
+      ]), 1032, ["modelValue", "title", "width", "class"]);
     };
   }
 });

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

@@ -1,3 +1,3 @@
-const version = "1.1.34";
+const version = "1.1.36";
 
 export { version };

package/dist/style.css

@@ -17302,4 +17302,6 @@ to {
 }
 .fc-mkui-pro-vertical-layout__ghost-body {
   flex: 1;
+}.fc-mkui-pro-data-table-dialog.is-no-body-padding-bottom .fc-ui-dialog__body {
+  padding-bottom: 0;
 }

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

@@ -1471,7 +1471,7 @@ 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[]>;

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

@@ -1,7 +1,7 @@
 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[]>;
@@ -1492,7 +1492,7 @@ 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[]>;
@@ -1519,7 +1519,7 @@ 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[]>;

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

@@ -7,6 +7,7 @@ type __VLS_Props = {
     showCancelButton?: boolean;
     showConfirmButton?: boolean;
     isPagination?: boolean;
+    selectable?: boolean;
     submitApi?: (tableData: any, selectedRows: any) => Promise<{
         data: {};
     }>;
@@ -28,6 +29,7 @@ declare const _default: import('vue').DefineComponent<__VLS_Props, {
     cancelButtonText: string;
     width: string | number;
     height: string | number;
+    selectable: boolean;
     isPagination: boolean;
     submitApi: (tableData: any, selectedRows: any) => Promise<{
         data: {};
@@ -1535,7 +1537,7 @@ 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[]>;
@@ -1595,7 +1597,7 @@ declare const _default: import('vue').DefineComponent<__VLS_Props, {
         actionsWidth: number;
     }> & 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

@@ -8,6 +8,7 @@ export declare const FcProDataTableDialog: {
         showCancelButton?: boolean;
         showConfirmButton?: boolean;
         isPagination?: boolean;
+        selectable?: boolean;
         submitApi?: (tableData: any, selectedRows: any) => Promise<{
             data: {};
         }>;
@@ -28,6 +29,7 @@ export declare const FcProDataTableDialog: {
         cancelButtonText: string;
         width: string | number;
         height: string | number;
+        selectable: boolean;
         isPagination: boolean;
         submitApi: (tableData: any, selectedRows: any) => Promise<{
             data: {};
@@ -1535,7 +1537,7 @@ 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[]>;
@@ -1595,7 +1597,7 @@ export declare const FcProDataTableDialog: {
             actionsWidth: number;
         }> & 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[]>;
@@ -1620,6 +1622,7 @@ export declare const FcProDataTableDialog: {
         showCancelButton?: boolean;
         showConfirmButton?: boolean;
         isPagination?: boolean;
+        selectable?: boolean;
         submitApi?: (tableData: any, selectedRows: any) => Promise<{
             data: {};
         }>;
@@ -1637,6 +1640,7 @@ export declare const FcProDataTableDialog: {
         cancelButtonText: string;
         width: string | number;
         height: string | number;
+        selectable: boolean;
         isPagination: boolean;
         submitApi: (tableData: any, selectedRows: any) => Promise<{
             data: {};
@@ -1658,6 +1662,7 @@ export declare const FcProDataTableDialog: {
     showCancelButton?: boolean;
     showConfirmButton?: boolean;
     isPagination?: boolean;
+    selectable?: boolean;
     submitApi?: (tableData: any, selectedRows: any) => Promise<{
         data: {};
     }>;
@@ -1678,6 +1683,7 @@ export declare const FcProDataTableDialog: {
     cancelButtonText: string;
     width: string | number;
     height: string | number;
+    selectable: boolean;
     isPagination: boolean;
     submitApi: (tableData: any, selectedRows: any) => Promise<{
         data: {};

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "@funcho/ui",
   "description": "@funcho ui library",
-  "version": "1.1.34",
+  "version": "1.1.36",
   "type": "module",
   "main": "dist/cjs/index.js",
   "module": "dist/esm/index.mjs",
@@ -46,8 +46,8 @@
     "vite-plugin-dts": "^4.5.4",
     "vitest": "^4.0.7",
     "vue": "^3.5.22",
-    "@funcho/icons-vue": "1.0.3",
-    "@funcho/typescript-config": "0.0.1"
+    "@funcho/typescript-config": "0.0.1",
+    "@funcho/icons-vue": "1.0.3"
   },
   "peerDependencies": {
     "vue": "^3.5.22",