@deot/vc-components 1.0.39 → 1.0.41

package/dist/index.umd.cjs

@@ -7897,7 +7897,7 @@
 	  el: "body",
 	  alive: false,
 	  multiple: false,
-	  aliveRegExp: { className: /(vc-hack-alive|vc-hack-cp)/ },
+	  aliveRegExp: { className: /(vc-portal-alive)/ },
 	  aliveVisibleKey: "isVisible",
 	  aliveUpdateKey: "update",
 	  leaveDelay: 300,
@@ -8124,7 +8124,8 @@
 	      leaf = Portal.leafs.get(name);
 	      leaf.target = target;
 	      leaf.propsData.value = propsData$;
-	      leaf.wrapper?.[aliveUpdateKey]?.(options);
+	      const next = leaf.wrapper?.[aliveUpdateKey];
+	      next && vue.nextTick(() => next(options));
 	    } else {
 	      const wrapper = this.wrapper;
 	      const app = vue.createApp({
@@ -8139,7 +8140,7 @@
 	                if (container && e.target && !container.contains(e.target) && !path?.some((item) => utils.eleInRegExp(item, aliveRegExp))) {
 	                  /* istanbul ignore else -- @preserve */
 	                  if (leaf.wrapper && leaf.wrapper?.[aliveVisibleKey]) {
-	                    leaf.wrapper[aliveVisibleKey] = false;
+	                    typeof leaf.wrapper[aliveVisibleKey] === "function" ? leaf.wrapper[aliveVisibleKey](false) : leaf.wrapper[aliveVisibleKey] = false;
 	                  }
 	                  leaveDelay ? setTimeout($onDestroyed, leaveDelay) : $onDestroyed();
 	                }
@@ -8795,6 +8796,8 @@
 	const props$19 = {
 	  ...pick(props$1c, popoverKeys$1),
 	  ...pick(props$1g, inputKeys$2),
+	  renderOption: [Function],
+	  renderOptionGroup: [Function],
 	  data: {
 	    type: Array,
 	    default: () => []
@@ -10222,7 +10225,7 @@
 
 	/** @jsxImportSource vue */
 
-	function _isSlot$3(s) {
+	function _isSlot$2(s) {
 	  return typeof s === 'function' || Object.prototype.toString.call(s) === '[object Object]' && !vue.isVNode(s);
 	}
 	const COMPONENT_NAME$1w = 'vc-expand';
@@ -10246,7 +10249,7 @@
 	          enter: 200,
 	          leave: 200
 	        }
-	      }, _isSlot$3(_slot = vue.withDirectives(vue.createVNode(Content, null, {
+	      }, _isSlot$2(_slot = vue.withDirectives(vue.createVNode(Content, null, {
 	        default: () => [(props.alive || !props.alive && isActive.value) && slots.default?.()]
 	      }), [[vue.vShow, isActive.value]])) ? _slot : {
 	        default: () => [_slot]
@@ -10396,7 +10399,7 @@
 
 	/** @jsxImportSource vue */
 
-	function _isSlot$2(s) {
+	function _isSlot$1(s) {
 	  return typeof s === 'function' || Object.prototype.toString.call(s) === '[object Object]' && !vue.isVNode(s);
 	}
 	const COMPONENT_NAME$1t = 'vc-countdown';
@@ -10531,7 +10534,7 @@
 	        return (// @ts-ignore
 	          vue.createVNode(Content, {
 	            "class": "vc-countdown"
-	          }, _isSlot$2(_slot = slots.default(binds.value)) ? _slot : {
+	          }, _isSlot$1(_slot = slots.default(binds.value)) ? _slot : {
 	            default: () => [_slot]
 	          })
 	        );
@@ -21234,7 +21237,9 @@
 	  filterable: {
 	    type: Boolean,
 	    default: true
-	  }
+	  },
+	  render: [Function],
+	  row: Object
 	};
 
 	/** @jsxImportSource vue */
@@ -21251,7 +21256,7 @@
 	      const v = String(props.label || props.value);
 	      return v.trim();
 	    });
-	    const isSelect = vue.computed(() => {
+	    const isChecked = vue.computed(() => {
 	      const {
 	        current
 	      } = owner.exposed;
@@ -21268,15 +21273,24 @@
 	      const regex = owner.exposed.searchRegex.value;
 	      return regex.test(formatterLabel.value) || !props.filterable;
 	    });
-	    const handleSelect = e => {
-	      e.stopPropagation();
+	    const customOptions = vue.computed(() => {
+	      return {
+	        store: {
+	          last: isLast.value,
+	          checked: isChecked.value,
+	          click: handleClick
+	        },
+	        row: props.row
+	      };
+	    });
+	    const handleClick = () => {
 	      // 禁止操作
 	      if (props.disabled) return;
 	      // 已选中，弹层关闭
-	      if (!owner.exposed.multiple.value && isSelect.value) {
+	      if (!owner.exposed.multiple.value && isChecked.value) {
 	        owner.exposed.close();
 	        return;
-	      } else if (isSelect.value) {
+	      } else if (isChecked.value) {
 	        owner.exposed.remove(props.value, formatterLabel.value);
 	        return;
 	      }
@@ -21287,15 +21301,17 @@
 	    };
 	    return () => {
 	      if (!isActive.value) return;
-	      return vue.createVNode("div", {
+	      return typeof props.render === 'function' ? vue.createVNode(Customer, vue.mergeProps({
+	        "render": props.render
+	      }, customOptions.value), null) : slots.default ? slots.default(customOptions.value) : vue.createVNode("div", {
 	        "disabled": props.disabled && 'disabled',
 	        "class": [{
-	          'is-select': isSelect.value,
+	          'is-select': isChecked.value,
 	          'is-last': isLast.value
 	        }, 'vc-select-option'],
-	        "onClick": handleSelect,
+	        "onClick": vue.withModifiers(handleClick, ['stop']),
 	        "onMousedown": handlePrevent
-	      }, [slots.default ? slots.default() : formatterLabel.value, isSelect.value && vue.createVNode(Icon, {
+	      }, [formatterLabel.value, isChecked.value && vue.createVNode(Icon, {
 	        "type": "correct"
 	      }, null)]);
 	    };
@@ -21309,7 +21325,9 @@
 	  },
 	  label: {
 	    type: [String, Number]
-	  }
+	  },
+	  row: Object,
+	  render: [Function]
 	};
 
 	/** @jsxImportSource vue */
@@ -21325,10 +21343,19 @@
 	      const v = String(props.label || props.value);
 	      return v.trim();
 	    });
+	    const customOptions = vue.computed(() => {
+	      return {
+	        row: props.row
+	      };
+	    });
 	    return () => {
 	      return vue.createVNode("div", {
 	        "class": "vc-select-option-group"
-	      }, [vue.createVNode("div", {
+	      }, [typeof props.render === 'function' ? vue.createVNode(Customer, vue.mergeProps({
+	        "render": props.render
+	      }, customOptions.value), null) : slots.title ? slots.title({
+	        row: props.row
+	      }) : vue.createVNode("div", {
 	        "class": "vc-select-option-group__title"
 	      }, [formatterLabel.value]), vue.createVNode("div", null, [slots?.default?.()])]);
 	    };
@@ -21337,9 +21364,6 @@
 
 	/** @jsxImportSource vue */
 
-	function _isSlot$1(s) {
-	  return typeof s === 'function' || Object.prototype.toString.call(s) === '[object Object]' && !vue.isVNode(s);
-	}
 	const COMPONENT_NAME$H = 'vc-select';
 	const Select = /* @__PURE__ */ vue.defineComponent({
 	  name: COMPONENT_NAME$H,
@@ -21565,29 +21589,41 @@
 	            "max-height": "200px"
 	          }, {
 	            default: () => [props.data ? vue.createVNode("div", null, [props.data.map(item => {
-	              let _slot;
-	              return Array.isArray(item.children) ? vue.createVNode(OptionGroup, {
+	              return Array.isArray(item.children) && item.children.length ? vue.createVNode(OptionGroup, {
+	                "row": item,
 	                "value": item.value,
 	                "label": item.label,
-	                "key": item.value
-	              }, _isSlot$1(_slot = item.children.map($item => {
-	                return vue.createVNode(Option, {
-	                  "key": $item.value,
-	                  "value": $item.value,
-	                  "label": $item.label,
-	                  "disabled": $item.disabled,
-	                  "filterable": $item.filterable
-	                }, null);
-	              })) ? _slot : {
-	                default: () => [_slot]
+	                "key": item.value,
+	                "render": props.renderOptionGroup
+	              }, {
+	                title: slots?.optionGroup,
+	                default: () => {
+	                  return item.children.map($item => {
+	                    return vue.createVNode(Option, {
+	                      "key": $item.value,
+	                      "row": $item,
+	                      "value": $item.value,
+	                      "label": $item.label,
+	                      "disabled": $item.disabled,
+	                      "filterable": $item.filterable,
+	                      "render": props.renderOption
+	                    }, {
+	                      default: slots?.option
+	                    });
+	                  });
+	                }
 	              }) : vue.createVNode(Option, {
 	                "key": item.value,
+	                "row": item,
 	                "value": item.value,
 	                "label": item.label,
 	                "disabled": item.disabled,
-	                "filterable": item.filterable
-	              }, null);
-	            })]) : slots.default?.()]
+	                "filterable": item.filterable,
+	                "render": props.renderOption
+	              }, {
+	                default: slots?.option
+	              });
+	            })]) : slots?.default?.()]
 	          })]);
 	        }
 	      });
