3h1-ui 2.15.15 → 2.15.17

package/es/index.js

@@ -23258,6 +23258,10 @@ const basicProps = {
   },
   sortConfig: {
     showIcon: false
+  },
+  pagination: {
+    type: [Object, Boolean],
+    default: true
   }
 };
 const basicColumn = {
@@ -23267,13 +23271,24 @@ const basicColumn = {
   visible: true,
   sortable: false
 };
-const usePagination = () => {
-  const page = reactive({
-    total: 0,
-    current: 1,
-    pageSize: 10,
-    pageSizeOptions: ["10", "20", "30", "40"]
-  });
+const usePagination = (getProps) => {
+  watch(
+    () => getProps.value.pagination,
+    (pagination) => {
+      if (!isBoolean(pagination) && pagination) {
+        setPage(pagination);
+      }
+    }
+  );
+  const page = reactive(
+    {
+      total: 0,
+      current: 1,
+      pageSize: 10,
+      pageSizeOptions: ["10", "20", "30", "40"],
+      ...getProps.value.pagination
+    }
+  );
   const setPage = (pageInfo) => {
     return new Promise((resolve) => {
       nextTick(() => {
@@ -23290,7 +23305,11 @@ const useTableData = (getProps, { setPage, params, tableRef }) => {
   const dataSource = ref([]);
   const setTableData = (data) => {
     dataSource.value = data.map((item) => {
-      item._isEdit = false;
+      if (getProps.value.isUseEdit) {
+        item._isEdit = true;
+      } else {
+        item._isEdit = false;
+      }
       return item;
     });
   };
@@ -23300,6 +23319,7 @@ const useTableData = (getProps, { setPage, params, tableRef }) => {
   const reload = async () => {
     var _a2;
     if ((_a2 = getProps.value) == null ? void 0 : _a2.api) {
+      /* @__PURE__ */ console.log("22", params.value);
       const res = await getProps.value.api(params.value);
       const isArrayResult = Array.isArray(res);
       let resultItems = isArrayResult ? res : get(res, "records");
@@ -24226,6 +24246,7 @@ const _sfc_main$3 = /* @__PURE__ */ defineComponent({
     api: null,
     columns: { default: () => [] },
     isShowSeq: { type: Boolean, default: true },
+    isShowExpand: { type: Boolean, default: false },
     isCompatible: { type: Boolean, default: false },
     actionColumn: { default: () => {
       return {
@@ -24256,7 +24277,12 @@ const _sfc_main$3 = /* @__PURE__ */ defineComponent({
     columnSeq: { default: () => {
       return {};
     } },
-    transDataAfterReload: null
+    transDataAfterReload: null,
+    pagination: { default: {
+      type: [Object, Boolean],
+      default: true
+    } },
+    data: null
   },
   emits: [
     "register",
@@ -24267,6 +24293,13 @@ const _sfc_main$3 = /* @__PURE__ */ defineComponent({
   ],
   setup(__props, { emit: emits }) {
     const props2 = __props;
+    const expandVisibleMethod = ({ row }) => {
+      if (row.childList && row.childList.length > 0) {
+        return true;
+      } else {
+        return false;
+      }
+    };
     const prefixCls2 = "shy-basic-table-plus";
     const getClassName = (className) => {
       return `${prefixCls2}-${className}`;
@@ -24291,7 +24324,7 @@ const _sfc_main$3 = /* @__PURE__ */ defineComponent({
     const getBindValues = computed(() => {
       return deepMergeObjects(basicProps, attrs, getProps.value);
     });
-    const { page, setPage } = usePagination();
+    const { page, setPage } = usePagination(getProps);
     const handlePageChange = (current, pageSize) => {
       setPage({ current, pageSize });
       reload();
@@ -24348,6 +24381,15 @@ const _sfc_main$3 = /* @__PURE__ */ defineComponent({
       params,
       tableRef
     });
+    const realDataSource = computed(() => {
+      if (dataSource.value && dataSource.value.length > 0) {
+        return dataSource.value;
+      } else if (getProps.value.data && getProps.value.data.length > 0) {
+        return getProps.value.data;
+      } else {
+        return [];
+      }
+    });
     const getSwitchShowText = (column, row) => {
       const {
         unCheckedChildren = "否",
@@ -24502,12 +24544,13 @@ const _sfc_main$3 = /* @__PURE__ */ defineComponent({
             ref_key: "tableRef",
             ref: tableRef
           }, unref(getBindValues), {
-            data: unref(dataSource),
+            data: unref(realDataSource),
             onCheckboxAll: handleCheckboxChange,
             onCheckboxChange: handleCheckboxChange,
             onRadioChange: handleRadioChange,
             "show-overflow": "",
-            "column-config": { resizable: true }
+            "column-config": { resizable: true },
+            "expand-config": { visibleMethod: expandVisibleMethod }
           }), {
             default: withCtx(() => {
               var _a2, _b, _c, _d, _e, _f;
@@ -24526,8 +24569,19 @@ const _sfc_main$3 = /* @__PURE__ */ defineComponent({
                   width: "60",
                   align: "center"
                 })) : createCommentVNode("", true),
-                unref(getProps).isShowSeq ? (openBlock(), createBlock(unref(VxeColumn), mergeProps({
+                unref(getProps).isShowExpand ? (openBlock(), createBlock(unref(VxeColumn), {
                   key: 2,
+                  fixed: "left",
+                  type: "expand",
+                  width: "40"
+                }, {
+                  content: withCtx((data) => [
+                    renderSlot(_ctx.$slots, "expand", normalizeProps(guardReactiveProps(data || {})))
+                  ]),
+                  _: 3
+                })) : createCommentVNode("", true),
+                unref(getProps).isShowSeq ? (openBlock(), createBlock(unref(VxeColumn), mergeProps({
+                  key: 3,
                   type: "seq",
                   width: "60",
                   align: "center",
@@ -24599,7 +24653,7 @@ const _sfc_main$3 = /* @__PURE__ */ defineComponent({
                   ], 64);
                 }), 128)),
                 unref(getProps).isShowAction ? (openBlock(), createBlock(unref(VxeColumn), mergeProps({
-                  key: 3,
+                  key: 4,
                   title: "操作",
                   field: "action",
                   align: "center"
@@ -24626,7 +24680,7 @@ const _sfc_main$3 = /* @__PURE__ */ defineComponent({
               ];
             }),
             _: 3
-          }, 16, ["data"])
+          }, 16, ["data", "expand-config"])
         ], 2),
         unref(page).total !== 0 && unref(getProps).isShowPagination ? (openBlock(), createElementBlock("div", {
           key: 2,

package/lib/index.js

@@ -23282,6 +23282,10 @@ const basicProps = {
   },
   sortConfig: {
     showIcon: false
+  },
+  pagination: {
+    type: [Object, Boolean],
+    default: true
   }
 };
 const basicColumn = {
@@ -23291,13 +23295,24 @@ const basicColumn = {
   visible: true,
   sortable: false
 };
-const usePagination = () => {
-  const page = vue.reactive({
-    total: 0,
-    current: 1,
-    pageSize: 10,
-    pageSizeOptions: ["10", "20", "30", "40"]
-  });
+const usePagination = (getProps) => {
+  vue.watch(
+    () => getProps.value.pagination,
+    (pagination) => {
+      if (!utils.isBoolean(pagination) && pagination) {
+        setPage(pagination);
+      }
+    }
+  );
+  const page = vue.reactive(
+    {
+      total: 0,
+      current: 1,
+      pageSize: 10,
+      pageSizeOptions: ["10", "20", "30", "40"],
+      ...getProps.value.pagination
+    }
+  );
   const setPage = (pageInfo) => {
     return new Promise((resolve) => {
       vue.nextTick(() => {
@@ -23314,7 +23329,11 @@ const useTableData = (getProps, { setPage, params, tableRef }) => {
   const dataSource = vue.ref([]);
   const setTableData = (data) => {
     dataSource.value = data.map((item) => {
-      item._isEdit = false;
+      if (getProps.value.isUseEdit) {
+        item._isEdit = true;
+      } else {
+        item._isEdit = false;
+      }
       return item;
     });
   };
@@ -23324,6 +23343,7 @@ const useTableData = (getProps, { setPage, params, tableRef }) => {
   const reload = async () => {
     var _a2;
     if ((_a2 = getProps.value) == null ? void 0 : _a2.api) {
+      /* @__PURE__ */ console.log("22", params.value);
       const res = await getProps.value.api(params.value);
       const isArrayResult = Array.isArray(res);
       let resultItems = isArrayResult ? res : get(res, "records");
@@ -24250,6 +24270,7 @@ const _sfc_main$3 = /* @__PURE__ */ vue.defineComponent({
     api: null,
     columns: { default: () => [] },
     isShowSeq: { type: Boolean, default: true },
+    isShowExpand: { type: Boolean, default: false },
     isCompatible: { type: Boolean, default: false },
     actionColumn: { default: () => {
       return {
@@ -24280,7 +24301,12 @@ const _sfc_main$3 = /* @__PURE__ */ vue.defineComponent({
     columnSeq: { default: () => {
       return {};
     } },
-    transDataAfterReload: null
+    transDataAfterReload: null,
+    pagination: { default: {
+      type: [Object, Boolean],
+      default: true
+    } },
+    data: null
   },
   emits: [
     "register",
@@ -24291,6 +24317,13 @@ const _sfc_main$3 = /* @__PURE__ */ vue.defineComponent({
   ],
   setup(__props, { emit: emits }) {
     const props2 = __props;
+    const expandVisibleMethod = ({ row }) => {
+      if (row.childList && row.childList.length > 0) {
+        return true;
+      } else {
+        return false;
+      }
+    };
     const prefixCls2 = "shy-basic-table-plus";
     const getClassName = (className) => {
       return `${prefixCls2}-${className}`;
@@ -24315,7 +24348,7 @@ const _sfc_main$3 = /* @__PURE__ */ vue.defineComponent({
     const getBindValues = vue.computed(() => {
       return utils.deepMergeObjects(basicProps, attrs, getProps.value);
     });
-    const { page, setPage } = usePagination();
+    const { page, setPage } = usePagination(getProps);
     const handlePageChange = (current, pageSize) => {
       setPage({ current, pageSize });
       reload();
@@ -24372,6 +24405,15 @@ const _sfc_main$3 = /* @__PURE__ */ vue.defineComponent({
       params,
       tableRef
     });
+    const realDataSource = vue.computed(() => {
+      if (dataSource.value && dataSource.value.length > 0) {
+        return dataSource.value;
+      } else if (getProps.value.data && getProps.value.data.length > 0) {
+        return getProps.value.data;
+      } else {
+        return [];
+      }
+    });
     const getSwitchShowText = (column, row) => {
       const {
         unCheckedChildren = "否",
@@ -24526,12 +24568,13 @@ const _sfc_main$3 = /* @__PURE__ */ vue.defineComponent({
             ref_key: "tableRef",
             ref: tableRef
           }, vue.unref(getBindValues), {
-            data: vue.unref(dataSource),
+            data: vue.unref(realDataSource),
             onCheckboxAll: handleCheckboxChange,
             onCheckboxChange: handleCheckboxChange,
             onRadioChange: handleRadioChange,
             "show-overflow": "",
-            "column-config": { resizable: true }
+            "column-config": { resizable: true },
+            "expand-config": { visibleMethod: expandVisibleMethod }
           }), {
             default: vue.withCtx(() => {
               var _a2, _b, _c, _d, _e, _f;
@@ -24550,8 +24593,19 @@ const _sfc_main$3 = /* @__PURE__ */ vue.defineComponent({
                   width: "60",
                   align: "center"
                 })) : vue.createCommentVNode("", true),
-                vue.unref(getProps).isShowSeq ? (vue.openBlock(), vue.createBlock(vue.unref(vxeTable.VxeColumn), vue.mergeProps({
+                vue.unref(getProps).isShowExpand ? (vue.openBlock(), vue.createBlock(vue.unref(vxeTable.VxeColumn), {
                   key: 2,
+                  fixed: "left",
+                  type: "expand",
+                  width: "40"
+                }, {
+                  content: vue.withCtx((data) => [
+                    vue.renderSlot(_ctx.$slots, "expand", vue.normalizeProps(vue.guardReactiveProps(data || {})))
+                  ]),
+                  _: 3
+                })) : vue.createCommentVNode("", true),
+                vue.unref(getProps).isShowSeq ? (vue.openBlock(), vue.createBlock(vue.unref(vxeTable.VxeColumn), vue.mergeProps({
+                  key: 3,
                   type: "seq",
                   width: "60",
                   align: "center",
@@ -24623,7 +24677,7 @@ const _sfc_main$3 = /* @__PURE__ */ vue.defineComponent({
                   ], 64);
                 }), 128)),
                 vue.unref(getProps).isShowAction ? (vue.openBlock(), vue.createBlock(vue.unref(vxeTable.VxeColumn), vue.mergeProps({
-                  key: 3,
+                  key: 4,
                   title: "操作",
                   field: "action",
                   align: "center"
@@ -24650,7 +24704,7 @@ const _sfc_main$3 = /* @__PURE__ */ vue.defineComponent({
               ];
             }),
             _: 3
-          }, 16, ["data"])
+          }, 16, ["data", "expand-config"])
         ], 2),
         vue.unref(page).total !== 0 && vue.unref(getProps).isShowPagination ? (vue.openBlock(), vue.createElementBlock("div", {
           key: 2,

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "3h1-ui",
-  "version": "2.15.15",
+  "version": "2.15.17",
   "description": "",
   "main": "lib/index.js",
   "module": "es/index.js",