3h1-ui 2.1.18 → 2.1.20

package/es/index.js

@@ -6,6 +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";
 const windiBase = "";
 const windiComponents = "";
 const windiUtilities = "";
@@ -10270,7 +10271,6 @@ function useForm(props2) {
         "The form instance has not been obtained, please make sure that the form has been rendered when performing the form operation!"
       );
     }
-    await nextTick();
     return form;
   }
   function register(instance) {
@@ -20217,6 +20217,10 @@ const _sfc_main = /* @__PURE__ */ defineComponent({
       ...getFormConfig.value
     });
     const formSearch = ref({});
+    const handleSearchFormSubmit = (form) => {
+      formSearch.value = getProps.value.transSearchInfoBeforeReload(form);
+      reload();
+    };
     const params = computed(() => {
       return {
         ...getProps.value.searchInfo,
@@ -20271,15 +20275,19 @@ const _sfc_main = /* @__PURE__ */ defineComponent({
     };
     emits("register", tableAction, formActions);
     return (_ctx, _cache) => {
-      const _component_vxe_column = resolveComponent("vxe-column");
-      const _component_vxe_table = resolveComponent("vxe-table");
       return openBlock(), createElementBlock("div", {
         class: normalizeClass(getClassName("wrapper"))
       }, [
         unref(getProps).isShowSearch ? (openBlock(), createElementBlock("div", {
           key: 0,
           class: normalizeClass(getClassName("search"))
-        }, null, 2)) : createCommentVNode("", true),
+        }, [
+          createVNode(unref(BasicForm), mergeProps({
+            onRegister: unref(registerForm),
+            onSubmit: handleSearchFormSubmit,
+            onReset: handleSearchFormSubmit
+          }, unref(getFormConfig)), null, 16, ["onRegister"])
+        ], 2)) : createCommentVNode("", true),
         unref(getProps).isShowToolbar ? (openBlock(), createElementBlock("div", {
           key: 1,
           class: normalizeClass(getClassName("toolbar"))
@@ -20289,7 +20297,7 @@ const _sfc_main = /* @__PURE__ */ defineComponent({
         createElementVNode("div", {
           class: normalizeClass(getClassName("body"))
         }, [
-          createVNode(_component_vxe_table, mergeProps({
+          createVNode(unref(VxeTable), mergeProps({
             ref_key: "tableRef",
             ref: tableRef
           }, unref(getBindValues), {
@@ -20305,19 +20313,19 @@ const _sfc_main = /* @__PURE__ */ defineComponent({
             default: withCtx(() => {
               var _a2, _b, _c, _d, _e, _f;
               return [
-                ((_b = (_a2 = unref(getProps)) == null ? void 0 : _a2.configRowSelection) == null ? void 0 : _b.type) === "checkbox" && ((_c = unref(getProps)) == null ? void 0 : _c.isShowRowSelection) ? (openBlock(), createBlock(_component_vxe_column, {
+                ((_b = (_a2 = unref(getProps)) == null ? void 0 : _a2.configRowSelection) == null ? void 0 : _b.type) === "checkbox" && ((_c = unref(getProps)) == null ? void 0 : _c.isShowRowSelection) ? (openBlock(), createBlock(unref(VxeColumn), {
                   key: 0,
                   type: "checkbox",
                   width: "60",
                   align: "center"
                 })) : createCommentVNode("", true),
-                ((_e = (_d = unref(getProps)) == null ? void 0 : _d.configRowSelection) == null ? void 0 : _e.type) === "radio" && ((_f = unref(getProps)) == null ? void 0 : _f.isShowRowSelection) ? (openBlock(), createBlock(_component_vxe_column, {
+                ((_e = (_d = unref(getProps)) == null ? void 0 : _d.configRowSelection) == null ? void 0 : _e.type) === "radio" && ((_f = unref(getProps)) == null ? void 0 : _f.isShowRowSelection) ? (openBlock(), createBlock(unref(VxeColumn), {
                   key: 1,
                   type: "radio",
                   width: "60",
                   align: "center"
                 })) : createCommentVNode("", true),
-                unref(getProps).isShowSeq ? (openBlock(), createBlock(_component_vxe_column, {
+                unref(getProps).isShowSeq ? (openBlock(), createBlock(unref(VxeColumn), {
                   key: 2,
                   type: "seq",
                   width: "60",
@@ -20325,7 +20333,7 @@ const _sfc_main = /* @__PURE__ */ defineComponent({
                   title: "序号"
                 })) : createCommentVNode("", true),
                 (openBlock(true), createElementBlock(Fragment, null, renderList(unref(getColumns), (column, index2) => {
-                  return openBlock(), createBlock(_component_vxe_column, mergeProps({ key: index2 }, column, {
+                  return openBlock(), createBlock(unref(VxeColumn), mergeProps({ key: index2 }, column, {
                     "edit-render": (column == null ? void 0 : column.editRender) || void 0
                   }), {
                     default: withCtx((config) => [
@@ -20353,7 +20361,7 @@ const _sfc_main = /* @__PURE__ */ defineComponent({
                     _: 2
                   }, 1040, ["edit-render"]);
                 }), 128)),
-                unref(getProps).isShowAction ? (openBlock(), createBlock(_component_vxe_column, mergeProps({
+                unref(getProps).isShowAction ? (openBlock(), createBlock(unref(VxeColumn), mergeProps({
                   key: 3,
                   title: "操作",
                   field: "action",

package/lib/index.js

@@ -8,6 +8,7 @@ const core = require("@zxcvbn-ts/core");
 const Iconify = require("@purge-icons/generated");
 const Sortablejs = require("sortablejs");
 require("xe-utils");
+const vxeTable = require("vxe-table");
 const windiBase = "";
 const windiComponents = "";
 const windiUtilities = "";
@@ -10272,7 +10273,6 @@ function useForm(props2) {
         "The form instance has not been obtained, please make sure that the form has been rendered when performing the form operation!"
       );
     }
-    await vue.nextTick();
     return form;
   }
   function register(instance) {
@@ -20219,6 +20219,10 @@ const _sfc_main = /* @__PURE__ */ vue.defineComponent({
       ...getFormConfig.value
     });
     const formSearch = vue.ref({});
+    const handleSearchFormSubmit = (form) => {
+      formSearch.value = getProps.value.transSearchInfoBeforeReload(form);
+      reload();
+    };
     const params = vue.computed(() => {
       return {
         ...getProps.value.searchInfo,
@@ -20273,15 +20277,19 @@ const _sfc_main = /* @__PURE__ */ vue.defineComponent({
     };
     emits("register", tableAction, formActions);
     return (_ctx, _cache) => {
-      const _component_vxe_column = vue.resolveComponent("vxe-column");
-      const _component_vxe_table = vue.resolveComponent("vxe-table");
       return vue.openBlock(), vue.createElementBlock("div", {
         class: vue.normalizeClass(getClassName("wrapper"))
       }, [
         vue.unref(getProps).isShowSearch ? (vue.openBlock(), vue.createElementBlock("div", {
           key: 0,
           class: vue.normalizeClass(getClassName("search"))
-        }, null, 2)) : vue.createCommentVNode("", true),
+        }, [
+          vue.createVNode(vue.unref(BasicForm), vue.mergeProps({
+            onRegister: vue.unref(registerForm),
+            onSubmit: handleSearchFormSubmit,
+            onReset: handleSearchFormSubmit
+          }, vue.unref(getFormConfig)), null, 16, ["onRegister"])
+        ], 2)) : vue.createCommentVNode("", true),
         vue.unref(getProps).isShowToolbar ? (vue.openBlock(), vue.createElementBlock("div", {
           key: 1,
           class: vue.normalizeClass(getClassName("toolbar"))
@@ -20291,7 +20299,7 @@ const _sfc_main = /* @__PURE__ */ vue.defineComponent({
         vue.createElementVNode("div", {
           class: vue.normalizeClass(getClassName("body"))
         }, [
-          vue.createVNode(_component_vxe_table, vue.mergeProps({
+          vue.createVNode(vue.unref(vxeTable.VxeTable), vue.mergeProps({
             ref_key: "tableRef",
             ref: tableRef
           }, vue.unref(getBindValues), {
@@ -20307,19 +20315,19 @@ const _sfc_main = /* @__PURE__ */ vue.defineComponent({
             default: vue.withCtx(() => {
               var _a2, _b, _c, _d, _e, _f;
               return [
-                ((_b = (_a2 = vue.unref(getProps)) == null ? void 0 : _a2.configRowSelection) == null ? void 0 : _b.type) === "checkbox" && ((_c = vue.unref(getProps)) == null ? void 0 : _c.isShowRowSelection) ? (vue.openBlock(), vue.createBlock(_component_vxe_column, {
+                ((_b = (_a2 = vue.unref(getProps)) == null ? void 0 : _a2.configRowSelection) == null ? void 0 : _b.type) === "checkbox" && ((_c = vue.unref(getProps)) == null ? void 0 : _c.isShowRowSelection) ? (vue.openBlock(), vue.createBlock(vue.unref(vxeTable.VxeColumn), {
                   key: 0,
                   type: "checkbox",
                   width: "60",
                   align: "center"
                 })) : vue.createCommentVNode("", true),
-                ((_e = (_d = vue.unref(getProps)) == null ? void 0 : _d.configRowSelection) == null ? void 0 : _e.type) === "radio" && ((_f = vue.unref(getProps)) == null ? void 0 : _f.isShowRowSelection) ? (vue.openBlock(), vue.createBlock(_component_vxe_column, {
+                ((_e = (_d = vue.unref(getProps)) == null ? void 0 : _d.configRowSelection) == null ? void 0 : _e.type) === "radio" && ((_f = vue.unref(getProps)) == null ? void 0 : _f.isShowRowSelection) ? (vue.openBlock(), vue.createBlock(vue.unref(vxeTable.VxeColumn), {
                   key: 1,
                   type: "radio",
                   width: "60",
                   align: "center"
                 })) : vue.createCommentVNode("", true),
-                vue.unref(getProps).isShowSeq ? (vue.openBlock(), vue.createBlock(_component_vxe_column, {
+                vue.unref(getProps).isShowSeq ? (vue.openBlock(), vue.createBlock(vue.unref(vxeTable.VxeColumn), {
                   key: 2,
                   type: "seq",
                   width: "60",
@@ -20327,7 +20335,7 @@ const _sfc_main = /* @__PURE__ */ vue.defineComponent({
                   title: "序号"
                 })) : vue.createCommentVNode("", true),
                 (vue.openBlock(true), vue.createElementBlock(vue.Fragment, null, vue.renderList(vue.unref(getColumns), (column, index2) => {
-                  return vue.openBlock(), vue.createBlock(_component_vxe_column, vue.mergeProps({ key: index2 }, column, {
+                  return vue.openBlock(), vue.createBlock(vue.unref(vxeTable.VxeColumn), vue.mergeProps({ key: index2 }, column, {
                     "edit-render": (column == null ? void 0 : column.editRender) || void 0
                   }), {
                     default: vue.withCtx((config) => [
@@ -20355,7 +20363,7 @@ const _sfc_main = /* @__PURE__ */ vue.defineComponent({
                     _: 2
                   }, 1040, ["edit-render"]);
                 }), 128)),
-                vue.unref(getProps).isShowAction ? (vue.openBlock(), vue.createBlock(_component_vxe_column, vue.mergeProps({
+                vue.unref(getProps).isShowAction ? (vue.openBlock(), vue.createBlock(vue.unref(vxeTable.VxeColumn), vue.mergeProps({
                   key: 3,
                   title: "操作",
                   field: "action",

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "3h1-ui",
-  "version": "2.1.18",
+  "version": "2.1.20",
   "description": "",
   "main": "lib/index.js",
   "module": "es/index.js",
@@ -31,8 +31,8 @@
     "vue-types": "^5.0.2",
     "vxe-table": "^4.3.6",
     "xe-utils": "^3.5.7",
-    "@shy-plugins/use": "1.0.3",
-    "@shy-plugins/utils": "1.0.14"
+    "@shy-plugins/utils": "1.0.14",
+    "@shy-plugins/use": "1.0.3"
   },
   "types": "es/ui/index.d.ts",
   "devDependencies": {