bkui-vue 0.0.1-beta.426 → 0.0.1-beta.427

package/dist/index.esm.js

@@ -17488,10 +17488,11 @@ const tableProps = {
 var Column = defineComponent({
   name: "TableColumn",
   props: __spreadProps(__spreadValues({}, IColumnType), {
-    prop: PropTypes.oneOfType([PropTypes.func.def(() => ""), PropTypes.string.def("")])
+    prop: PropTypes.oneOfType([PropTypes.func.def(() => ""), PropTypes.string.def("")]),
+    index: PropTypes.number.def(void 0)
   }),
   setup(props2) {
-    const initColumns = inject(PROVIDE_KEY_INIT_COL, (_column, _remove = false) => {
+    const initColumns = inject(PROVIDE_KEY_INIT_COL, (_col, _rm = false) => {
     }, false);
     const bkTableCache = inject(PROVIDE_KEY_TB_CACHE, {
       queueStack: (_2, fn2) => fn2 == null ? void 0 : fn2()
@@ -17506,13 +17507,20 @@ var Column = defineComponent({
     };
   },
   unmounted() {
-    this.updateColumnDefine();
+    this.updateColumnDefine(true);
   },
   mounted() {
     this.updateColumnDefine();
   },
   methods: {
-    updateColumnDefine() {
+    updateColumnDefine(unmounted = false) {
+      if (this.$props.index !== void 0 && typeof this.$props.index === "number") {
+        this.updateColumnDefineByIndex(unmounted);
+        return;
+      }
+      this.updateColumnDefineByParent();
+    },
+    updateColumnDefineByParent() {
       const fn2 = () => {
         const selfVnode = this._;
         const colList = selfVnode.parent.vnode.children.default() || [];
@@ -17543,6 +17551,13 @@ var Column = defineComponent({
       if (typeof this.bkTableCache.queueStack === "function") {
         this.bkTableCache.queueStack(BK_COLUMN_UPDATE_DEFINE, fn2);
       }
+    },
+    updateColumnDefineByIndex(unmounted = false) {
+      const resolveProp = __spreadProps(__spreadValues({}, this.$props), {
+        field: this.$props.prop || this.$props.field,
+        render: this.$slots.default
+      });
+      this.initColumns(unref(resolveProp), unmounted);
     }
   },
   render() {
@@ -20139,15 +20154,27 @@ var useColumn = (props2, targetColumns) => {
       resolveColumns = column;
     }
     if (!remove) {
-      const resetColumns = resolveColumns.map((col) => {
-        const exist = targetColumns.find((tc) => tc.label === col.label && tc.field === col.field);
-        if (exist) {
-          return exist;
+      let needToSort = false;
+      resolveColumns.forEach((col) => {
+        if (col.index !== void 0 && col.index >= 0) {
+          needToSort = true;
+          const oldIndex = targetColumns.findIndex((tc) => tc.label === col.label && tc.field === col.field);
+          if (oldIndex >= 0) {
+            targetColumns.splice(oldIndex, 1);
+          }
+          targetColumns.push(col);
+        } else {
+          const index2 = targetColumns.findIndex((tc) => tc.label === col.label && tc.field === col.field);
+          if (index2 >= 0) {
+            targetColumns.splice(index2, 1, col);
+          } else {
+            targetColumns.push(col);
+          }
         }
-        return unref(col);
       });
-      targetColumns.length = 0;
-      targetColumns.push(...resetColumns);
+      if (needToSort) {
+        targetColumns.sort((col1, col2) => col1.index - col2.index);
+      }
     } else {
       resolveColumns.forEach((col) => {
         const matchColIndex = targetColumns.findIndex((c2) => c2.label === col.label && c2.field === col.field);
@@ -32338,23 +32365,7 @@ var Component$8 = defineComponent({
       }), [[resolveDirective("bk-tooltips"), collapseTooltip.join(", ")]])]);
     };
     const textRender = () => this.multiple ? null : createVNode("span", null, [this.selectedText]);
-    return createVNode("div", {
-      "class": [resolveClassName("cascader-wrapper"), this.floatMode ? "float-mode" : ""]
-    }, [createVNode("div", {
-      "class": [resolveClassName("cascader"), this.extCls, {
-        "is-unselected": this.modelValue.length === 0,
-        "is-hover": this.isHover,
-        "is-filterable": this.filterable,
-        "is-focus": this.isFocus,
-        "is-disabled": this.disabled,
-        "is-simplicity": this.behavior === "simplicity"
-      }],
-      "tabindex": "0",
-      "data-placeholder": this.placeholder,
-      "onMouseenter": this.setHover,
-      "onMouseleave": this.cancelHover,
-      "ref": "bkCascaderRef"
-    }, [suffixIcon(), createVNode(BkPopover, {
+    const popoverRender = () => createVNode(BkPopover, {
       "placement": "bottom-start",
       "theme": `light ${resolveClassName("cascader-popover")}`,
       "trigger": "click",
@@ -32366,7 +32377,9 @@ var Component$8 = defineComponent({
       "onAfterShow": this.popoverChangeEmitter,
       "boundary": "body"
     }, {
-      default: () => createVNode("div", {
+      default: () => this.$slots.trigger ? this.$slots.trigger({
+        selected: this.modelValue
+      }) : createVNode("div", {
         "class": [resolveClassName("cascader-name"), "bk-scroll-y"]
       }, [this.multiple && this.selectedTags.length > 0 && renderTags(), this.filterable ? (this.isCollapse || this.selectedTags.length === 0) && createVNode("input", {
         "class": [resolveClassName("cascader-search-input"), {
@@ -32397,7 +32410,24 @@ var Component$8 = defineComponent({
           "class": resolveClassName("cascader-node-name")
         }, [scope.node.name])
       })])
-    })])]);
+    });
+    return createVNode("div", {
+      "class": [resolveClassName("cascader-wrapper"), this.floatMode ? "float-mode" : ""]
+    }, [this.$slots.trigger ? popoverRender() : createVNode("div", {
+      "class": [resolveClassName("cascader"), this.extCls, {
+        "is-unselected": this.modelValue.length === 0,
+        "is-hover": this.isHover,
+        "is-filterable": this.filterable,
+        "is-focus": this.isFocus,
+        "is-disabled": this.disabled,
+        "is-simplicity": this.behavior === "simplicity"
+      }],
+      "tabindex": "0",
+      "data-placeholder": this.placeholder,
+      "onMouseenter": this.setHover,
+      "onMouseleave": this.cancelHover,
+      "ref": "bkCascaderRef"
+    }, [suffixIcon(), popoverRender()])]);
   }
 });
 const BkCascader = withInstallProps(Component$8, { CascaderPanel });