@deot/vc-components 1.0.61 → 1.0.63

package/dist/index.umd.cjs

@@ -10891,6 +10891,7 @@
 	    const minute = vue.ref('');
 	    const second = vue.ref('');
 	    const millisecond = vue.ref('');
+	    const isComplete = vue.ref(false);
 	    const showResult = vue.computed(() => {
 	      return !props.render && !slots.default;
 	    });
@@ -10963,15 +10964,18 @@
 
 	      if (timestamp <= 0) {
 	        stop();
-	        emit('change', {
-	          timestamp: 0,
-	          day: '00',
-	          hour: '00',
-	          minute: '00',
-	          second: '00',
-	          millisecond: '00'
-	        });
-	        emit('complete');
+	        if (!isComplete.value) {
+	          isComplete.value = true;
+	          emit('change', {
+	            timestamp: 0,
+	            day: '00',
+	            hour: '00',
+	            minute: '00',
+	            second: '00',
+	            millisecond: '00'
+	          });
+	          emit('complete');
+	        }
 	      } else {
 	        emit('change', {
 	          timestamp,
@@ -10986,6 +10990,8 @@
 	    const start = () => {
 	      if (targetTimestamp.value) {
 	        timer && clearInterval(timer);
+	        isComplete.value = false;
+	        run(); // 立即执行一次，界面马上展示当前数值
 	        timer = setInterval(run, T.value);
 	      }
 	    };
@@ -15204,10 +15210,11 @@
 	      "vc-scroller__wrapper"
 	    ];
 	  });
-	  const refreshSize = () => {
+	  const refreshSize = async () => {
 	    if (!wrapper.value) return;
 	    wrapperW.value = wrapper.value.clientWidth;
 	    wrapperH.value = wrapper.value.clientHeight;
+	    await vue.nextTick();
 	    contentH.value = wrapper.value.scrollHeight;
 	    contentW.value = wrapper.value.scrollWidth;
 	  };
@@ -23469,11 +23476,10 @@
 	      } = owner.exposed;
 	      return !multiple.value ? true : current.value.slice(-1)[0] === props.value;
 	    });
-	    const searchRegex = vue.computed(() => {
-	      const v = owner.exposed.searchValue.value.trim().replace(/\s+/g, ' ').split(/\s|,/);
-	      return new RegExp(`(${v.join('|')})`, 'i');
-	    });
 	    const isActive = vue.computed(() => {
+	      const {
+	        searchRegex
+	      } = owner.exposed;
 	      return !!(searchRegex.value.test(formatterLabel.value) || !props.filterable);
 	    });
 	    const customOptions = vue.computed(() => {
@@ -23699,6 +23705,10 @@
 	      const v = currentValue.value.length - props.maxTags;
 	      return v < 0 ? 0 : v;
 	    });
