bkui-vue 2.0.2-beta.82 → 2.0.2-beta.84

package/lib/index.js

@@ -3,5 +3,5 @@ export * from './hooks';
 export { default } from './preset';
 export * from './config-provider';
 export * from './directives';
-export const version = "2.0.2-beta.82";
+export const version = "2.0.2-beta.84";
 window.__bkui_vue_version__ = version;

package/lib/tag-input/index.d.ts

@@ -354,7 +354,7 @@ declare const TagInput: {
         handleFocus: () => void;
         handleBlur: () => void;
         handleTagSelected: (item: any, type: string, e?: Event) => void;
-        handleTagRemove: (data: any, index: number, e?: MouseEvent) => void;
+        handleTagRemove: (data: any, e?: MouseEvent) => void;
         handleClear: (e: MouseEvent) => void;
         tagFocus: (e: MouseEvent) => void;
         handleKeydown: (e: KeyboardEvent) => void;
@@ -1102,7 +1102,7 @@ declare const TagInput: {
         handleFocus: () => void;
         handleBlur: () => void;
         handleTagSelected: (item: any, type: string, e?: Event) => void;
-        handleTagRemove: (data: any, index: number, e?: MouseEvent) => void;
+        handleTagRemove: (data: any, e?: MouseEvent) => void;
         handleClear: (e: MouseEvent) => void;
         tagFocus: (e: MouseEvent) => void;
         handleKeydown: (e: KeyboardEvent) => void;
@@ -1524,7 +1524,7 @@ declare const TagInput: {
     handleFocus: () => void;
     handleBlur: () => void;
     handleTagSelected: (item: any, type: string, e?: Event) => void;
-    handleTagRemove: (data: any, index: number, e?: MouseEvent) => void;
+    handleTagRemove: (data: any, e?: MouseEvent) => void;
     handleClear: (e: MouseEvent) => void;
     tagFocus: (e: MouseEvent) => void;
     handleKeydown: (e: KeyboardEvent) => void;

package/lib/tag-input/index.js

@@ -13,6 +13,7 @@ import "../loading/loading.less";
 import "../popover/popover.less";
 import * as __WEBPACK_EXTERNAL_MODULE_lodash_debounce_3540babe__ from "lodash/debounce";
 import * as __WEBPACK_EXTERNAL_MODULE_lodash_trim_5cdad98c__ from "lodash/trim";
+import * as __WEBPACK_EXTERNAL_MODULE_lodash_filter_a18a57cd__ from "lodash/filter";
 import * as __WEBPACK_EXTERNAL_MODULE_vue_types_22de060a__ from "vue-types";
 import * as __WEBPACK_EXTERNAL_MODULE_lodash_has_e9e453be__ from "lodash/has";
 /******/ var __webpack_modules__ = ({
@@ -1654,6 +1655,10 @@ const debounce_namespaceObject = debounce_x({ ["default"]: () => __WEBPACK_EXTER
 var trim_x = y => { var x = {}; __webpack_require__.d(x, y); return x; }
 var trim_y = x => () => x
 const trim_namespaceObject = trim_x({ ["default"]: () => __WEBPACK_EXTERNAL_MODULE_lodash_trim_5cdad98c__["default"] });
+;// CONCATENATED MODULE: external "lodash/filter"
+var filter_x = y => { var x = {}; __webpack_require__.d(x, y); return x; }
+var filter_y = x => () => x
+const filter_namespaceObject = filter_x({ ["default"]: () => __WEBPACK_EXTERNAL_MODULE_lodash_filter_a18a57cd__["default"] });
 ;// CONCATENATED MODULE: ../../node_modules/dompurify/dist/purify.es.mjs
 /*! @license DOMPurify 3.2.6 | (c) Cure53 and other contributors | Released under the Apache license 2.0 and Mozilla Public License 2.0 | github.com/cure53/DOMPurify/blob/3.2.6/LICENSE */
 
@@ -3307,7 +3312,9 @@ function tag_render_objectSpread(e) { for (var r = 1; r < arguments.length; r++)
       editValue.value = val;
     };
     var editValue = (0,external_vue_namespaceObject.ref)(props.node[props.displayKey]);
-    (0,external_vue_namespaceObject.watch)(props.node[props.displayKey], function (val) {
+    (0,external_vue_namespaceObject.watch)(function () {
+      return props.node[props.displayKey];
+    }, function (val) {
       editValue.value = val;
     });
     (0,external_vue_namespaceObject.onMounted)(function () {
@@ -3401,6 +3408,7 @@ function tag_input_objectSpread(e) { for (var r = 1; r < arguments.length; r++)
 
 
 
+
 /* harmony default export */ const tag_input = ((0,external_vue_namespaceObject.defineComponent)({
   name: 'TagInput',
   directives: {
@@ -3618,7 +3626,7 @@ function tag_input_objectSpread(e) { for (var r = 1; r < arguments.length; r++)
         listState.tagListCache = _toConsumableArray(tagList.value);
         listState.selectedTagListCache = _toConsumableArray(listState.selectedTagList);
         curInputValue.value = listState.selectedTagListCache[0][props.saveKey];
-        removeTag(listState.selectedTagList[0], 0);
+        removeTag(listState.selectedTagList[0]);
         handleInput();
       }
       state.isEdit = true;
@@ -3945,9 +3953,9 @@ function tag_input_objectSpread(e) { for (var r = 1; r < arguments.length; r++)
      * @param index tag index
      * @param e mouse event
      */
-    var handleTagRemove = function handleTagRemove(data, index, e) {
+    var handleTagRemove = function handleTagRemove(data, e) {
       e === null || e === void 0 || e.stopPropagation();
-      removeTag(data, index);
+      removeTag(data);
       clearInput();
       handleChange('remove', data);
       tagInputRef.value.style.width = "".concat(INPUT_MIN_WIDTH, "px");
@@ -4264,10 +4272,11 @@ function tag_input_objectSpread(e) { for (var r = 1; r < arguments.length; r++)
     /**
      * remove current tag
      * @param data tag data
-     * @param index tag index
      */
-    var removeTag = function removeTag(data, index) {
-      listState.selectedTagList.splice(index, 1);
+    var removeTag = function removeTag(data) {
+      listState.selectedTagList = (0,filter_namespaceObject["default"])(listState.selectedTagList, function (item) {
+        return item[props.saveKey] !== data[props.saveKey];
+      });
       var isExistInit = saveKeyMap.value[data[props.saveKey]];
       // 将删除的项加入加列表
       if ((props.allowCreate && isExistInit || !props.allowCreate) && !isSingleSelect.value) {
@@ -4413,7 +4422,7 @@ function tag_input_objectSpread(e) { for (var r = 1; r < arguments.length; r++)
             } : undefined
           }, null), _this.showTagClose && (0,external_vue_namespaceObject.createVNode)(icon_namespaceObject.Error, {
             "class": "remove-tag",
-            "onClick": _this.handleTagRemove.bind(_this, item, index)
+            "onClick": _this.handleTagRemove.bind(_this, item)
           }, null)]);
         }), (0,external_vue_namespaceObject.withDirectives)((0,external_vue_namespaceObject.createVNode)("li", {
           "id": "tagInputItem",

package/lib/tag-input/tag-input.d.ts

@@ -343,7 +343,7 @@ declare const _default: import("vue").DefineComponent<{
     handleFocus: () => void;
     handleBlur: () => void;
     handleTagSelected: (item: any, type: string, e?: Event) => void;
-    handleTagRemove: (data: any, index: number, e?: MouseEvent) => void;
+    handleTagRemove: (data: any, e?: MouseEvent) => void;
     handleClear: (e: MouseEvent) => void;
     tagFocus: (e: MouseEvent) => void;
     handleKeydown: (e: KeyboardEvent) => void;

package/lib/timeline/index.d.ts

@@ -1,7 +1,7 @@
 declare const BkTimeline: {
     new (...args: any[]): import("vue").CreateComponentPublicInstance<Readonly<import("vue").ExtractPropTypes<{
         list: import("vue-types").VueTypeDef<{
-            tag: string;
+            tag: object;
             content: object;
             type: string;
             size: string;
@@ -20,7 +20,7 @@ declare const BkTimeline: {
         onSelect?: (...args: any[]) => any;
     }, {
         defaultTimelines: import("vue").ShallowRef<{
-            tag: string;
+            tag: object;
             content: object;
             type: string;
             size: string;
@@ -34,7 +34,7 @@ declare const BkTimeline: {
         resolveClassName: (cls: string) => string;
     }, unknown, {}, {}, import("vue").ComponentOptionsMixin, import("vue").ComponentOptionsMixin, "select"[], import("vue").VNodeProps & import("vue").AllowedComponentProps & import("vue").ComponentCustomProps & Readonly<import("vue").ExtractPropTypes<{
         list: import("vue-types").VueTypeDef<{
-            tag: string;
+            tag: object;
             content: object;
             type: string;
             size: string;
@@ -62,7 +62,7 @@ declare const BkTimeline: {
         Defaults: {};
     }, Readonly<import("vue").ExtractPropTypes<{
         list: import("vue-types").VueTypeDef<{
-            tag: string;
+            tag: object;
             content: object;
             type: string;
             size: string;
@@ -81,7 +81,7 @@ declare const BkTimeline: {
         onSelect?: (...args: any[]) => any;
     }, {
         defaultTimelines: import("vue").ShallowRef<{
-            tag: string;
+            tag: object;
             content: object;
             type: string;
             size: string;
@@ -101,7 +101,7 @@ declare const BkTimeline: {
     __isSuspense?: never;
 } & import("vue").ComponentOptionsBase<Readonly<import("vue").ExtractPropTypes<{
     list: import("vue-types").VueTypeDef<{
-        tag: string;
+        tag: object;
         content: object;
         type: string;
         size: string;
@@ -120,7 +120,7 @@ declare const BkTimeline: {
     onSelect?: (...args: any[]) => any;
 }, {
     defaultTimelines: import("vue").ShallowRef<{
-        tag: string;
+        tag: object;
         content: object;
         type: string;
         size: string;

package/lib/timeline/index.js

@@ -1436,7 +1436,7 @@ var purify = createDOMPurify();
 
 var timelineProps = {
   list: shared_namespaceObject.PropTypes.arrayOf(shared_namespaceObject.PropTypes.shape({
-    tag: shared_namespaceObject.PropTypes.string,
+    tag: shared_namespaceObject.PropTypes.oneOfType([shared_namespaceObject.PropTypes.string, shared_namespaceObject.PropTypes.object]),
     content: shared_namespaceObject.PropTypes.oneOfType([shared_namespaceObject.PropTypes.string, shared_namespaceObject.PropTypes.object]),
     type: shared_namespaceObject.PropTypes.string,
     size: shared_namespaceObject.PropTypes.string,
@@ -1515,10 +1515,29 @@ var timelineProps = {
           "class": "".concat(_this.resolveClassName('timeline-content'))
         }, [item.content]);
       }
+      if (typeof item.content === 'string') {
+        return (0,external_vue_namespaceObject.createVNode)("div", {
+          "class": "".concat(_this.resolveClassName('timeline-content')),
+          "innerHTML": purify.sanitize(item.content)
+        }, null);
+      }
       return (0,external_vue_namespaceObject.createVNode)("div", {
-        "class": "".concat(_this.resolveClassName('timeline-content')),
-        "innerHTML": typeof item.content === 'string' ? purify.sanitize(item.content) : item.content
-      }, null);
+        "class": "".concat(_this.resolveClassName('timeline-content'))
+      }, [item.content]);
+    };
+    var renderTag = function renderTag(item) {
+      if (item.nodeType === 'vnode') {
+        return item.tag;
+      }
+      if (_typeof(item.tag) === 'object') {
+        return item.tag;
+      }
+      if (typeof item.tag === 'string') {
+        return (0,external_vue_namespaceObject.createVNode)("span", {
+          "innerHTML": purify.sanitize(item.tag)
+        }, null);
+      }
+      return (0,external_vue_namespaceObject.createVNode)("span", null, null);
     };
     return (0,external_vue_namespaceObject.createVNode)("ul", {
       "class": this.resolveClassName('timeline')
@@ -1540,9 +1559,7 @@ var timelineProps = {
         "onClick": function onClick() {
           return _this.handleTitleSelect(item);
         }
-      }, [item.nodeType === 'vnode' ? item.tag : (0,external_vue_namespaceObject.createVNode)("span", {
-        "innerHTML": purify.sanitize(item.tag || '')
-      }, null)]), renderContent(item)])]);
+      }, [renderTag(item)]), renderContent(item)])]);
     })]);
   }
 }));

package/lib/timeline/timeline.d.ts

@@ -26,7 +26,7 @@
 import { ExtractPropTypes } from 'vue';
 declare const timelineProps: {
     list: import("vue-types").VueTypeDef<{
-        tag: string;
+        tag: object;
         content: object;
         type: string;
         size: string;
@@ -45,7 +45,7 @@ declare const timelineProps: {
 export type TimelinePropTypes = Readonly<ExtractPropTypes<typeof timelineProps>>;
 declare const _default: import("vue").DefineComponent<{
     list: import("vue-types").VueTypeDef<{
-        tag: string;
+        tag: object;
         content: object;
         type: string;
         size: string;
@@ -62,7 +62,7 @@ declare const _default: import("vue").DefineComponent<{
     };
 }, {
     defaultTimelines: import("vue").ShallowRef<{
-        tag: string;
+        tag: object;
         content: object;
         type: string;
         size: string;
@@ -76,7 +76,7 @@ declare const _default: import("vue").DefineComponent<{
     resolveClassName: (cls: string) => string;
 }, unknown, {}, {}, import("vue").ComponentOptionsMixin, import("vue").ComponentOptionsMixin, "select"[], "select", import("vue").VNodeProps & import("vue").AllowedComponentProps & import("vue").ComponentCustomProps, Readonly<ExtractPropTypes<{
     list: import("vue-types").VueTypeDef<{
-        tag: string;
+        tag: object;
         content: object;
         type: string;
         size: string;

package/lib/tree/index.js

@@ -17608,7 +17608,7 @@ var treeProps = {
      * 触发异步加载的时机
      * 可选值：'expand', 'click', 'checked'
      */
-    trigger: shared_namespaceObject.PropTypes.arrayOf(shared_namespaceObject.PropTypes.oneOf(['expand', 'click', 'checked'])).def(null)
+    trigger: shared_namespaceObject.PropTypes.arrayOf(shared_namespaceObject.PropTypes.oneOf(['expand', 'click', 'checked'])).def(undefined)
   }),
   /**
    * 每个节点偏移左侧距离
@@ -18821,9 +18821,9 @@ var use_node_action_this = undefined;
       "class": "node-check-box",
       "onClick": handleNodeCheckboxClick
     }, [(0,external_vue_namespaceObject.createVNode)(checkbox_namespaceObject["default"], {
+      "disabled": props.disableCheck,
       "indeterminate": isIndeterminate(item),
       "modelValue": isNodeChecked(item),
-      "disabled": props.disableCheck,
       "size": "small",
       "onChange": function onChange(val, event) {
         return handleNodeItemCheckboxChange(item, !!val, event);
@@ -19048,6 +19048,8 @@ var use_node_action_this = undefined;
   var handleNodeContentClick = function handleNodeContentClick(item, e, event) {
     var nodeActions = resolveNodeAction(item);
     var isOpened = isNodeOpened(item);
+    // checkbox 点击事件不应触发 expand/collapse 行为
+    var isCheckboxEvent = event === 'checked';
     // 1. 处理 selected 行为：选中节点
     if (nodeActions.includes('selected')) {
       // 如果配置了 expand 或 collapse，selected 不应该自动展开节点
@@ -19057,15 +19059,15 @@ var use_node_action_this = undefined;
       setSelect(item, true, autoOpen, true, event);
     }
     // 2. 处理 expand 行为：仅当节点是收起状态时展开
-    if (nodeActions.includes('expand') && !isOpened) {
+    if (nodeActions.includes('expand') && !isOpened && !isCheckboxEvent) {
       handleTreeNodeClick(item, e, 'expand');
     }
     // 3. 处理 collapse 行为：仅当节点是展开状态时收起
-    if (nodeActions.includes('collapse') && isOpened) {
+    if (nodeActions.includes('collapse') && isOpened && !isCheckboxEvent) {
       handleTreeNodeClick(item, e, 'expand');
     }
     // 4. 处理 click 行为：触发 node-click 事件
-    if (nodeActions.includes('click')) {
+    if (nodeActions.includes('click') && !isCheckboxEvent) {
       var eventName = EVENTS.NODE_CLICK;
       ctx.emit(eventName, item, resolveScopedSlotParam(item), getSchemaVal(item), e);
     }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "bkui-vue",
-  "version": "2.0.2-beta.82",
+  "version": "2.0.2-beta.84",
   "workspaces": [
     "packages/**",
     "scripts/cli",