3h1-ui 3.0.0-next.47 → 3.0.0-next.49

package/es/index.js

@@ -10057,6 +10057,7 @@ const _sfc_main$1n = defineComponent({
     });
     const spinStyle = computed(() => {
       return {
+        flex: 1,
         minHeight: `${props2.minHeight}px`,
         [props2.fullScreen ? "height" : "maxHeight"]: `${unref(
           realHeightRef
@@ -37680,17 +37681,17 @@ function handleColumnResize(propsRef, columns, wrapRef) {
   const length2 = columns.length;
   columns.forEach((item) => {
     const minWidth = ((item == null ? void 0 : item.title) + "").length * 14 + 16;
-    const colWidth = item.width || minWidth;
-    const countWidth = tableWidth && length2 - sumLength ? (tableWidth - sumWidth - selectWidth) / (length2 - sumLength) : colWidth;
+    const countWidth = (tableWidth - sumWidth - selectWidth) / (length2 - sumLength);
     if (item.flag)
       return;
+    const finallyWidth = minWidth > countWidth ? minWidth : countWidth;
     if (propsRef.value.resizable) {
-      item.width = colWidth > countWidth ? colWidth : countWidth;
+      item.width = item.width ? item.width : finallyWidth;
       item.minWidth = minWidth;
       item.resizable = item.resizable === void 0 ? true : item.resizable;
     } else {
       if (item.resizable) {
-        item.width = colWidth > countWidth ? colWidth : countWidth;
+        item.width = item.width ? item.width : finallyWidth;
         item.minWidth = minWidth;
       }
     }
@@ -37727,6 +37728,7 @@ function handleIndexColumn(propsRef, getPaginationRef, columns) {
   columns.unshift({
     flag: INDEX_COLUMN_FLAG,
     width: 50,
+    minWidth: 50,
     maxWidth: 50,
     title: "序号",
     align: "center",
@@ -37760,6 +37762,7 @@ function handleActionColumn(propsRef, columns) {
       ...columns[hasIndex],
       fixed: "right",
       width: ACTION_COLUMN_WIDTH,
+      minWidth: ACTION_COLUMN_WIDTH,
       ...actionColumn,
       maxWidth: actionColumn.width || ACTION_COLUMN_WIDTH,
       flag: ACTION_COLUMN_FLAG

package/es/style.css

@@ -1323,6 +1323,7 @@ span.iconify {
 }
 .shy-basic-modal :is(.ant-modal-body) {
   padding: unset !important;
+  display: flex;
   overflow: hidden;
 }
 .shy-basic-modal :is(.ant-modal-body) *::-webkit-scrollbar {
@@ -1782,6 +1783,7 @@ span.iconify {
 }
 .shy-basic-modal :is(.ant-modal-body) {
   padding: unset !important;
+  display: flex;
   overflow: hidden;
 }
 .shy-basic-modal :is(.ant-modal-body) *::-webkit-scrollbar {
@@ -8440,55 +8442,55 @@ html[data-theme='dark'] .full-loading[data-v-33b23b82]:not(.light) {
 }
 @media screen and (max-width: 1440px) {
   .shy-ant-form-wrapper-col-1 {
-    width: 46%;
+    min-width: 46%;
     max-width: 492px;
   }
 }
 @media screen and (max-width: 1920px) and (min-width: 1440px) {
   .shy-ant-form-wrapper-col-1 {
-    width: 47%;
+    min-width: 47%;
     max-width: 588px;
   }
 }
 @media screen and (min-width: 1920px) {
   .shy-ant-form-wrapper-col-1 {
-    width: 48%;
+    min-width: 48%;
     max-width: 828px;
   }
 }
 @media screen and (max-width: 1440px) {
   .shy-ant-form-wrapper-col-2 {
-    width: 69%;
+    min-width: 69%;
     max-width: 732px;
   }
 }
 @media screen and (max-width: 1920px) and (min-width: 1440px) {
   .shy-ant-form-wrapper-col-2 {
-    width: 70%;
+    min-width: 70%;
     max-width: 876px;
   }
 }
 @media screen and (min-width: 1920px) {
   .shy-ant-form-wrapper-col-2 {
-    width: 71%;
+    min-width: 71%;
     max-width: 1236px;
   }
 }
 @media screen and (max-width: 1440px) {
   .shy-ant-form-wrapper-col-3 {
-    width: 68%;
+    min-width: 68%;
     max-width: 720px;
   }
 }
 @media screen and (max-width: 1920px) and (min-width: 1440px) {
   .shy-ant-form-wrapper-col-3 {
-    width: 69%;
+    min-width: 69%;
     max-width: 864px;
   }
 }
 @media screen and (min-width: 1920px) {
   .shy-ant-form-wrapper-col-3 {
-    width: 70%;
+    min-width: 70%;
     max-width: 1224px;
   }
 }.wrapper[data-v-15e2dcbb] {

package/lib/index.js

@@ -10081,6 +10081,7 @@ const _sfc_main$1n = vue.defineComponent({
     });
     const spinStyle = vue.computed(() => {
       return {
+        flex: 1,
         minHeight: `${props2.minHeight}px`,
         [props2.fullScreen ? "height" : "maxHeight"]: `${vue.unref(
           realHeightRef
@@ -37704,17 +37705,17 @@ function handleColumnResize(propsRef, columns, wrapRef) {
   const length2 = columns.length;
   columns.forEach((item) => {
     const minWidth = ((item == null ? void 0 : item.title) + "").length * 14 + 16;
-    const colWidth = item.width || minWidth;
-    const countWidth = tableWidth && length2 - sumLength ? (tableWidth - sumWidth - selectWidth) / (length2 - sumLength) : colWidth;
+    const countWidth = (tableWidth - sumWidth - selectWidth) / (length2 - sumLength);
     if (item.flag)
       return;
+    const finallyWidth = minWidth > countWidth ? minWidth : countWidth;
     if (propsRef.value.resizable) {
-      item.width = colWidth > countWidth ? colWidth : countWidth;
+      item.width = item.width ? item.width : finallyWidth;
       item.minWidth = minWidth;
       item.resizable = item.resizable === void 0 ? true : item.resizable;
     } else {
       if (item.resizable) {
-        item.width = colWidth > countWidth ? colWidth : countWidth;
+        item.width = item.width ? item.width : finallyWidth;
         item.minWidth = minWidth;
       }
     }
@@ -37751,6 +37752,7 @@ function handleIndexColumn(propsRef, getPaginationRef, columns) {
   columns.unshift({
     flag: INDEX_COLUMN_FLAG,
     width: 50,
+    minWidth: 50,
     maxWidth: 50,
     title: "序号",
     align: "center",
@@ -37784,6 +37786,7 @@ function handleActionColumn(propsRef, columns) {
       ...columns[hasIndex],
       fixed: "right",
       width: ACTION_COLUMN_WIDTH,
+      minWidth: ACTION_COLUMN_WIDTH,
       ...actionColumn,
       maxWidth: actionColumn.width || ACTION_COLUMN_WIDTH,
       flag: ACTION_COLUMN_FLAG

package/lib/style.css

@@ -1323,6 +1323,7 @@ span.iconify {
 }
 .shy-basic-modal :is(.ant-modal-body) {
   padding: unset !important;
+  display: flex;
   overflow: hidden;
 }
 .shy-basic-modal :is(.ant-modal-body) *::-webkit-scrollbar {
@@ -1782,6 +1783,7 @@ span.iconify {
 }
 .shy-basic-modal :is(.ant-modal-body) {
   padding: unset !important;
+  display: flex;
   overflow: hidden;
 }
 .shy-basic-modal :is(.ant-modal-body) *::-webkit-scrollbar {
@@ -8440,55 +8442,55 @@ html[data-theme='dark'] .full-loading[data-v-33b23b82]:not(.light) {
 }
 @media screen and (max-width: 1440px) {
   .shy-ant-form-wrapper-col-1 {
-    width: 46%;
+    min-width: 46%;
     max-width: 492px;
   }
 }
 @media screen and (max-width: 1920px) and (min-width: 1440px) {
   .shy-ant-form-wrapper-col-1 {
-    width: 47%;
+    min-width: 47%;
     max-width: 588px;
   }
 }
 @media screen and (min-width: 1920px) {
   .shy-ant-form-wrapper-col-1 {
-    width: 48%;
+    min-width: 48%;
     max-width: 828px;
   }
 }
 @media screen and (max-width: 1440px) {
   .shy-ant-form-wrapper-col-2 {
-    width: 69%;
+    min-width: 69%;
     max-width: 732px;
   }
 }
 @media screen and (max-width: 1920px) and (min-width: 1440px) {
   .shy-ant-form-wrapper-col-2 {
-    width: 70%;
+    min-width: 70%;
     max-width: 876px;
   }
 }
 @media screen and (min-width: 1920px) {
   .shy-ant-form-wrapper-col-2 {
-    width: 71%;
+    min-width: 71%;
     max-width: 1236px;
   }
 }
 @media screen and (max-width: 1440px) {
   .shy-ant-form-wrapper-col-3 {
-    width: 68%;
+    min-width: 68%;
     max-width: 720px;
   }
 }
 @media screen and (max-width: 1920px) and (min-width: 1440px) {
   .shy-ant-form-wrapper-col-3 {
-    width: 69%;
+    min-width: 69%;
     max-width: 864px;
   }
 }
 @media screen and (min-width: 1920px) {
   .shy-ant-form-wrapper-col-3 {
-    width: 70%;
+    min-width: 70%;
     max-width: 1224px;
   }
 }.wrapper[data-v-15e2dcbb] {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "3h1-ui",
-  "version": "3.0.0-next.47",
+  "version": "3.0.0-next.49",
   "description": "",
   "main": "lib/index.js",
   "module": "es/index.js",