3h1-ui 2.14.31 → 2.14.34

package/es/index.js

@@ -12430,7 +12430,10 @@ const _sfc_main$F = /* @__PURE__ */ defineComponent({
       type: String,
       default: ""
     },
-    index: propTypes.number
+    index: propTypes.number,
+    tableAction: {
+      type: Object
+    }
   },
   setup(props2) {
     const table2 = useTableContext();
@@ -12468,14 +12471,16 @@ const _sfc_main$F = /* @__PURE__ */ defineComponent({
       const {
         record,
         column,
-        index: index2
+        index: index2,
+        tableAction
       } = props2;
       if (isFunction$4(compProps)) {
         compProps = compProps({
           text: val,
           record,
           column,
-          index: index2
+          index: index2,
+          tableAction
         }) ?? {};
       }
       compProps.onChangeTemp = compProps.onChange;
@@ -12889,7 +12894,7 @@ const uuId = ref();
 function isNeedRefresh() {
   uuId.value = buildUUID();
 }
-function renderEditCell(column) {
+function renderEditCell(column, tableAction) {
   return ({ text: value, record, index: index2 }) => {
     toRaw(record).onValid = async () => {
       if (isArray$3(record == null ? void 0 : record.validCbs)) {
@@ -12925,6 +12930,7 @@ function renderEditCell(column) {
       record,
       column,
       index: index2,
+      tableAction,
       uuId: uuId.value
     });
   };
@@ -13010,7 +13016,7 @@ function handleActionColumn(propsRef, columns) {
     });
   }
 }
-function useColumns$1(propsRef, getPaginationRef) {
+function useColumns$1(propsRef, getPaginationRef, tableAction) {
   const columnsRef = ref(unref(propsRef).columns);
   let cacheColumns = unref(propsRef).columns;
   const getColumnsRef = computed(() => {
@@ -13063,7 +13069,7 @@ function useColumns$1(propsRef, getPaginationRef) {
         };
       }
       if ((edit || editRow) && !isDefaultAction) {
-        column.customRender = renderEditCell(column);
+        column.customRender = renderEditCell(column, tableAction.value);
       }
       if (propsRef.value.useAdvancedSearch) {
         if (column.flag === "INDEX" || column.flag === "ACTION") {
@@ -15957,6 +15963,7 @@ const _sfc_main$s = defineComponent({
       const { onChange } = unref(getProps);
       onChange && isFunction$4(onChange) && onChange.call(void 0, ...args);
     }
+    const tableActionRef = computed(() => tableAction);
     const {
       getViewColumns,
       getColumns,
@@ -15964,7 +15971,7 @@ const _sfc_main$s = defineComponent({
       setColumns,
       getColumnsRef,
       getCacheColumns
-    } = useColumns$1(getProps, getPaginationInfo);
+    } = useColumns$1(getProps, getPaginationInfo, tableActionRef);
     const { getScrollRef, redoHeight } = useTableScroll(
       getProps,
       tableElRef,
@@ -16413,7 +16420,7 @@ const _sfc_main$q = /* @__PURE__ */ defineComponent({
     const getActions = computed(() => {
       const cacheActions = [];
       return (toRaw(props2.actions) || []).filter((action, _) => {
-        if (isIfShow(action) && cacheActions.length < props2.showCount) {
+        if (isIfShow(action) && cacheActions.length < props2.showCount - (props2.actions.length !== props2.showCount ? 1 : 0)) {
           cacheActions.push(action);
           return true;
         } else
@@ -16435,7 +16442,7 @@ const _sfc_main$q = /* @__PURE__ */ defineComponent({
     const getDropdownList = computed(() => {
       const cacheActions = [];
       const list = (toRaw(props2.actions) || []).filter((action, index2) => {
-        if (isIfShow(action) && cacheActions.length < props2.showCount) {
+        if (isIfShow(action) && cacheActions.length < props2.showCount - (props2.actions.length !== props2.showCount ? 1 : 0)) {
           cacheActions.push(action);
           return false;
         } else if (isIfShow(action))

package/es/style.css

@@ -25631,6 +25631,17 @@ span.iconify {
 .shy-basic-table .ant-tag {
   margin-right: 0;
 }
+.shy-basic-table .ant-table-thead .ant-table-selection-column::before {
+  position: absolute;
+  top: 50%;
+  right: 0;
+  width: 1px;
+  height: 1.6em;
+  background-color: rgba(0, 0, 0, 0.06);
+  content: "";
+  transform: translateY(-50%);
+  transition: background-color 0.3s;
+}
 .shy-basic-table .ant-table-wrapper {
   padding: 0 !important;
   background-color: #fff;

package/lib/index.js

@@ -12432,7 +12432,10 @@ const _sfc_main$F = /* @__PURE__ */ vue.defineComponent({
       type: String,
       default: ""
     },
-    index: utils.propTypes.number
+    index: utils.propTypes.number,
+    tableAction: {
+      type: Object
+    }
   },
   setup(props2) {
     const table2 = useTableContext();
@@ -12470,14 +12473,16 @@ const _sfc_main$F = /* @__PURE__ */ vue.defineComponent({
       const {
         record,
         column,
-        index: index2
+        index: index2,
+        tableAction
       } = props2;
       if (utils.isFunction(compProps)) {
         compProps = compProps({
           text: val,
           record,
           column,
-          index: index2
+          index: index2,
+          tableAction
         }) ?? {};
       }
       compProps.onChangeTemp = compProps.onChange;
@@ -12891,7 +12896,7 @@ const uuId = vue.ref();
 function isNeedRefresh() {
   uuId.value = utils.buildUUID();
 }
-function renderEditCell(column) {
+function renderEditCell(column, tableAction) {
   return ({ text: value, record, index: index2 }) => {
     vue.toRaw(record).onValid = async () => {
       if (utils.isArray(record == null ? void 0 : record.validCbs)) {
@@ -12927,6 +12932,7 @@ function renderEditCell(column) {
       record,
       column,
       index: index2,
+      tableAction,
       uuId: uuId.value
     });
   };
@@ -13012,7 +13018,7 @@ function handleActionColumn(propsRef, columns) {
     });
   }
 }
-function useColumns$1(propsRef, getPaginationRef) {
+function useColumns$1(propsRef, getPaginationRef, tableAction) {
   const columnsRef = vue.ref(vue.unref(propsRef).columns);
   let cacheColumns = vue.unref(propsRef).columns;
   const getColumnsRef = vue.computed(() => {
@@ -13065,7 +13071,7 @@ function useColumns$1(propsRef, getPaginationRef) {
         };
       }
       if ((edit || editRow) && !isDefaultAction) {
-        column.customRender = renderEditCell(column);
+        column.customRender = renderEditCell(column, tableAction.value);
       }
       if (propsRef.value.useAdvancedSearch) {
         if (column.flag === "INDEX" || column.flag === "ACTION") {
@@ -15959,6 +15965,7 @@ const _sfc_main$s = vue.defineComponent({
       const { onChange } = vue.unref(getProps);
       onChange && utils.isFunction(onChange) && onChange.call(void 0, ...args);
     }
+    const tableActionRef = vue.computed(() => tableAction);
     const {
       getViewColumns,
       getColumns,
@@ -15966,7 +15973,7 @@ const _sfc_main$s = vue.defineComponent({
       setColumns,
       getColumnsRef,
       getCacheColumns
-    } = useColumns$1(getProps, getPaginationInfo);
+    } = useColumns$1(getProps, getPaginationInfo, tableActionRef);
     const { getScrollRef, redoHeight } = useTableScroll(
       getProps,
       tableElRef,
@@ -16415,7 +16422,7 @@ const _sfc_main$q = /* @__PURE__ */ vue.defineComponent({
     const getActions = vue.computed(() => {
       const cacheActions = [];
       return (vue.toRaw(props2.actions) || []).filter((action, _) => {
-        if (isIfShow(action) && cacheActions.length < props2.showCount) {
+        if (isIfShow(action) && cacheActions.length < props2.showCount - (props2.actions.length !== props2.showCount ? 1 : 0)) {
           cacheActions.push(action);
           return true;
         } else
@@ -16437,7 +16444,7 @@ const _sfc_main$q = /* @__PURE__ */ vue.defineComponent({
     const getDropdownList = vue.computed(() => {
       const cacheActions = [];
       const list = (vue.toRaw(props2.actions) || []).filter((action, index2) => {
-        if (isIfShow(action) && cacheActions.length < props2.showCount) {
+        if (isIfShow(action) && cacheActions.length < props2.showCount - (props2.actions.length !== props2.showCount ? 1 : 0)) {
           cacheActions.push(action);
           return false;
         } else if (isIfShow(action))

package/package.json

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