@deot/vc-components 1.0.19 → 1.0.21

package/dist/index.umd.cjs

@@ -14741,6 +14741,14 @@
 	    type: [String, Boolean],
 	    default: "取消"
 	  },
+	  okDisabled: {
+	    type: Boolean,
+	    default: false
+	  },
+	  cancelDisabled: {
+	    type: Boolean,
+	    default: false
+	  },
 	  footer: {
 	    type: Boolean,
 	    default: true
@@ -14890,11 +14898,13 @@
 	          "class": ['vc-drawer__footer']
 	        }, [slots['footer-extra']?.(), !slots.footer ? vue.createVNode(vue.Fragment, null, [props.cancelText && vue.createVNode(Button, {
 	          "style": "margin-right: 8px;",
+	          "disabled": props.cancelDisabled,
 	          "onClick": e => handleBefore(e, handleCancel)
 	        }, {
 	          default: () => [props.cancelText]
 	        }), props.okText && vue.createVNode(Button, {
 	          "type": "primary",
+	          "disabled": props.okDisabled,
 	          "onClick": e => handleBefore(e, handleOk)
 	        }, {
 	          default: () => [props.okText]
@@ -17105,6 +17115,14 @@
 	    type: Boolean,
 	    default: false
 	  },
+	  okDisabled: {
+	    type: Boolean,
+	    default: false
+	  },
+	  cancelDisabled: {
+	    type: Boolean,
+	    default: false
+	  },
 	  /**
 	   * 兼容portal设计, 实现Promise方式
 	   */
@@ -17450,11 +17468,13 @@
 	          }, 'vc-modal__footer']
 	        }, [slots['footer-extra']?.(), !slots.footer ? vue.createVNode(vue.Fragment, null, [props.cancelText && vue.createVNode(Button, {
 	          "style": "margin-right: 8px;",
+	          "disabled": props.cancelDisabled,
 	          "onClick": e => handleBefore(e, handleCancel)
 	        }, {
 	          default: () => [props.cancelText]
 	        }), props.okText && vue.createVNode(Button, {
 	          "type": "primary",
+	          "disabled": props.okDisabled,
 	          "onClick": e => handleBefore(e, handleOk)
 	        }, {
 	          default: () => [props.okText]
@@ -19975,12 +19995,21 @@
 	      const current = props.inverted ? rebuildData.value[rebuildDataIndexMap.value[index]] : rebuildData.value[index];
 	      if (!current) return; // 受到`removeUnusedPlaceholders`影响，无效的会被回收
 
+	      const oldSize = current.size;
 	      const dom = preloads.value[index] || curloads.value[props.inverted ? index : index - firstItemIndex.value];
 	      if (dom) {
 	        current.size = dom[K.offsetSize] || placeholderSize.value;
 	      } else if (current) {
 	        current.size = placeholderSize.value;
 	      }
+
+	      // 这样的考虑欠佳，待优化
+	      if (oldSize !== current.size) {
+	        emit('row-resize', {
+	          index: current.id,
+	          size: current.size
+	        });
+	      }
 	    };
 	    const refreshItemPosition = () => {
 	      const sizes = Array.from({
@@ -20210,13 +20239,6 @@
 	      leading: false,
 	      trailing: true
 	    });
-	    const handleRowChange = (e, row) => {
-	      emit('row-resize', {
-	        index: row.id,
-	        height: e.height,
-	        width: e.width
-	      });
-	    };
 
 	    // 设置初始数据
 	    const setDataSource = async (v, oldV) => {
@@ -20347,8 +20369,7 @@
 	            "data-column": item.column,
 	            "data-size": item.size,
 	            "data-position": item.position,
-	            "onResize": handleResize,
-	            "onChange": e => handleRowChange(e, item)
+	            "onResize": handleResize
 	          }, {
 	            default: () => [slots.default?.({
 	              row: item.data || {},
@@ -38948,8 +38969,7 @@
 	    const handleResize = (e, index) => {
 	      emit('row-resize', {
 	        index,
-	        height: e.height,
-	        width: e.width
+	        size: e.height
 	      });
 	    };
 	    return () => {
@@ -39211,7 +39231,9 @@
 	    const handleMergeRowResize = v => {
 	      if (table.props.rowHeight) return;
 	      states.list[v.index].rows.forEach(row => {
-	        row.heightMap[props.fixed || 'main'] = v.height;
+	        const old = row.heightMap[props.fixed || 'main'];
+	        if (old === v.size) return;
+	        row.heightMap[props.fixed || 'main'] = v.size;
 	        const heights = [row.heightMap.main];
 	        if (states.leftFixedCount) {
 	          heights.push(row.heightMap.left);
@@ -39533,7 +39555,7 @@
 	      }, [vue.createVNode("div", {
 	        "class": ['vc-table__cell',
 	        // {
-	        // 	"highlight": column.filteredValue && column.filteredValue.length > 0
+	        // 	"is-highlight": column.filteredValue && column.filteredValue.length > 0
 	        // },
 	        column.labelClass]
 	      }, [column.renderHeader ? column.renderHeader({
@@ -39567,6 +39589,7 @@
 	    border: Boolean
 	  },
 	  setup(props) {
+	    vue.inject('vc-table');
 	    const states = useStates({
 	      data: 'data',
 	      columns: 'columns',
@@ -39660,7 +39683,8 @@
 	        "key": columnIndex,
 	        "class": [getRowClasses(column, columnIndex), 'vc-table__td'],
 	        "style": [{
-	          width: `${column.realWidth}px`
+	          width: `${column.realWidth}px`,
+	          height: `44px`
 	        }]
 	      }, [vue.createVNode("div", {
 	        "class": ['vc-table__cell', column.labelClass]
@@ -39749,7 +39773,7 @@
 	  getSpan: Function,
 	  placeholder: {
 	    type: [String, Function],
-	    default: "--"
+	    default: "-"
 	  },
 	  /**
 	   * 排序全部交给外部处理，内部不处理数据，只做交互
@@ -40388,7 +40412,7 @@
 	  }
 	  let endIndex = 0;
 	  hiddenEl$1.innerText = suffix;
-	  value.split("").forEach((item, i) => {
+	  (value || "").split("").forEach((item, i) => {
 	    let old = hiddenEl$1.innerText;
 	    old = old.substring(0, old.length - suffix.length);
 	    hiddenEl$1.innerText = old + item + suffix;
@@ -40439,9 +40463,10 @@
 	      emit('clip', endIndex.value);
 	    };
 	    const handleResize = props.resize === true || props.resize === 0 ? calcPosition : debounce$1(calcPosition, props.resize || 0);
+	    let poper;
 	    const handleMouseOver = e => {
 	      if (endIndex.value > 0) {
-	        Popover.open({
+	        poper = Popover.open({
 	          el: document.body,
 	          name: 'vc-text-popover',
 	          // 确保不重复创建
@@ -40466,6 +40491,7 @@
 	    });
 	    vue.onBeforeUnmount(() => {
 	      props.resize !== false && Resize.off(instance.vnode.el, handleResize);
+	      poper?.destroy?.();
 	    });
 	    const Content = props.tag;
 	    return () => {
@@ -40608,7 +40634,7 @@
 	    return column.formatter(rowData);
 	  }
 	  const line = column.line || VcInstance.options.TableColumn?.line;
-	  if (line) {
+	  if (line && value) {
 	    const style = {
 	      // 目前左右pading为10
 	      // TODO: 含有border还要-1

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@deot/vc-components",
-  "version": "1.0.19",
+  "version": "1.0.21",
   "type": "module",
   "main": "dist/index.js",
   "types": "dist/index.d.ts",