@@ -29352,116 +29388,36 @@
 	  };
 	};
 
-	const selectKeys = [
-	  "separator",
-	  "numerable",
-	  "nullValue"
-	];
 	const props$4 = {
-	  ...pick(props$19, selectKeys),
-	  // 暂不支持，仅作为默认值
-	  max: {
-	    type: Number,
-	    default: Infinity,
-	    validator: (v) => v >= 1
-	  },
-	  // 确保所有value是唯一的; 否则会出现问题
-	  data: {
-	    type: Array,
-	    default: () => []
-	  },
-	  emptyText: {
-	    type: String,
-	    default: "暂无数据"
-	  },
-	  renderAfterExpand: {
-	    type: Boolean,
-	    default: true
-	  },
-	  checkStrictly: {
-	    type: Boolean,
-	    default: false
-	  },
-	  defaultExpandAll: Boolean,
-	  expandOnClickNode: {
-	    type: Boolean,
-	    default: true
-	  },
-	  checkOnClickNode: Boolean,
-	  checkDescendants: {
-	    type: Boolean,
-	    default: false
+	  node: {
+	    type: Object,
+	    default: () => ({})
 	  },
-	  autoExpandParent: {
+	  renderNodeLabel: Function,
+	  renderNodeAfterExpand: {
 	    type: Boolean,
 	    default: true
 	  },
-	  // checkedValues -> modelValue
-	  modelValue: [String, Number, Array],
-	  // Value[]
-	  expandedValues: {
-	    type: Array,
-	    default: () => []
-	  },
-	  currentNodeValue: [String, Number],
-	  render: Function,
 	  showCheckbox: {
 	    type: Boolean,
 	    default: false
 	  },
-	  draggable: {
-	    type: Boolean,
-	    default: false
-	  },
-	  allowDrag: Function,
-	  allowDrop: Function,
-	  lazy: {
-	    type: Boolean,
-	    default: false
-	  },
-	  highlightCurrent: Boolean,
-	  loadData: Function,
-	  filterNode: Function,
 	  accordion: {
 	    type: Boolean,
 	    default: false
 	  },
-	  indent: {
-	    type: Number,
-	    default: 18
-	  },
-	  iconClass: String,
-	  keyValue: {
-	    type: Object,
-	    default: () => KEY_VALUE
-	  },
 	  allowDispatch: {
 	    type: Boolean,
 	    default: true
 	  }
 	};
 
-	const treeKeys$1 = [
-	  "render",
-	  "renderAfterExpand",
-	  "showCheckbox",
-	  "accordion",
-	  "allowDispatch"
-	];
-	const props$3 = {
-	  ...pick(props$4, treeKeys$1),
-	  node: {
-	    type: Object,
-	    default: () => ({})
-	  }
-	};
-
 	/** @jsxImportSource vue */
 
 	const COMPONENT_NAME$5 = 'vc-tree-node';
 	const TreeNodeContent = /* @__PURE__ */ vue.defineComponent({
 	  name: COMPONENT_NAME$5,
-	  props: props$3,
+	  props: props$4,
 	  emits: ['node-expand'],
 	  setup(props, {
 	    emit
@@ -29635,20 +29591,20 @@
 	      }, null), node.states.loading && vue.createVNode(Spin, {
 	        "size": 12,
 	        "class": "vc-tree-node__loading-icon"
-	      }, null), props.render ? vue.createVNode(Customer, {
-	        "render": props.render,
+	      }, null), props.renderNodeLabel ? vue.createVNode(Customer, {
+	        "render": props.renderNodeLabel,
 	        "store": node,
 	        "row": node.states.data
 	      }, null) : vue.createVNode("span", null, [node.getter.label])]), vue.createVNode(TransitionCollapse, null, {
-	        default: () => [(!props.renderAfterExpand || childNodeRendered.value) && vue.withDirectives(vue.createVNode("div", {
+	        default: () => [(!props.renderNodeAfterExpand || childNodeRendered.value) && vue.withDirectives(vue.createVNode("div", {
 	          "aria-expanded": expanded.value,
 	          "class": "vc-tree-node__children",
 	          "role": "group"
 	        }, [node.childNodes.map(child => {
 	          return vue.createVNode(TreeNodeContent, {
 	            "key": getNodeKey(child),
-	            "render": props.render,
-	            "renderAfterExpand": props.renderAfterExpand,
+	            "renderNodeLabel": props.renderNodeLabel,
+	            "renderNodeAfterExpand": props.renderNodeAfterExpand,
 	            "showCheckbox": props.showCheckbox,
 	            "allowDispatch": props.allowDispatch,
 	            "accordion": props.accordion,
@@ -29877,12 +29833,92 @@
 	  };
 	};
 
+	const selectKeys = [
+	  "separator",
+	  "numerable",
+	  "nullValue"
+	];
+	const treeNodeContentKeys = [
+	  "renderNodeLabel",
+	  "renderNodeAfterExpand",
+	  "showCheckbox",
+	  "accordion",
+	  "allowDispatch"
+	];
+	const props$3 = {
+	  ...pick(props$19, selectKeys),
+	  ...pick(props$4, treeNodeContentKeys),
+	  // 暂不支持，仅作为默认值
+	  max: {
+	    type: Number,
+	    default: Infinity,
+	    validator: (v) => v >= 1
+	  },
+	  // 确保所有value是唯一的; 否则会出现问题
+	  data: {
+	    type: Array,
+	    default: () => []
+	  },
+	  emptyText: {
+	    type: String,
+	    default: "暂无数据"
+	  },
+	  checkStrictly: {
+	    type: Boolean,
+	    default: false
+	  },
+	  defaultExpandAll: Boolean,
+	  expandOnClickNode: {
+	    type: Boolean,
+	    default: true
+	  },
+	  checkOnClickNode: Boolean,
+	  checkDescendants: {
+	    type: Boolean,
+	    default: false
+	  },
+	  autoExpandParent: {
+	    type: Boolean,
+	    default: true
+	  },
+	  // checkedValues -> modelValue
+	  modelValue: [String, Number, Array],
+	  // Value[]
+	  expandedValues: {
+	    type: Array,
+	    default: () => []
+	  },
+	  currentNodeValue: [String, Number],
+	  draggable: {
+	    type: Boolean,
+	    default: false
+	  },
+	  allowDrag: Function,
+	  allowDrop: Function,
+	  lazy: {
+	    type: Boolean,
+	    default: false
+	  },
+	  highlightCurrent: Boolean,
+	  loadData: Function,
+	  filterNode: Function,
+	  indent: {
+	    type: Number,
+	    default: 18
+	  },
+	  iconClass: String,
+	  keyValue: {
+	    type: Object,
+	    default: () => KEY_VALUE
+	  }
+	};
+
 	/** @jsxImportSource vue */
 
 	const COMPONENT_NAME$4 = 'vc-tree';
 	const Tree$1 = /* @__PURE__ */ vue.defineComponent({
 	  name: COMPONENT_NAME$4,
-	  props: props$4,
+	  props: props$3,
 	  emits: ['update:modelValue', 'change', 'check-change', 'current-change', 'node-click', 'node-contextmenu', 'node-collapse', 'node-expand', 'check', 'node-drag-start', 'node-drag-end', 'node-drop', 'node-drag-leave', 'node-drag-enter', 'node-drag-over'],
 	  setup(props, {
 	    expose,
@@ -30056,8 +30092,8 @@
 	      }, [root.childNodes.map(child => {
 	        return vue.createVNode(TreeNodeContent, {
 	          "key": getNodeKey(child),
-	          "render": props.render,
-	          "renderAfterExpand": props.renderAfterExpand,
+	          "renderNodeLabel": props.renderNodeLabel,
+	          "renderNodeAfterExpand": props.renderNodeAfterExpand,
 	          "showCheckbox": props.showCheckbox,
 	          "allowDispatch": props.allowDispatch,
 	          "accordion": props.accordion,
@@ -30079,11 +30115,12 @@
 	const treeKeys = [
 	  "checkStrictly",
 	  "data",
-	  "max"
+	  "max",
+	  "renderNodeLabel"
 	];
 	const props$2 = {
 	  ...props$19,
-	  ...pick(props$4, treeKeys)
+	  ...pick(props$3, treeKeys)
 	};
 
 	/** @jsxImportSource vue */
@@ -30307,6 +30344,7 @@
 	              "checkStrictly": props.checkStrictly,
 	              "allowDispatch": false,
 	              "showCheckbox": true,
+	              "renderNodeLabel": props.renderNodeLabel,
 	              "onChange": handleChange
 	            }, null)]
 	          })]);

package/package.json

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