3h1-ui 2.14.0-alpha.1 → 2.14.0

package/es/index.js

@@ -6,7 +6,7 @@ import { zxcvbn } from "@zxcvbn-ts/core";
 import Iconify from "@purge-icons/generated";
 import Sortablejs from "sortablejs";
 import "xe-utils";
-import { VxeTable, VxeColumn } from "vxe-table";
+import { VxeTable, VxeColumn, VxeColgroup } from "vxe-table";
 const windiBase = "";
 const windiComponents = "";
 const windiUtilities = "";
@@ -7061,15 +7061,15 @@ const _hoisted_1$p = { class: "flex justify-between" };
 const _hoisted_2$8 = { key: 0 };
 const _hoisted_3$5 = { class: "flex flex-wrap px-2" };
 const _hoisted_4$4 = ["onClick", "title"];
-const _hoisted_5$2 = {
+const _hoisted_5$3 = {
   key: 0,
   class: "flex py-2 items-center justify-center"
 };
-const _hoisted_6$1 = {
+const _hoisted_6$2 = {
   key: 1,
   class: "p-5"
 };
-const _hoisted_7$1 = {
+const _hoisted_7$2 = {
   key: 0,
   class: "cursor-pointer px-2 py-1 flex items-center"
 };
@@ -7198,7 +7198,7 @@ const _sfc_main$_ = /* @__PURE__ */ defineComponent({
                   ]),
                   _: 1
                 }),
-                unref(getTotal) >= __props.pageSize ? (openBlock(), createElementBlock("div", _hoisted_5$2, [
+                unref(getTotal) >= __props.pageSize ? (openBlock(), createElementBlock("div", _hoisted_5$3, [
                   createVNode(unref(APagination), {
                     showLessItems: "",
                     size: "small",
@@ -7207,12 +7207,12 @@ const _sfc_main$_ = /* @__PURE__ */ defineComponent({
                     onChange: handlePageChange
                   }, null, 8, ["pageSize", "total"])
                 ])) : createCommentVNode("", true)
-              ])) : (openBlock(), createElementBlock("div", _hoisted_6$1, [
+              ])) : (openBlock(), createElementBlock("div", _hoisted_6$2, [
                 createVNode(unref(AEmpty))
               ]))
             ]),
             default: withCtx(() => [
-              isSvgMode && currentSelect.value ? (openBlock(), createElementBlock("span", _hoisted_7$1, [
+              isSvgMode && currentSelect.value ? (openBlock(), createElementBlock("span", _hoisted_7$2, [
                 createVNode(SvgIcon, { name: currentSelect.value }, null, 8, ["name"])
               ])) : (openBlock(), createBlock(Icon2, {
                 key: 1,
@@ -8565,13 +8565,11 @@ function useFormEvents({
       value = handleInputNumberValue(schema == null ? void 0 : schema.component, value);
       if (hasKey && fields.includes(key2)) {
         if (itemIsDateType(key2)) {
-          console.log(1, key2);
           if (Array.isArray(value)) {
             const arr = [];
             for (const ele of value) {
               arr.push(ele ? ele : null);
             }
-            console.log("arr", arr);
             formModel[key2] = arr;
           } else {
             const { componentProps } = schema || {};
@@ -10614,7 +10612,6 @@ function useForm(props2) {
       const value = await form.validate(nameList);
       Object.keys(value).forEach((key2) => {
         if (value[key2] === void 0) {
-          console.log("key", key2);
           value[key2] = "";
         }
       });
@@ -12012,7 +12009,6 @@ const PageSecond = /* @__PURE__ */ defineComponent({
     const handleClick = () => {
       emit("click-return");
     };
-    console.log(1);
     return () => {
       var _a2;
       return createVNode("div", {
@@ -12024,7 +12020,9 @@ const PageSecond = /* @__PURE__ */ defineComponent({
         "onClick": handleClick
       }, null), createVNode("div", {
         "class": `${prefixCls}-header-title`
-      }, [(slots == null ? void 0 : slots.title) ? slots == null ? void 0 : slots.title() : props2.title])]), createVNode("div", {
+      }, [createVNode("div", {
+        "style": "margin-right:10px"
+      }, [(slots == null ? void 0 : slots.title) ? slots == null ? void 0 : slots.title() : props2.title]), (slots == null ? void 0 : slots.titleAfter) ? slots == null ? void 0 : slots.titleAfter() : null])]), createVNode("div", {
         "class": `${prefixCls}-body`
       }, [(_a2 = slots.default) == null ? void 0 : _a2.call(slots)]), props2.isShowFooter ? createVNode("div", {
         "class": `${prefixCls}-footer`
@@ -12370,6 +12368,9 @@ const _sfc_main$B = /* @__PURE__ */ defineComponent({
     clickOutside: ClickOutside
   },
   props: {
+    zzz: {
+      type: Object
+    },
     value: {
       type: [String, Number, Boolean, Object],
       default: ""
@@ -12724,31 +12725,34 @@ const _sfc_main$B = /* @__PURE__ */ defineComponent({
         isArray$3(props2.record[cbs]) ? (_a2 = props2.record[cbs]) == null ? void 0 : _a2.push(handle) : props2.record[cbs] = [handle];
       }
     }
-    if (props2.record) {
-      initCbs("submitCbs", handleSubmit);
-      initCbs("validCbs", handleSubmiRule);
-      initCbs("cancelCbs", handleCancel);
-      if (props2.column.dataIndex) {
-        if (!props2.record.editValueRefs)
-          props2.record.editValueRefs = {};
-        props2.record.editValueRefs[props2.column.dataIndex] = currentValueRef;
-      }
-      props2.record.onCancelEdit = () => {
-        var _a2, _b;
-        isArray$3((_a2 = props2.record) == null ? void 0 : _a2.cancelCbs) && ((_b = props2.record) == null ? void 0 : _b.cancelCbs.forEach((fn) => fn()));
-      };
-      props2.record.onSubmitEdit = async () => {
-        var _a2, _b, _c, _d, _e;
-        if (isArray$3((_a2 = props2.record) == null ? void 0 : _a2.submitCbs)) {
-          if (!((_c = (_b = props2.record) == null ? void 0 : _b.onValid) == null ? void 0 : _c.call(_b)))
-            return;
-          const submitFns = ((_d = props2.record) == null ? void 0 : _d.submitCbs) || [];
-          submitFns.forEach((fn) => fn(false, false));
-          (_e = table2.emit) == null ? void 0 : _e.call(table2, "edit-row-end");
-          return true;
+    const editHandler = () => {
+      if (props2.record) {
+        initCbs("submitCbs", handleSubmit);
+        initCbs("validCbs", handleSubmiRule);
+        initCbs("cancelCbs", handleCancel);
+        if (props2.column.dataIndex) {
+          if (!props2.record.editValueRefs)
+            props2.record.editValueRefs = {};
+          props2.record.editValueRefs[props2.column.dataIndex] = currentValueRef;
         }
-      };
-    }
+        props2.record.onCancelEdit = () => {
+          var _a2, _b;
+          isArray$3((_a2 = props2.record) == null ? void 0 : _a2.cancelCbs) && ((_b = props2.record) == null ? void 0 : _b.cancelCbs.forEach((fn) => fn()));
+        };
+        props2.record.onSubmitEdit = async () => {
+          var _a2, _b, _c, _d, _e;
+          if (isArray$3((_a2 = props2.record) == null ? void 0 : _a2.submitCbs)) {
+            if (!((_c = (_b = props2.record) == null ? void 0 : _b.onValid) == null ? void 0 : _c.call(_b)))
+              return;
+            const submitFns = ((_d = props2.record) == null ? void 0 : _d.submitCbs) || [];
+            submitFns.forEach((fn) => fn(false, false));
+            (_e = table2.emit) == null ? void 0 : _e.call(table2, "edit-row-end");
+            return true;
+          }
+        };
+      }
+    };
+    editHandler();
     return {
       isEdit,
       prefixCls: prefixCls2,
@@ -12771,7 +12775,8 @@ const _sfc_main$B = /* @__PURE__ */ defineComponent({
       getValues,
       handleEnter,
       handleSubmitClick,
-      spinning
+      spinning,
+      editHandler
     };
   },
   render() {
@@ -12824,6 +12829,7 @@ const _sfc_main$B = /* @__PURE__ */ defineComponent({
 const EditableCell_vue_vue_type_style_index_0_lang = "";
 function renderEditCell(column) {
   return ({ text: value, record, index: index2 }) => {
+    const editableCellRef = ref();
     record.onValid = async () => {
       if (isArray$3(record == null ? void 0 : record.validCbs)) {
         const validFns = ((record == null ? void 0 : record.validCbs) || []).map((fn) => fn());
@@ -12834,14 +12840,15 @@ function renderEditCell(column) {
       }
     };
     record.onEdit = async (edit, submit = false) => {
-      var _a2, _b;
+      var _a2, _b, _c;
+      (_a2 = editableCellRef.value) == null ? void 0 : _a2.editHandler();
       if (!submit) {
         record.editable = edit;
       }
       if (!edit && submit) {
         if (!await record.onValid())
           return false;
-        const res = await ((_a2 = record.onSubmitEdit) == null ? void 0 : _a2.call(record));
+        const res = await ((_b = record.onSubmitEdit) == null ? void 0 : _b.call(record));
         if (res) {
           record.editable = false;
           return true;
@@ -12849,11 +12856,12 @@ function renderEditCell(column) {
         return false;
       }
       if (!edit && !submit) {
-        (_b = record.onCancelEdit) == null ? void 0 : _b.call(record);
+        (_c = record.onCancelEdit) == null ? void 0 : _c.call(record);
       }
       return true;
     };
     return h(_sfc_main$B, {
+      ref: editableCellRef,
       value,
       record,
       column,
@@ -14491,17 +14499,17 @@ const _hoisted_3$3 = {
   class: "shy-ui-advanced-search-item-value-range"
 };
 const _hoisted_4$2 = /* @__PURE__ */ createElementVNode("div", { style: { "flex": "0", "width": "40px", "margin-right": "8px" } }, " 至 ", -1);
-const _hoisted_5$1 = {
+const _hoisted_5$2 = {
   key: 0,
   class: "shy-ui-advanced-search-item-value-range"
 };
-const _hoisted_6 = /* @__PURE__ */ createElementVNode("div", { style: { "flex": "0", "width": "40px", "margin-right": "8px" } }, " 至 ", -1);
-const _hoisted_7 = {
+const _hoisted_6$1 = /* @__PURE__ */ createElementVNode("div", { style: { "flex": "0", "width": "40px", "margin-right": "8px" } }, " 至 ", -1);
+const _hoisted_7$1 = {
   key: 1,
   style: { "margin-left": "8px", "cursor": "pointer", "position": "relative" },
   class: "shy-ui-advanced-minus-icon"
 };
-const _hoisted_8 = ["onClick"];
+const _hoisted_8$1 = ["onClick"];
 const _sfc_main$v = /* @__PURE__ */ defineComponent({
   __name: "AdvancedSearch",
   props: {
@@ -14531,18 +14539,18 @@ const _sfc_main$v = /* @__PURE__ */ defineComponent({
     };
     const dicColumn = computed(() => {
       const temp = [];
-      props2.schemas.forEach((schama) => {
-        if (!schama.advancedShow)
+      props2.schemas.forEach((schema) => {
+        if (!schema.advancedShow)
           return;
         const flag = schemasCurrent.find((item) => {
-          return item.field === schama.field;
+          return item.field === schema.field;
         });
         temp.push({
-          label: schama.label,
-          value: schama.field,
+          label: schema.label,
+          value: schema.field,
           disabled: !!flag,
-          type: schama.type,
-          component: schama.component
+          type: schema.type,
+          component: schema.component
         });
       });
       return temp;
@@ -14550,7 +14558,7 @@ const _sfc_main$v = /* @__PURE__ */ defineComponent({
     if (props2.schemas.length !== 0) {
       const firstSchema = dicColumn.value[0];
       const op = isStringSearch(firstSchema) ? "ct" : "eq";
-      schemasCurrent.push({ field: firstSchema.value, op });
+      schemasCurrent.push({ field: firstSchema == null ? void 0 : firstSchema.value, op });
     }
     const handleAdd = () => {
       const item = dicColumn.value.find((item2) => {
@@ -14576,7 +14584,7 @@ const _sfc_main$v = /* @__PURE__ */ defineComponent({
       });
       schema.op = isStringSearch(column) ? "ct" : "eq";
     };
-    const handlSetValNull = (schema) => {
+    const handleSetValNull = (schema) => {
       if (["nl", "nn"].includes(schema.op)) {
         schema[schema.field] = "";
       }
@@ -14637,8 +14645,9 @@ const _sfc_main$v = /* @__PURE__ */ defineComponent({
       return form;
     };
     const resetFields = () => {
+      var _a2;
       schemasCurrent.splice(0, schemasCurrent.length);
-      schemasCurrent.push({ field: dicColumn.value[0].value });
+      schemasCurrent.push({ field: (_a2 = dicColumn.value[0]) == null ? void 0 : _a2.value });
       formRef.value.resetFields();
     };
     expose({
@@ -14699,7 +14708,7 @@ const _sfc_main$v = /* @__PURE__ */ defineComponent({
                                 style: { "width": "120px" },
                                 options: getSearchType(schema == null ? void 0 : schema.field),
                                 defaultValue: ((_a2 = getSearchType(schema == null ? void 0 : schema.field)[0]) == null ? void 0 : _a2.value) || "",
-                                onChange: ($event) => handlSetValNull(schema)
+                                onChange: ($event) => handleSetValNull(schema)
                               }, null, 8, ["value", "onUpdate:value", "options", "defaultValue", "onChange"])
                             ];
                           }),
@@ -14741,7 +14750,7 @@ const _sfc_main$v = /* @__PURE__ */ defineComponent({
                                 valueModifiers: { number: true }
                               }, null, 8, ["value", "onUpdate:value"]))
                             ], 64)) : getTypeByField(schema == null ? void 0 : schema.field) === "date" ? (openBlock(), createElementBlock(Fragment, { key: 1 }, [
-                              schema.op === "bt" ? (openBlock(), createElementBlock("div", _hoisted_5$1, [
+                              schema.op === "bt" ? (openBlock(), createElementBlock("div", _hoisted_5$2, [
                                 createVNode(unref(FormItem), null, {
                                   default: withCtx(() => [
                                     createVNode(unref(DatePicker), {
@@ -14753,7 +14762,7 @@ const _sfc_main$v = /* @__PURE__ */ defineComponent({
                                   ]),
                                   _: 2
                                 }, 1024),
-                                _hoisted_6,
+                                _hoisted_6$1,
                                 createVNode(unref(FormItem), null, {
                                   default: withCtx(() => [
                                     createVNode(unref(DatePicker), {
@@ -14802,12 +14811,12 @@ const _sfc_main$v = /* @__PURE__ */ defineComponent({
                           ]),
                           _: 2
                         }, 1024)) : createCommentVNode("", true),
-                        schemasCurrent.length !== 1 ? (openBlock(), createElementBlock("div", _hoisted_7, [
+                        (schemasCurrent == null ? void 0 : schemasCurrent.length) !== 1 ? (openBlock(), createElementBlock("div", _hoisted_7$1, [
                           createElementVNode("div", {
                             style: { "position": "absolute", "width": "14px", "height": "14px", "left": "0", "right": "0", "top": "0", "bottom": "0" },
                             class: "shy-basic-minus-icon",
                             onClick: ($event) => handleMinus(index2)
-                          }, null, 8, _hoisted_8),
+                          }, null, 8, _hoisted_8$1),
                           createVNode(unref(MinusCircleTwoTone$1), { class: "shy-ui-advanced-minus-icon" })
                         ])) : createCommentVNode("", true)
                       ])
@@ -15741,7 +15750,7 @@ const _hoisted_1$e = /* @__PURE__ */ _withScopeId(() => /* @__PURE__ */ createEl
 const _hoisted_2$4 = /* @__PURE__ */ _withScopeId(() => /* @__PURE__ */ createElementVNode("div", null, "搜索特定字段", -1));
 const _hoisted_3$1 = /* @__PURE__ */ _withScopeId(() => /* @__PURE__ */ createElementVNode("div", null, null, -1));
 const _hoisted_4$1 = { class: "shy-basic-table-global-search-checkbox-wrapper" };
-const _hoisted_5 = { style: { "color": "#131415", "font-size": "12px" } };
+const _hoisted_5$1 = { style: { "color": "#131415", "font-size": "12px" } };
 function _sfc_render$g(_ctx, _cache, $props, $setup, $data, $options) {
   const _component_CheckOutlined = resolveComponent("CheckOutlined");
   const _component_Checkbox = resolveComponent("Checkbox");
@@ -15782,7 +15791,7 @@ function _sfc_render$g(_ctx, _cache, $props, $setup, $data, $options) {
                 value: item.field
               }, {
                 default: withCtx(() => [
-                  createElementVNode("span", _hoisted_5, toDisplayString(item.label), 1)
+                  createElementVNode("span", _hoisted_5$1, toDisplayString(item.label), 1)
                 ]),
                 _: 2
               }, 1032, ["value"])
@@ -16353,7 +16362,7 @@ const _sfc_main$m = /* @__PURE__ */ defineComponent({
       }).map((action) => {
         const { popConfirm } = action;
         return {
-          getPopupContainer: () => unref(table2 == null ? void 0 : table2.wrapRef.value) ?? document.body,
+          getPopupContainer: () => document.body,
           type: "link",
           size: "small",
           ...action,
@@ -16638,9 +16647,7 @@ function useTable(tableProps) {
   function getTableInstance() {
     const table2 = unref(tableRef);
     if (!table2) {
-      error$1(
-        "The table instance has not been obtained yet, please make sure the table is presented when performing the table operation!"
-      );
+      return;
     }
     return table2;
   }
@@ -16661,7 +16668,8 @@ function useTable(tableProps) {
       getTableInstance().setLoading(loading);
     },
     getDataSource: () => {
-      return getTableInstance().getDataSource();
+      var _a2;
+      return ((_a2 = getTableInstance()) == null ? void 0 : _a2.getDataSource()) || false;
     },
     getRawDataSource: () => {
       return getTableInstance().getRawDataSource();
@@ -16683,10 +16691,12 @@ function useTable(tableProps) {
       getTableInstance().deleteSelectRowByKey(key2);
     },
     getSelectRowKeys: () => {
-      return toRaw(getTableInstance().getSelectRowKeys());
+      var _a2;
+      return toRaw((_a2 = getTableInstance()) == null ? void 0 : _a2.getSelectRowKeys());
     },
     getSelectRows: () => {
-      return toRaw(getTableInstance().getSelectRows());
+      var _a2;
+      return toRaw((_a2 = getTableInstance()) == null ? void 0 : _a2.getSelectRows());
     },
     clearSelectedRowKeys: () => {
       getTableInstance().clearSelectedRowKeys();
@@ -16812,7 +16822,6 @@ const _sfc_main$i = /* @__PURE__ */ defineComponent({
       await tableRef.value.setProps({
         searchInfo: { [unref(getTableProps).searchKey]: key2 }
       });
-      console.log("unref(getTableProps).searchKey", unref(getTableProps).searchKey);
       tableRef.value.reload();
     };
     const handleComfirm = () => {
@@ -16848,8 +16857,8 @@ const _sfc_main$i = /* @__PURE__ */ defineComponent({
     };
   }
 });
-const Modal_vue_vue_type_style_index_0_scoped_dbd84c9c_lang = "";
-const Modal = /* @__PURE__ */ _export_sfc(_sfc_main$i, [["__scopeId", "data-v-dbd84c9c"]]);
+const Modal_vue_vue_type_style_index_0_scoped_4dc415ac_lang = "";
+const Modal = /* @__PURE__ */ _export_sfc(_sfc_main$i, [["__scopeId", "data-v-4dc415ac"]]);
 const _hoisted_1$9 = { class: "api-modal-select" };
 const _sfc_main$h = /* @__PURE__ */ defineComponent({
   __name: "ApiModalSelect",
@@ -17005,6 +17014,10 @@ const basicProps$2 = {
     type: Array,
     default: () => [{ label: "a", field: "a" }]
   },
+  labelAlign: {
+    type: String,
+    default: () => "right"
+  },
   labelWidth: {
     type: Number,
     default: () => 80
@@ -17053,13 +17066,14 @@ const Description = /* @__PURE__ */ defineComponent({
         ...props3
       };
     };
-    const copyToClipboard = async (text) => {
-      try {
-        await navigator.clipboard.writeText(text);
-      } catch (err) {
-        console.error("Failed to copy text: ", err);
-      }
-    };
+    function copyToClipboard(text) {
+      const textarea = document.createElement("textarea");
+      textarea.value = text;
+      document.body.appendChild(textarea);
+      textarea.select();
+      document.execCommand("copy");
+      document.body.removeChild(textarea);
+    }
     const handleClick = (value) => {
       copyToClipboard(value);
     };
@@ -17084,15 +17098,21 @@ const Description = /* @__PURE__ */ defineComponent({
             }
           }, [createVNode("span", {
             "style": {
-              width: `${getProps.value.labelWidth}px`
+              width: `${getProps.value.labelWidth}px`,
+              textAlign: getProps.value.labelAlign
             },
             "class": `${prefixCls2}-label`
           }, [slots[`${item.field}Label`] ? slots[`${item.field}Label`]() : item.label, ((_b = getProps.value) == null ? void 0 : _b.isShowColon) ? ":" : ""]), createVNode("span", {
             "class": `${prefixCls2}-value`
-          }, [slots[`${item.field}Value`] ? slots[`${item.field}Value`]() : getProps.value.data[item.field]]), (item == null ? void 0 : item.isCopy) ? createVNode("span", {
-            "style": "cursor:pointer",
+          }, [slots[`${item.field}Value`] ? slots[`${item.field}Value`]() : getProps.value.data[item.field], (item == null ? void 0 : item.isCopy) ? createVNode("span", {
+            "style": "cursor:pointer;margin-left:5px",
             "onClick": () => handleClick(getProps.value.data[item.field])
-          }, [createVNode(CopyOutlined$1, null, null)]) : null]);
+          }, [createVNode(CopyOutlined$1, {
+            "style": {
+              color: "#458ef9",
+              marginLeft: "5px"
+            }
+          }, null)]) : null])]);
         }
       });
     });
@@ -21266,7 +21286,7 @@ const usePagination = () => {
   };
   return { page, setPage };
 };
-const useTableData = (getProps, { setPage, params }) => {
+const useTableData = (getProps, { setPage, params, tableRef }) => {
   const dataSource = ref([]);
   const setTableData = (data) => {
     dataSource.value = data.map((item) => {
@@ -21285,6 +21305,14 @@ const useTableData = (getProps, { setPage, params }) => {
       setPage({ total: (res == null ? void 0 : res.total) || 0 });
     }
   };
+  const addTableData = (list = [{}]) => {
+    const temp = list.map((item) => {
+      item._isEdit = true;
+      return item;
+    });
+    dataSource.value.unshift(...temp);
+    tableRef.value.loadData(dataSource.value);
+  };
   onMounted(async () => {
     if (getProps.value.isImmediate) {
       await reload();
@@ -21294,7 +21322,8 @@ const useTableData = (getProps, { setPage, params }) => {
     dataSource,
     setTableData,
     reload,
-    getTableData
+    getTableData,
+    addTableData
   };
 };
 const componentMap = /* @__PURE__ */ new Map();
@@ -21343,16 +21372,32 @@ const _sfc_main$7 = /* @__PURE__ */ defineComponent({
       default: null
     }
   },
-  emits: ["updateStatusEdit", "edit-ensure", "edit-cancel"],
+  emits: [
+    "updateStatusEdit",
+    "edit-ensure",
+    "edit-cancel",
+    "row-remove"
+  ],
   setup(__props, { emit }) {
     const props2 = __props;
     const getActions = computed(() => {
+      var _a2;
       return [
         {
           label: "编辑",
           onClick: () => {
             emit("updateStatusEdit", true);
           },
+          ifShow: ((_a2 = props2 == null ? void 0 : props2.row) == null ? void 0 : _a2._isEdit) === false
+        },
+        {
+          label: "删除",
+          popConfirm: {
+            title: "是否确认删除",
+            confirm: () => {
+              emit("row-remove", true);
+            }
+          },
           ifShow: props2.row._isEdit === false
         },
         {
@@ -21376,6 +21421,7 @@ const _sfc_main$7 = /* @__PURE__ */ defineComponent({
     return (_ctx, _cache) => {
       return openBlock(), createBlock(_sfc_main$m, {
         actions: unref(getActions),
+        "show-count": 4,
         outside: true
       }, null, 8, ["actions"]);
     };
@@ -21940,7 +21986,14 @@ const TableSetting = /* @__PURE__ */ _export_sfc(_sfc_main$2, [["render", _sfc_r
 const useColumns = (getProps, tableRef) => {
   const getColumnsRef = computed(() => {
     return getProps.value.columns.map((column) => {
-      return deepMergeObjects(basicColumn, column);
+      if (column == null ? void 0 : column.children) {
+        column.children = column.children.map((item) => {
+          return deepMergeObjects(basicColumn, item);
+        });
+        return column;
+      } else {
+        return deepMergeObjects(basicColumn, column);
+      }
     });
   });
   const getColumns = () => {
@@ -22043,8 +22096,13 @@ const _sfc_main$1 = /* @__PURE__ */ defineComponent({
 });
 const _hoisted_1 = { key: 0 };
 const _hoisted_2 = { key: 1 };
-const _hoisted_3 = { style: { "display": "flex", "justify-content": "space-between" } };
-const _hoisted_4 = { class: "flex items-center justify-center" };
+const _hoisted_3 = { key: 2 };
+const _hoisted_4 = { style: { "display": "flex", "justify-content": "space-between" } };
+const _hoisted_5 = { key: 0 };
+const _hoisted_6 = { key: 1 };
+const _hoisted_7 = { key: 2 };
+const _hoisted_8 = { style: { "display": "flex", "justify-content": "space-between" } };
+const _hoisted_9 = { class: "flex items-center" };
 const _sfc_main = /* @__PURE__ */ defineComponent({
   __name: "TablePlus",
   props: {
@@ -22089,7 +22147,8 @@ const _sfc_main = /* @__PURE__ */ defineComponent({
     "register",
     "selection-change",
     "row-ensure",
-    "row-cancel"
+    "row-cancel",
+    "row-remove"
   ],
   setup(__props, { emit: emits }) {
     const props2 = __props;
@@ -22113,7 +22172,7 @@ const _sfc_main = /* @__PURE__ */ defineComponent({
       innerProps.value = deepMergeObjects(innerProps.value, props22);
     };
     const attrs = useAttrs$2();
-    useSlots();
+    const slots = useSlots();
     const getBindValues = computed(() => {
       return deepMergeObjects(basicProps, attrs, getProps.value);
     });
@@ -22134,6 +22193,16 @@ const _sfc_main = /* @__PURE__ */ defineComponent({
         rowProps: { gutter: 20 }
       };
     });
+    const getFormSlotKeys = computed(() => {
+      const keys2 = Object.keys(slots);
+      return keys2.map((item) => item.startsWith("form-") ? item : null).filter((item) => !!item);
+    });
+    function replaceFormSlotKey(key2) {
+      var _a2;
+      if (!key2)
+        return "";
+      return ((_a2 = key2 == null ? void 0 : key2.replace) == null ? void 0 : _a2.call(key2, /form-/, "")) ?? "";
+    }
     const [registerForm, formActions] = useForm();
     const formSearch = ref({});
     const handleSearchFormSubmit = (form) => {
@@ -22149,14 +22218,27 @@ const _sfc_main = /* @__PURE__ */ defineComponent({
         size: page.pageSize
       };
     });
-    const { dataSource, setTableData, reload, getTableData } = useTableData(
-      getProps,
-      {
-        setPage,
-        params
-      }
-    );
     const tableRef = ref();
+    const { dataSource, setTableData, reload, getTableData, addTableData } = useTableData(getProps, {
+      setPage,
+      params,
+      tableRef
+    });
+    const getSwitchShowText = (column, row) => {
+      const {
+        unCheckedChildren = "否",
+        unCheckedValue = 0,
+        checkedChildren = "是",
+        checkedValue = 1
+      } = (column == null ? void 0 : column.editComponentProps) || {};
+      if (row[column.field] == checkedValue) {
+        return checkedChildren;
+      } else if (row[column.field] == unCheckedValue) {
+        return unCheckedChildren;
+      } else {
+        return "";
+      }
+    };
     const handleCheckboxChange = () => {
       const records = tableRef.value.getCheckboxRecords();
       emits("selection-change", records);
@@ -22184,6 +22266,9 @@ const _sfc_main = /* @__PURE__ */ defineComponent({
     const handleEditCancel = (row) => {
       emits("row-cancel", row);
     };
+    const handleRowRemove = (row) => {
+      emits("row-remove", row);
+    };
     const getTreeExpandRecords = () => {
       return toRaw(tableRef.value.getTreeExpandRecords());
     };
@@ -22200,7 +22285,6 @@ const _sfc_main = /* @__PURE__ */ defineComponent({
       return tableRef.value;
     };
     const setSelectRowByKeys = (keys2, checked) => {
-      tableRef.value.getTableData();
       const rows = [];
       keys2.forEach((key2) => {
         const row = tableRef.value.getRowById(key2);
@@ -22216,6 +22300,9 @@ const _sfc_main = /* @__PURE__ */ defineComponent({
       resetColumn,
       refreshColumn
     } = useColumns(getProps, tableRef);
+    watchEffect(() => {
+      console.log("getColumnsRef", getColumnsRef.value);
+    });
     const tableAction = {
       reload,
       setTableData,
@@ -22239,7 +22326,8 @@ const _sfc_main = /* @__PURE__ */ defineComponent({
       hideColumn,
       showColumn,
       resetColumn,
-      refreshColumn
+      refreshColumn,
+      addTableData
     };
     createTableContext({ ...tableAction });
     emits("register", tableAction, formActions);
@@ -22257,7 +22345,16 @@ const _sfc_main = /* @__PURE__ */ defineComponent({
             onReset: handleSearchFormSubmit,
             onAdvancedChange: _cache[0] || (_cache[0] = () => {
             })
-          }), null, 16, ["onRegister"])
+          }), createSlots({ _: 2 }, [
+            renderList(unref(getFormSlotKeys), (item) => {
+              return {
+                name: replaceFormSlotKey(item),
+                fn: withCtx((data) => [
+                  renderSlot(_ctx.$slots, item, normalizeProps(guardReactiveProps(data || {})))
+                ])
+              };
+            })
+          ]), 1040, ["onRegister"])
         ], 2)) : createCommentVNode("", true),
         unref(getProps).isShowToolbar ? (openBlock(), createElementBlock("div", {
           key: 1,
@@ -22313,45 +22410,121 @@ const _sfc_main = /* @__PURE__ */ defineComponent({
                   align: "center",
                   title: "序号"
                 }, unref(getProps).columnSeq), null, 16)) : createCommentVNode("", true),
-                (openBlock(true), createElementBlock(Fragment, null, renderList(unref(getColumnsRef), (column, index2) => {
-                  return openBlock(), createBlock(unref(VxeColumn), mergeProps({ key: index2 }, column, {
-                    "edit-render": (column == null ? void 0 : column.editRender) || void 0
-                  }), {
-                    default: withCtx((config) => [
-                      renderSlot(_ctx.$slots, column.field, normalizeProps(guardReactiveProps(config)), () => {
-                        var _a3, _b2;
-                        return [
-                          config.row._isEdit && (column == null ? void 0 : column.isEdit) ? (openBlock(), createBlock(unref(CellComponent), mergeProps({ key: 0 }, (column == null ? void 0 : column.editProps) || {}, {
-                            value: config.row[column.field],
-                            "onUpdate:value": ($event) => config.row[column.field] = $event
-                          }), null, 16, ["value", "onUpdate:value"])) : (openBlock(), createElementBlock(Fragment, { key: 1 }, [
-                            (column == null ? void 0 : column.isEdit) && ((_a3 = column == null ? void 0 : column.editProps) == null ? void 0 : _a3.component) === "Select" || ((_b2 = column == null ? void 0 : column.editProps) == null ? void 0 : _b2.component) === "ApiSelect" ? (openBlock(), createElementBlock("span", _hoisted_1, [
-                              createVNode(unref(CellComponent), mergeProps((column == null ? void 0 : column.editProps) || {}, {
+                (openBlock(true), createElementBlock(Fragment, null, renderList(unref(getColumnsRef), (column) => {
+                  return openBlock(), createElementBlock(Fragment, {
+                    key: column.field
+                  }, [
+                    (column == null ? void 0 : column.groupName) ? (openBlock(), createBlock(unref(VxeColgroup), {
+                      key: 0,
+                      title: column.groupName
+                    }, {
+                      default: withCtx(() => [
+                        (openBlock(true), createElementBlock(Fragment, null, renderList(column.children, (c) => {
+                          return openBlock(), createBlock(unref(VxeColumn), {
+                            key: c.field,
+                            title: "a",
+                            field: c.field,
+                            "edit-render": (c == null ? void 0 : c.editRender) || void 0
+                          }, {
+                            default: withCtx((config) => [
+                              renderSlot(_ctx.$slots, c.field, normalizeProps(guardReactiveProps(config)), () => {
+                                var _a3, _b2, _c2, _d2;
+                                return [
+                                  config.row._isEdit && (column == null ? void 0 : column.isEdit) ? (openBlock(), createElementBlock(Fragment, { key: 0 }, [
+                                    ((_a3 = c == null ? void 0 : c.editComponentProps) == null ? void 0 : _a3.component) === "Switch" ? (openBlock(), createBlock(unref(CellComponent), mergeProps({
+                                      key: 0,
+                                      checkedValue: 1,
+                                      unCheckedValue: 0
+                                    }, (c == null ? void 0 : c.editComponentProps) || {}, {
+                                      checked: config.row[c.field],
+                                      "onUpdate:checked": ($event) => config.row[c.field] = $event
+                                    }), null, 16, ["checked", "onUpdate:checked"])) : (openBlock(), createBlock(unref(CellComponent), mergeProps({ key: 1 }, (c == null ? void 0 : c.editComponentProps) || {}, {
+                                      value: config.row[c.field],
+                                      "onUpdate:value": ($event) => config.row[c.field] = $event
+                                    }), null, 16, ["value", "onUpdate:value"]))
+                                  ], 64)) : (openBlock(), createElementBlock(Fragment, { key: 1 }, [
+                                    (c == null ? void 0 : c.isEdit) && ((_b2 = c == null ? void 0 : c.editComponentProps) == null ? void 0 : _b2.component) === "Select" || ((_c2 = c == null ? void 0 : c.editComponentProps) == null ? void 0 : _c2.component) === "ApiSelect" ? (openBlock(), createElementBlock("span", _hoisted_1, [
+                                      createVNode(unref(CellComponent), mergeProps((c == null ? void 0 : c.editComponentProps) || {}, {
+                                        value: config.row[c.field],
+                                        "onUpdate:value": ($event) => config.row[c.field] = $event,
+                                        bordered: false,
+                                        showArrow: false,
+                                        open: false,
+                                        popoverVisible: false
+                                      }), null, 16, ["value", "onUpdate:value"])
+                                    ])) : (c == null ? void 0 : c.isEdit) && ((_d2 = c == null ? void 0 : c.editComponentProps) == null ? void 0 : _d2.component) === "Switch" ? (openBlock(), createElementBlock("span", _hoisted_2, [
+                                      createElementVNode("span", null, toDisplayString(getSwitchShowText(c, config.row)), 1)
+                                    ])) : (openBlock(), createElementBlock("span", _hoisted_3, toDisplayString(config.row[c.field]), 1))
+                                  ], 64))
+                                ];
+                              })
+                            ]),
+                            header: withCtx(() => [
+                              renderSlot(_ctx.$slots, `${c.field}Header`, normalizeProps(guardReactiveProps({ c })), () => [
+                                createElementVNode("div", _hoisted_4, [
+                                  createElementVNode("div", null, toDisplayString(c.title), 1),
+                                  (column == null ? void 0 : column.sortable) ? (openBlock(), createBlock(_sfc_main$1, {
+                                    key: 0,
+                                    onChange: (type) => handleSortChange(column.field, type)
+                                  }, null, 8, ["onChange"])) : createCommentVNode("", true)
+                                ])
+                              ])
+                            ]),
+                            _: 2
+                          }, 1032, ["field", "edit-render"]);
+                        }), 128))
+                      ]),
+                      _: 2
+                    }, 1032, ["title"])) : (openBlock(), createBlock(unref(VxeColumn), mergeProps({ key: 1 }, column, {
+                      "edit-render": (column == null ? void 0 : column.editRender) || void 0
+                    }), {
+                      default: withCtx((config) => [
+                        renderSlot(_ctx.$slots, column.field, normalizeProps(guardReactiveProps(config)), () => {
+                          var _a3, _b2, _c2, _d2;
+                          return [
+                            config.row._isEdit && (column == null ? void 0 : column.isEdit) ? (openBlock(), createElementBlock(Fragment, { key: 0 }, [
+                              ((_a3 = column == null ? void 0 : column.editComponentProps) == null ? void 0 : _a3.component) === "Switch" ? (openBlock(), createBlock(unref(CellComponent), mergeProps({
+                                key: 0,
+                                checkedValue: 1,
+                                unCheckedValue: 0
+                              }, (column == null ? void 0 : column.editComponentProps) || {}, {
+                                checked: config.row[column.field],
+                                "onUpdate:checked": ($event) => config.row[column.field] = $event
+                              }), null, 16, ["checked", "onUpdate:checked"])) : (openBlock(), createBlock(unref(CellComponent), mergeProps({ key: 1 }, (column == null ? void 0 : column.editComponentProps) || {}, {
                                 value: config.row[column.field],
-                                "onUpdate:value": ($event) => config.row[column.field] = $event,
-                                bordered: false,
-                                showArrow: false,
-                                open: false,
-                                popoverVisible: false
-                              }), null, 16, ["value", "onUpdate:value"])
-                            ])) : (openBlock(), createElementBlock("span", _hoisted_2, toDisplayString(config.row[column.field]), 1))
-                          ], 64))
-                        ];
-                      })
-                    ]),
-                    header: withCtx(() => [
-                      renderSlot(_ctx.$slots, `${column.field}Header`, normalizeProps(guardReactiveProps({ column })), () => [
-                        createElementVNode("div", _hoisted_3, [
-                          createElementVNode("div", null, toDisplayString(column.title), 1),
-                          (column == null ? void 0 : column.sortable) ? (openBlock(), createBlock(_sfc_main$1, {
-                            key: 0,
-                            onChange: (type) => handleSortChange(column.field, type)
-                          }, null, 8, ["onChange"])) : createCommentVNode("", true)
+                                "onUpdate:value": ($event) => config.row[column.field] = $event
+                              }), null, 16, ["value", "onUpdate:value"]))
+                            ], 64)) : (openBlock(), createElementBlock(Fragment, { key: 1 }, [
+                              (column == null ? void 0 : column.isEdit) && ((_b2 = column == null ? void 0 : column.editComponentProps) == null ? void 0 : _b2.component) === "Select" || ((_c2 = column == null ? void 0 : column.editComponentProps) == null ? void 0 : _c2.component) === "ApiSelect" ? (openBlock(), createElementBlock("span", _hoisted_5, [
+                                createVNode(unref(CellComponent), mergeProps((column == null ? void 0 : column.editComponentProps) || {}, {
+                                  value: config.row[column.field],
+                                  "onUpdate:value": ($event) => config.row[column.field] = $event,
+                                  bordered: false,
+                                  showArrow: false,
+                                  open: false,
+                                  popoverVisible: false
+                                }), null, 16, ["value", "onUpdate:value"])
+                              ])) : (column == null ? void 0 : column.isEdit) && ((_d2 = column == null ? void 0 : column.editComponentProps) == null ? void 0 : _d2.component) === "Switch" ? (openBlock(), createElementBlock("span", _hoisted_6, [
+                                createElementVNode("span", null, toDisplayString(getSwitchShowText(column, config.row)), 1)
+                              ])) : (openBlock(), createElementBlock("span", _hoisted_7, toDisplayString(config.row[column.field]), 1))
+                            ], 64))
+                          ];
+                        })
+                      ]),
+                      header: withCtx(() => [
+                        renderSlot(_ctx.$slots, `${column.field}Header`, normalizeProps(guardReactiveProps({ column })), () => [
+                          createElementVNode("div", _hoisted_8, [
+                            createElementVNode("div", null, toDisplayString(column.title), 1),
+                            (column == null ? void 0 : column.sortable) ? (openBlock(), createBlock(_sfc_main$1, {
+                              key: 0,
+                              onChange: (type) => handleSortChange(column.field, type)
+                            }, null, 8, ["onChange"])) : createCommentVNode("", true)
+                          ])
                         ])
-                      ])
-                    ]),
-                    _: 2
-                  }, 1040, ["edit-render"]);
+                      ]),
+                      _: 2
+                    }, 1040, ["edit-render"]))
+                  ], 64);
                 }), 128)),
                 unref(getProps).isShowAction ? (openBlock(), createBlock(unref(VxeColumn), mergeProps({
                   key: 3,
@@ -22360,7 +22533,7 @@ const _sfc_main = /* @__PURE__ */ defineComponent({
                   align: "center"
                 }, unref(getProps).actionColumn), {
                   default: withCtx((config) => [
-                    createElementVNode("div", _hoisted_4, [
+                    createElementVNode("div", _hoisted_9, [
                       renderSlot(_ctx.$slots, "action", normalizeProps(guardReactiveProps(config)), () => [
                         unref(getProps).isUseDefaultEditAction ? (openBlock(), createBlock(_sfc_main$7, {
                           key: 0,
@@ -22369,8 +22542,10 @@ const _sfc_main = /* @__PURE__ */ defineComponent({
                           onEditCancel: ($event) => handleEditCancel(config.row),
                           onUpdateStatusEdit: (isEdit) => {
                             config.row._isEdit = isEdit;
-                          }
-                        }, null, 8, ["row", "onEditEnsure", "onEditCancel", "onUpdateStatusEdit"])) : createCommentVNode("", true)
+                          },
+                          onRowRemove: ($event) => handleRowRemove(config.row),
+                          style: { width: "100%" }
+                        }, null, 8, ["row", "onEditEnsure", "onEditCancel", "onUpdateStatusEdit", "onRowRemove"])) : createCommentVNode("", true)
                       ])
                     ])
                   ]),
@@ -22440,7 +22615,8 @@ function useTablePlus(tableProps) {
     clearTreeExpand: () => getTableInstance().clearTreeExpand(),
     setTreeExpand: (rows, checked) => getTableInstance().setTreeExpand(rows, checked),
     getVxeTableRef: () => getTableInstance().getVxeTableRef(),
-    setSelectRowByKeys: (keys2, checked) => getTableInstance().setSelectRowByKeys(keys2, checked)
+    setSelectRowByKeys: (keys2, checked) => getTableInstance().setSelectRowByKeys(keys2, checked),
+    addTableData: (list) => getTableInstance().addTableData(list)
   };
   return [register, methods2];
 }