3h1-ui 2.1.33 → 2.1.35

package/es/index.js

@@ -20186,7 +20186,7 @@ const _sfc_main = /* @__PURE__ */ defineComponent({
       innerProps.value = props22;
     };
     const attrs = useAttrs$2();
-    const slots = useSlots();
+    useSlots();
     const getBindValues = computed(() => {
       return {
         ...basicProps,
@@ -20204,25 +20204,19 @@ const _sfc_main = /* @__PURE__ */ defineComponent({
       setPage({ current, pageSize });
       reload();
     };
-    const getLoading = computed(() => {
-      return false;
+    const getFormConfig = computed(() => {
+      console.log({ ...getProps.value.formConfig });
+      return {
+        ...getProps.value.formConfig,
+        showAdvancedButton: true
+      };
     });
-    const {
-      getFormProps,
-      replaceFormSlotKey,
-      getFormSlotKeys,
-      handleSearchInfoChange
-    } = useTableForm(getProps, slots, getProps.value.api, getLoading);
-    const getFormConfig = {
-      ...props2.formConfig,
-      showAdvancedButton: true,
-      submitButtonOptions: {
-        loading: false
-      },
-      compact: true
-    };
     const [registerForm, formActions] = useForm();
     const formSearch = ref({});
+    const handleSearchFormSubmit = (form) => {
+      formSearch.value = getProps.value.transSearchInfoBeforeReload(form);
+      reload();
+    };
     const params = computed(() => {
       return {
         ...getProps.value.searchInfo,
@@ -20284,20 +20278,13 @@ const _sfc_main = /* @__PURE__ */ defineComponent({
           key: 0,
           class: normalizeClass(getClassName("search"))
         }, [
-          createVNode(unref(BasicForm), mergeProps({ ref: "formRef" }, getFormConfig, {
-            submitOnReset: "",
-            onSubmit: unref(handleSearchInfoChange),
-            onReset: unref(handleSearchInfoChange)
-          }), createSlots({ _: 2 }, [
-            renderList(unref(getFormSlotKeys), (item) => {
-              return {
-                name: unref(replaceFormSlotKey)(item),
-                fn: withCtx((data) => [
-                  renderSlot(_ctx.$slots, item, normalizeProps(guardReactiveProps(data || {})))
-                ])
-              };
+          createVNode(unref(BasicForm), mergeProps(unref(getFormConfig), {
+            onRegister: unref(registerForm),
+            onSubmit: handleSearchFormSubmit,
+            onReset: handleSearchFormSubmit,
+            onAdvancedChange: _cache[0] || (_cache[0] = () => {
             })
-          ]), 1040, ["onSubmit", "onReset"])
+          }), null, 16, ["onRegister"])
         ], 2)) : createCommentVNode("", true),
         unref(getProps).isShowToolbar ? (openBlock(), createElementBlock("div", {
           key: 1,
@@ -20408,9 +20395,9 @@ const _sfc_main = /* @__PURE__ */ defineComponent({
             size: "small",
             total: unref(page).total,
             current: unref(page).current,
-            "onUpdate:current": _cache[0] || (_cache[0] = ($event) => unref(page).current = $event),
+            "onUpdate:current": _cache[1] || (_cache[1] = ($event) => unref(page).current = $event),
             "page-size": unref(page).pageSize,
-            "onUpdate:page-size": _cache[1] || (_cache[1] = ($event) => unref(page).pageSize = $event),
+            "onUpdate:page-size": _cache[2] || (_cache[2] = ($event) => unref(page).pageSize = $event),
             pageSizeOptions: unref(page).pageSizeOptions,
             "show-size-changer": "",
             "show-quick-jumper": "",

package/index.ts

@@ -0,0 +1,27 @@
+import 'virtual:windi-base.css'
+import 'virtual:windi-components.css'
+import 'virtual:windi-utilities.css'
+import 'ant-design-vue/dist/antd.min.css'
+
+export * from './src/Form'
+export * from './src/Container'
+export * from './src/Table'
+export * from './src/Modal'
+export * from './src/Page'
+export * from './src/Description'
+export * from './src/Scrollbar'
+// export * from './src/FlowChart'
+export * from './src/Dropdown'
+export * from './src/Drawer'
+export * from './src/Cropper'
+export * from './src/CountTo'
+export * from './src/CountDown'
+export * from './src/Container'
+export * from './src/ClickOutSide'
+export * from './src/Button'
+export * from './src/Basic'
+export * from './src/Tree'
+export * from './src/Icon'
+export * from './src/Loading'
+export * from './src/StrengthMeter'
+export * from './src/TablePlus'

package/lib/index.js

@@ -20188,7 +20188,7 @@ const _sfc_main = /* @__PURE__ */ vue.defineComponent({
       innerProps.value = props22;
     };
     const attrs = vue.useAttrs();
-    const slots = vue.useSlots();
+    vue.useSlots();
     const getBindValues = vue.computed(() => {
       return {
         ...basicProps,
@@ -20206,25 +20206,19 @@ const _sfc_main = /* @__PURE__ */ vue.defineComponent({
       setPage({ current, pageSize });
       reload();
     };
-    const getLoading = vue.computed(() => {
-      return false;
+    const getFormConfig = vue.computed(() => {
+      console.log({ ...getProps.value.formConfig });
+      return {
+        ...getProps.value.formConfig,
+        showAdvancedButton: true
+      };
     });
-    const {
-      getFormProps,
-      replaceFormSlotKey,
-      getFormSlotKeys,
-      handleSearchInfoChange
-    } = useTableForm(getProps, slots, getProps.value.api, getLoading);
-    const getFormConfig = {
-      ...props2.formConfig,
-      showAdvancedButton: true,
-      submitButtonOptions: {
-        loading: false
-      },
-      compact: true
-    };
     const [registerForm, formActions] = useForm();
     const formSearch = vue.ref({});
+    const handleSearchFormSubmit = (form) => {
+      formSearch.value = getProps.value.transSearchInfoBeforeReload(form);
+      reload();
+    };
     const params = vue.computed(() => {
       return {
         ...getProps.value.searchInfo,
@@ -20286,20 +20280,13 @@ const _sfc_main = /* @__PURE__ */ vue.defineComponent({
           key: 0,
           class: vue.normalizeClass(getClassName("search"))
         }, [
-          vue.createVNode(vue.unref(BasicForm), vue.mergeProps({ ref: "formRef" }, getFormConfig, {
-            submitOnReset: "",
-            onSubmit: vue.unref(handleSearchInfoChange),
-            onReset: vue.unref(handleSearchInfoChange)
-          }), vue.createSlots({ _: 2 }, [
-            vue.renderList(vue.unref(getFormSlotKeys), (item) => {
-              return {
-                name: vue.unref(replaceFormSlotKey)(item),
-                fn: vue.withCtx((data) => [
-                  vue.renderSlot(_ctx.$slots, item, vue.normalizeProps(vue.guardReactiveProps(data || {})))
-                ])
-              };
+          vue.createVNode(vue.unref(BasicForm), vue.mergeProps(vue.unref(getFormConfig), {
+            onRegister: vue.unref(registerForm),
+            onSubmit: handleSearchFormSubmit,
+            onReset: handleSearchFormSubmit,
+            onAdvancedChange: _cache[0] || (_cache[0] = () => {
             })
-          ]), 1040, ["onSubmit", "onReset"])
+          }), null, 16, ["onRegister"])
         ], 2)) : vue.createCommentVNode("", true),
         vue.unref(getProps).isShowToolbar ? (vue.openBlock(), vue.createElementBlock("div", {
           key: 1,
@@ -20410,9 +20397,9 @@ const _sfc_main = /* @__PURE__ */ vue.defineComponent({
             size: "small",
             total: vue.unref(page).total,
             current: vue.unref(page).current,
-            "onUpdate:current": _cache[0] || (_cache[0] = ($event) => vue.unref(page).current = $event),
+            "onUpdate:current": _cache[1] || (_cache[1] = ($event) => vue.unref(page).current = $event),
             "page-size": vue.unref(page).pageSize,
-            "onUpdate:page-size": _cache[1] || (_cache[1] = ($event) => vue.unref(page).pageSize = $event),
+            "onUpdate:page-size": _cache[2] || (_cache[2] = ($event) => vue.unref(page).pageSize = $event),
             pageSizeOptions: vue.unref(page).pageSizeOptions,
             "show-size-changer": "",
             "show-quick-jumper": "",

package/package.json

@@ -1,9 +1,8 @@
 {
   "name": "3h1-ui",
-  "version": "2.1.33",
+  "version": "2.1.35",
   "description": "",
-  "main": "lib/index.js",
-  "module": "es/index.js",
+  "main": "index.ts",
   "files": [
     "es",
     "lib"
@@ -31,8 +30,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": {