+	    const searchRegex = vue.computed(() => {
+	      const v = searchValue.value.trim().replace(/\s+/g, ' ').split(/\s|,/);
+	      return new RegExp(escapeString(`(${v.join('|')})`), 'i');
+	    });
 	    const optionMap = vue.ref({});
 	    const options = vue.computed(() => {
 	      return Object.values(optionMap.value);
@@ -23795,7 +23805,7 @@
 	      add,
 	      remove,
 	      close,
-	      searchValue,
+	      searchRegex,
 	      multiple,
 	      isActive,
 	      current: currentValue,
@@ -28184,6 +28194,10 @@
 	    sort: {
 	      type: Object,
 	      default: () => ({})
+	    },
+	    resizable: {
+	      type: Boolean,
+	      default: void 0
 	    }
 	  },
 	  setup(props) {
@@ -28192,6 +28206,13 @@
 	    const draggingColumn = vue.ref(null);
 	    const dragging = vue.ref(false);
 	    const dragState = vue.ref({});
+	    const allowDrag = vue.computed(() => {
+	      return typeof props.resizable === 'boolean' ? props.resizable : props.border;
+	    });
+	    const dragLineClass = vue.computed(() => {
+	      if (props.border || !props.resizable) return;
+	      return 'has-drag-line';
+	    });
 	    const states = useStates({
 	      columns: 'columns',
 	      isAllSelected: 'isAllSelected',
@@ -28295,10 +28316,10 @@
 	      if (IS_SERVER$1) return;
 	      if (column.children && column.children.length > 0) return;
 	      /* istanbul ignore if */
-	      if (draggingColumn.value && props.border) {
+	      if (draggingColumn.value && allowDrag.value) {
 	        dragging.value = true;
 	        table.resizeProxyVisible.value = true;
-	        const tableEl = table.vnode.el;
+	        const tableEl = table.tableWrapper.value;
 	        const tableLeft = tableEl.getBoundingClientRect().left;
 	        const columnEl = instance.vnode.el.querySelector(`.vc-table__th.${column.id}`);
 	        const columnRect = columnEl.getBoundingClientRect();
@@ -28327,15 +28348,14 @@
 	            } = dragState.value;
 	            const finalLeft = parseInt(resizeProxy.style.left, 10);
 	            const columnWidth = finalLeft - startColumnLeft;
-	            column.width = columnWidth;
-	            column.realWidth = column.width;
-	            table.$emit('header-dragend', column.width, startLeft - startColumnLeft, column, event);
+	            column.width = column.minWidth = column.realWidth = columnWidth;
+	            table.emit('header-dragend', column.width, startLeft - startColumnLeft, column);
 	            table.store.scheduleLayout();
 	            document.body.style.cursor = '';
 	            dragging.value = false;
 	            draggingColumn.value = null;
 	            dragState.value = {};
-	            table.resizeProxyVisible = false;
+	            table.resizeProxyVisible.value = false;
 	          }
 	          document.removeEventListener('mousemove', handleMouseMove);
 	          document.removeEventListener('mouseup', handleMouseUp);
@@ -28356,7 +28376,7 @@
 	        target = target.parentNode;
 	      }
 	      if (!column || !column.resizable) return;
-	      if (!dragging.value && props.border) {
+	      if (!dragging.value && allowDrag.value) {
 	        const rect = target.getBoundingClientRect();
 	        const bodyStyle = document.body.style;
 	        if (rect.width > 12 && rect.right - event.pageX < 8) {
@@ -28426,7 +28446,7 @@
 	        "style": [getHeaderCellStyle(rowIndex, columnIndex, columns, column), {
 	          width: `${column.realWidth}px`
 	        }],
-	        "class": [getHeaderCellClass(rowIndex, columnIndex, columns, column), 'vc-table__th'],
+	        "class": [getHeaderCellClass(rowIndex, columnIndex, columns, column), column.resizable && dragLineClass.value, 'vc-table__th'],
 	        "key": column.id
 	      }, [vue.createVNode("div", {
 	        "class": ['vc-table__cell',
@@ -28663,7 +28683,11 @@
 	    default: () => ({})
 	  },
 	  // 用于延迟渲染，用于计算高度
-	  delay: Number
+	  delay: Number,
+	  resizable: {
+	    type: Boolean,
+	    default: void 0
+	  }
 	};
 
 	/** @jsxImportSource vue */
@@ -28672,7 +28696,7 @@
 	const Table$1 = /* @__PURE__ */ vue.defineComponent({
 	  name: COMPONENT_NAME$j,
 	  props: props$d,
-	  emits: ['select', 'select-all', 'selection-change', 'cell-mouse-enter', 'cell-mouse-leave', 'cell-click', 'cell-dblclick', 'row-click', 'row-contextmenu', 'row-dblclick', 'header-click', 'header-contextmenu', 'current-change', 'header-dragend ', 'expand-change', 'sort-change', 'update:sort'],
+	  emits: ['select', 'select-all', 'selection-change', 'cell-mouse-enter', 'cell-mouse-leave', 'cell-click', 'cell-dblclick', 'row-click', 'row-contextmenu', 'row-dblclick', 'header-click', 'header-contextmenu', 'current-change', 'header-dragend', 'expand-change', 'sort-change', 'update:sort'],
 	  setup(props, {
 	    slots,
 	    expose,
@@ -28693,7 +28717,7 @@
 	      width: null,
 	      height: null
 	    });
-
+	    const tableWrapper = vue.ref(null);
 	    // refs
 	    const hiddenColumns = vue.ref(null);
 	    const headerWrapper = vue.ref(null);
@@ -29051,6 +29075,7 @@
 	      toggleRowExpansion,
 	      clearSelection,
 	      scroller,
+	      tableWrapper,
 	      headerWrapper,
 	      appendWrapper,
 	      footerWrapper,
@@ -29061,12 +29086,15 @@
 	      renderExpanded,
 	      hiddenColumns,
 	      props,
-	      emit
+	      emit,
+	      resizeProxy,
+	      resizeProxyVisible
 	    };
 	    expose(exposed);
 	    vue.provide('vc-table', exposed);
 	    return () => {
 	      return vue.createVNode("div", {
+	        "ref": tableWrapper,
 	        "class": [classes.value, tableId, 'vc-table'],
 	        "onMouseleave": handleMouseLeave
 	      }, [vue.createVNode("div", {
@@ -29078,6 +29106,7 @@
 	      }, [vue.createVNode(TableHeader, {
 	        "ref": tableHeader,
 	        "border": props.border,
+	        "resizable": props.resizable,
 	        "sort": props.sort,
 	        "style": bodyWidthStyle.value
 	      }, null)]), states.columns.length > 0 && vue.createVNode(ScrollerWheel, {
@@ -29095,15 +29124,10 @@
 	          "style": [bodyWidthStyle.value],
 	          "height-style": [bodyHeightStyle.value],
 	          "onScroll": handleScollY
-	        }, null), props.data.length === 0 && vue.createVNode("div", {
-	          "ref": emptyBlock,
-	          "style": bodyWidthStyle.value,
-	          "class": [{
-	            'is-absolute': !!props.height
-	          }, 'vc-table__empty-wrapper']
-	        }, [vue.createVNode("span", {
-	          "class": "vc-table__empty-text"
-	        }, [slots.empty ? slots.empty() : props.emptyText || '暂无数据'])]), slots.append && vue.createVNode("div", {
+	        }, null), props.data.length === 0 && !props.height && vue.createVNode("div", {
+	          "class": "vc-table__empty-placeholder",
+	          "style": [bodyWidthStyle.value]
+	        }, null), slots.append && vue.createVNode("div", {
 	          "ref": appendWrapper,
 	          "class": "vc-table__append-wrapper"
 	        }, [slots.append()])]
@@ -29127,6 +29151,7 @@
 	      }, [vue.createVNode(TableHeader, {
 	        "ref": leftFixedTableHeader,
 	        "border": props.border,
+	        "resizable": props.resizable,
 	        "sort": props.sort,
 	        "style": bodyWidthStyle.value,
 	        "fixed": "left"
@@ -29166,6 +29191,7 @@
 	      }, [vue.createVNode(TableHeader, {
 	        "ref": rightFixedTableHeader,
 	        "border": props.border,
+	        "resizable": props.resizable,
 	        "sort": props.sort,
 	        "style": bodyWidthStyle.value,
 	        "fixed": "right"
@@ -29193,7 +29219,14 @@
 	        "get-summary": props.getSummary,
 	        "style": bodyWidthStyle.value,
 	        "fixed": "right"
-	      }, null)]), [[vue.vShow, props.data && props.data.length > 0]])]), vue.withDirectives(vue.createVNode("div", {
+	      }, null)]), [[vue.vShow, props.data && props.data.length > 0]])]), props.data.length === 0 && vue.createVNode("div", {
+	        "ref": emptyBlock,
+	        "class": [{
+	          'has-height': !!props.height
+	        }, 'vc-table__empty-wrapper']
+	      }, [slots.empty ? slots.empty() : vue.createVNode("span", {
+	        "class": "vc-table__empty-text"
+	      }, [props.emptyText || '暂无数据'])]), vue.withDirectives(vue.createVNode("div", {
 	        "ref": resizeProxy,
 	        "class": "vc-table__column-resize-proxy"
 	      }, null), [[vue.vShow, resizeProxyVisible.value]])]);

package/package.json

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