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

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
Files changed (3) hide show
  1. package/es/index.js +6 -4
  2. package/lib/index.js +6 -4
  3. package/package.json +2 -2
package/es/index.js CHANGED
@@ -37681,17 +37681,17 @@ function handleColumnResize(propsRef, columns, wrapRef) {
37681
37681
  const length2 = columns.length;
37682
37682
  columns.forEach((item) => {
37683
37683
  const minWidth = ((item == null ? void 0 : item.title) + "").length * 14 + 16;
37684
- const colWidth = item.width || minWidth;
37685
- const countWidth = tableWidth && length2 - sumLength ? (tableWidth - sumWidth - selectWidth) / (length2 - sumLength) : colWidth;
37684
+ const countWidth = (tableWidth - sumWidth - selectWidth) / (length2 - sumLength);
37686
37685
  if (item.flag)
37687
37686
  return;
37687
+ const finallyWidth = minWidth > countWidth ? minWidth : countWidth;
37688
37688
  if (propsRef.value.resizable) {
37689
- item.width = colWidth > countWidth ? colWidth : countWidth;
37689
+ item.width = item.width ? item.width : finallyWidth;
37690
37690
  item.minWidth = minWidth;
37691
37691
  item.resizable = item.resizable === void 0 ? true : item.resizable;
37692
37692
  } else {
37693
37693
  if (item.resizable) {
37694
- item.width = colWidth > countWidth ? colWidth : countWidth;
37694
+ item.width = item.width ? item.width : finallyWidth;
37695
37695
  item.minWidth = minWidth;
37696
37696
  }
37697
37697
  }
@@ -37728,6 +37728,7 @@ function handleIndexColumn(propsRef, getPaginationRef, columns) {
37728
37728
  columns.unshift({
37729
37729
  flag: INDEX_COLUMN_FLAG,
37730
37730
  width: 50,
37731
+ minWidth: 50,
37731
37732
  maxWidth: 50,
37732
37733
  title: "序号",
37733
37734
  align: "center",
@@ -37761,6 +37762,7 @@ function handleActionColumn(propsRef, columns) {
37761
37762
  ...columns[hasIndex],
37762
37763
  fixed: "right",
37763
37764
  width: ACTION_COLUMN_WIDTH,
37765
+ minWidth: ACTION_COLUMN_WIDTH,
37764
37766
  ...actionColumn,
37765
37767
  maxWidth: actionColumn.width || ACTION_COLUMN_WIDTH,
37766
37768
  flag: ACTION_COLUMN_FLAG
package/lib/index.js CHANGED
@@ -37705,17 +37705,17 @@ function handleColumnResize(propsRef, columns, wrapRef) {
37705
37705
  const length2 = columns.length;
37706
37706
  columns.forEach((item) => {
37707
37707
  const minWidth = ((item == null ? void 0 : item.title) + "").length * 14 + 16;
37708
- const colWidth = item.width || minWidth;
37709
- const countWidth = tableWidth && length2 - sumLength ? (tableWidth - sumWidth - selectWidth) / (length2 - sumLength) : colWidth;
37708
+ const countWidth = (tableWidth - sumWidth - selectWidth) / (length2 - sumLength);
37710
37709
  if (item.flag)
37711
37710
  return;
37711
+ const finallyWidth = minWidth > countWidth ? minWidth : countWidth;
37712
37712
  if (propsRef.value.resizable) {
37713
- item.width = colWidth > countWidth ? colWidth : countWidth;
37713
+ item.width = item.width ? item.width : finallyWidth;
37714
37714
  item.minWidth = minWidth;
37715
37715
  item.resizable = item.resizable === void 0 ? true : item.resizable;
37716
37716
  } else {
37717
37717
  if (item.resizable) {
37718
- item.width = colWidth > countWidth ? colWidth : countWidth;
37718
+ item.width = item.width ? item.width : finallyWidth;
37719
37719
  item.minWidth = minWidth;
37720
37720
  }
37721
37721
  }
@@ -37752,6 +37752,7 @@ function handleIndexColumn(propsRef, getPaginationRef, columns) {
37752
37752
  columns.unshift({
37753
37753
  flag: INDEX_COLUMN_FLAG,
37754
37754
  width: 50,
37755
+ minWidth: 50,
37755
37756
  maxWidth: 50,
37756
37757
  title: "序号",
37757
37758
  align: "center",
@@ -37785,6 +37786,7 @@ function handleActionColumn(propsRef, columns) {
37785
37786
  ...columns[hasIndex],
37786
37787
  fixed: "right",
37787
37788
  width: ACTION_COLUMN_WIDTH,
37789
+ minWidth: ACTION_COLUMN_WIDTH,
37788
37790
  ...actionColumn,
37789
37791
  maxWidth: actionColumn.width || ACTION_COLUMN_WIDTH,
37790
37792
  flag: ACTION_COLUMN_FLAG
package/package.json CHANGED
@@ -1,6 +1,6 @@
1
1
  {
2
2
  "name": "3h1-ui",
3
- "version": "3.0.0-next.48",
3
+ "version": "3.0.0-next.49",
4
4
  "description": "",
5
5
  "main": "lib/index.js",
6
6
  "module": "es/index.js",
@@ -29,8 +29,8 @@
29
29
  "vue-json-pretty": "^2.2.3",
30
30
  "vxe-table": "^4.3.6",
31
31
  "xe-utils": "^3.5.7",
32
- "@shy-plugins/use": "1.0.0-next.1",
33
32
  "@shy-plugins/tinymce": "^1.0.6",
33
+ "@shy-plugins/use": "1.0.0-next.1",
34
34
  "@shy-plugins/utils": "1.0.0-next.1"
35
35
  },
36
36
  "types": "es/ui/index.d.ts",