From e84c4051f36ba6e156e92cd283fe298a7008f41c Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E9=9B=AA=E5=BF=86?= <1455668754@qq.com>
Date: Mon, 3 Jun 2024 17:33:50 +0800
Subject: [PATCH 1/4] =?UTF-8?q?fix:=20destroy=E6=96=B9=E6=B3=95=E5=91=BD?=
 =?UTF-8?q?=E5=90=8D=E4=BF=AE=E6=AD=A3?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/components/Loading/src/createLoading.ts | 6 +++---
 src/components/Loading/src/useLoading.ts    | 4 ++--
 src/directives/loading.ts                   | 4 ++--
 3 files changed, 7 insertions(+), 7 deletions(-)

diff --git a/src/components/Loading/src/createLoading.ts b/src/components/Loading/src/createLoading.ts
index d7819df7..8c885418 100644
--- a/src/components/Loading/src/createLoading.ts
+++ b/src/components/Loading/src/createLoading.ts
@@ -1,4 +1,4 @@
-import { VNode, defineComponent, createVNode, render, reactive, h } from 'vue';
+import { createVNode, defineComponent, h, reactive, render, VNode } from 'vue';
 import type { LoadingProps } from './typing';
 
 import Loading from './Loading.vue';
@@ -41,7 +41,7 @@ export function createLoading(props?: Partial<LoadingProps>, target?: HTMLElemen
     target.appendChild(vm.el as HTMLElement);
   }
 
-  function destory() {
+  function destroy() {
     container && render(null, container);
     container = vm = null;
   }
@@ -53,7 +53,7 @@ export function createLoading(props?: Partial<LoadingProps>, target?: HTMLElemen
     vm,
     close,
     open,
-    destory,
+    destroy,
     setTip: (tip: string) => {
       data.tip = tip;
     },
diff --git a/src/components/Loading/src/useLoading.ts b/src/components/Loading/src/useLoading.ts
index 910e084e..97e7c718 100644
--- a/src/components/Loading/src/useLoading.ts
+++ b/src/components/Loading/src/useLoading.ts
@@ -1,5 +1,5 @@
-import { unref } from 'vue';
 import type { Ref } from 'vue';
+import { unref } from 'vue';
 import { tryOnUnmounted } from '@vueuse/core';
 import { createLoading } from './createLoading';
 import type { LoadingProps } from './typing';
@@ -47,7 +47,7 @@ export function useLoading(
   };
 
   tryOnUnmounted(() => {
-    instance.destory();
+    instance.destroy();
   });
 
   return [open, close, setTip];
diff --git a/src/directives/loading.ts b/src/directives/loading.ts
index 242816b5..ead64927 100644
--- a/src/directives/loading.ts
+++ b/src/directives/loading.ts
@@ -1,5 +1,5 @@
 import { createLoading } from '@/components/Loading';
-import type { Directive, App } from 'vue';
+import type { App, Directive } from 'vue';
 
 const loadingDirective: Directive = {
   mounted(el, binding) {
@@ -28,7 +28,7 @@ const loadingDirective: Directive = {
     }
   },
   unmounted(el) {
-    el?.instance?.destory();
+    el?.instance?.destroy();
   },
 };
 

From 95abe061072b79dca9cbba405ebc1f2f66ca6bec Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E9=9B=AA=E5=BF=86?= <1455668754@qq.com>
Date: Mon, 29 Jul 2024 15:11:06 +0800
Subject: [PATCH 2/4] =?UTF-8?q?fix:=20Echarts=E5=88=9D=E5=A7=8B=E5=AE=BD?=
 =?UTF-8?q?=E5=BA=A6=E7=9B=91=E5=90=AC=E4=BF=AE=E5=A4=8D?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/hooks/web/useECharts.ts | 8 ++++++--
 1 file changed, 6 insertions(+), 2 deletions(-)

diff --git a/src/hooks/web/useECharts.ts b/src/hooks/web/useECharts.ts
index c5478d79..6eac15f9 100644
--- a/src/hooks/web/useECharts.ts
+++ b/src/hooks/web/useECharts.ts
@@ -1,8 +1,8 @@
 import type { EChartsOption } from 'echarts';
 import type { Ref } from 'vue';
+import { computed, nextTick, ref, unref, watch } from 'vue';
 import { useTimeoutFn } from '@vben/hooks';
 import { tryOnUnmounted, useDebounceFn } from '@vueuse/core';
-import { unref, nextTick, watch, computed, ref } from 'vue';
 import { useEventListener } from '@/hooks/event/useEventListener';
 import { useBreakpoint } from '@/hooks/event/useBreakpoint';
 import echarts from '@/utils/lib/echarts';
@@ -49,6 +49,10 @@ export function useECharts(
       listener: resizeFn,
     });
     removeResizeFn = removeEvent;
+
+    const resizeObserver = new ResizeObserver(resizeFn);
+    resizeObserver.observe(el);
+
     const { widthRef, screenEnum } = useBreakpoint();
     if (unref(widthRef) <= screenEnum.MD || el.offsetHeight === 0) {
       useTimeoutFn(() => {
@@ -64,7 +68,7 @@ export function useECharts(
         useTimeoutFn(() => {
           setOptions(unref(getOptions));
           resolve(null);
-        }, 30);
+        }, 50);
       }
       nextTick(() => {
         useTimeoutFn(() => {

From 56c5dce99f8285f3ca13d18e6c8bd139d27313ca Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E9=9B=AA=E5=BF=86?= <1455668754@qq.com>
Date: Mon, 29 Jul 2024 15:14:07 +0800
Subject: [PATCH 3/4] =?UTF-8?q?feat:=20ApiSelect=E5=A2=9E=E5=8A=A0?=
 =?UTF-8?q?=E8=BF=9C=E7=A8=8B=E6=90=9C=E7=B4=A2=E5=8A=9F=E8=83=BD?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../Form/src/components/ApiSelect.vue         | 68 +++++++++++++++++--
 1 file changed, 62 insertions(+), 6 deletions(-)

diff --git a/src/components/Form/src/components/ApiSelect.vue b/src/components/Form/src/components/ApiSelect.vue
index df59336d..8a444e15 100644
--- a/src/components/Form/src/components/ApiSelect.vue
+++ b/src/components/Form/src/components/ApiSelect.vue
@@ -3,6 +3,7 @@
     @dropdown-visible-change="handleFetch"
     v-bind="$attrs"
     @change="handleChange"
+    @search="debounceSearchFn"
     :options="getOptions"
     v-model:value="state"
   >
@@ -20,26 +21,37 @@
     </template>
   </Select>
 </template>
+
 <script lang="ts" setup>
-  import { PropType, ref, computed, unref, watch } from 'vue';
+  import { computed, PropType, ref, unref, watch } from 'vue';
   import { Select } from 'ant-design-vue';
   import type { SelectValue } from 'ant-design-vue/es/select';
-  import { isFunction } from '@/utils/is';
+  import { isEmpty, isFunction } from '@/utils/is';
   import { useRuleFormItem } from '@/hooks/component/useFormItem';
-  import { get, omit, isEqual } from 'lodash-es';
+  import { assignIn, get, isEqual, omit } from 'lodash-es';
   import { LoadingOutlined } from '@ant-design/icons-vue';
   import { useI18n } from '@/hooks/web/useI18n';
   import { propTypes } from '@/utils/propTypes';
+  import { useDebounceFn } from '@vueuse/core';
 
   type OptionsItem = { label?: string; value?: string; disabled?: boolean; [name: string]: any };
 
+  type ApiSearchOption = {
+    // 待搜索字段名
+    searchName?: string;
+    // 搜索前置方法
+    beforeFetch?: (value?: string) => Promise<string>;
+    // 拦截方法
+    interceptFetch?: (value?: string) => Promise<boolean>;
+  };
+
   defineOptions({ name: 'ApiSelect', inheritAttrs: false });
 
   const props = defineProps({
     value: { type: [Array, Object, String, Number] as PropType<SelectValue> },
     numberToString: propTypes.bool,
     api: {
-      type: Function as PropType<(arg?: any) => Promise<OptionsItem[] | Recordable<any>>>,
+      type: Function as PropType<(arg?: any) => Promise<OptionsItem[] | Recordable>>,
       default: null,
     },
     // api params
@@ -54,6 +66,10 @@
       type: Array<OptionsItem>,
       default: [],
     },
+    apiSearch: {
+      type: Object as PropType<ApiSearchOption>,
+      default: () => null,
+    },
     beforeFetch: {
       type: Function as PropType<Fn>,
       default: null,
@@ -72,6 +88,7 @@
   // 首次是否加载过了
   const isFirstLoaded = ref(false);
   const emitData = ref<OptionsItem[]>([]);
+  const searchParams = ref<any>({});
   const { t } = useI18n();
 
   // Embedded in the form, just use the hook binding to perform form verification
@@ -110,16 +127,29 @@
     { deep: true, immediate: props.immediate },
   );
 
+  watch(
+    () => searchParams.value,
+    (value, oldValue) => {
+      if (isEmpty(value) || isEqual(value, oldValue)) return;
+      (async () => {
+        await fetch();
+        searchParams.value = {};
+      })();
+    },
+    { deep: true, immediate: props.immediate },
+  );
+
   async function fetch() {
     let { api, beforeFetch, afterFetch, params, resultField } = props;
     if (!api || !isFunction(api) || loading.value) return;
     optionsRef.value = [];
     try {
       loading.value = true;
+      let apiParams = assignIn({}, params, searchParams.value);
       if (beforeFetch && isFunction(beforeFetch)) {
-        params = (await beforeFetch(params)) || params;
+        apiParams = (await beforeFetch(apiParams)) || apiParams;
       }
-      let res = await api(params);
+      let res = await api(apiParams);
       if (afterFetch && isFunction(afterFetch)) {
         res = (await afterFetch(res)) || res;
       }
@@ -152,6 +182,32 @@
     }
   }
 
+  let debounceSearchFn = useDebounceFn(handleSearch, 500);
+
+  async function handleSearch(value: any) {
+    if (!props.apiSearch) {
+      return;
+    }
+    const { searchName, beforeFetch, interceptFetch } = props.apiSearch;
+    if (!searchName) {
+      return;
+    }
+
+    value = value || undefined;
+    if (beforeFetch && isFunction(beforeFetch)) {
+      value = (await beforeFetch(value)) || value;
+    }
+
+    if (interceptFetch && isFunction(interceptFetch)) {
+      if (!(await interceptFetch(value))) {
+        return;
+      }
+    }
+    searchParams.value = {
+      [searchName]: value,
+    };
+  }
+
   function emitChange() {
     emit('options-change', unref(getOptions));
   }

From f314826230d5c584edd95ac6f7905f454f311e2e Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E9=9B=AA=E5=BF=86?= <1455668754@qq.com>
Date: Mon, 29 Jul 2024 15:18:30 +0800
Subject: [PATCH 4/4] =?UTF-8?q?Revert=20"feat:=20ApiSelect=E5=A2=9E?=
 =?UTF-8?q?=E5=8A=A0=E8=BF=9C=E7=A8=8B=E6=90=9C=E7=B4=A2=E5=8A=9F=E8=83=BD?=
 =?UTF-8?q?"?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

This reverts commit 56c5dce99f8285f3ca13d18e6c8bd139d27313ca.
---
 .../Form/src/components/ApiSelect.vue         | 68 ++-----------------
 1 file changed, 6 insertions(+), 62 deletions(-)

diff --git a/src/components/Form/src/components/ApiSelect.vue b/src/components/Form/src/components/ApiSelect.vue
index 8a444e15..df59336d 100644
--- a/src/components/Form/src/components/ApiSelect.vue
+++ b/src/components/Form/src/components/ApiSelect.vue
@@ -3,7 +3,6 @@
     @dropdown-visible-change="handleFetch"
     v-bind="$attrs"
     @change="handleChange"
-    @search="debounceSearchFn"
     :options="getOptions"
     v-model:value="state"
   >
@@ -21,37 +20,26 @@
     </template>
   </Select>
 </template>
-
 <script lang="ts" setup>
-  import { computed, PropType, ref, unref, watch } from 'vue';
+  import { PropType, ref, computed, unref, watch } from 'vue';
   import { Select } from 'ant-design-vue';
   import type { SelectValue } from 'ant-design-vue/es/select';
-  import { isEmpty, isFunction } from '@/utils/is';
+  import { isFunction } from '@/utils/is';
   import { useRuleFormItem } from '@/hooks/component/useFormItem';
-  import { assignIn, get, isEqual, omit } from 'lodash-es';
+  import { get, omit, isEqual } from 'lodash-es';
   import { LoadingOutlined } from '@ant-design/icons-vue';
   import { useI18n } from '@/hooks/web/useI18n';
   import { propTypes } from '@/utils/propTypes';
-  import { useDebounceFn } from '@vueuse/core';
 
   type OptionsItem = { label?: string; value?: string; disabled?: boolean; [name: string]: any };
 
-  type ApiSearchOption = {
-    // 待搜索字段名
-    searchName?: string;
-    // 搜索前置方法
-    beforeFetch?: (value?: string) => Promise<string>;
-    // 拦截方法
-    interceptFetch?: (value?: string) => Promise<boolean>;
-  };
-
   defineOptions({ name: 'ApiSelect', inheritAttrs: false });
 
   const props = defineProps({
     value: { type: [Array, Object, String, Number] as PropType<SelectValue> },
     numberToString: propTypes.bool,
     api: {
-      type: Function as PropType<(arg?: any) => Promise<OptionsItem[] | Recordable>>,
+      type: Function as PropType<(arg?: any) => Promise<OptionsItem[] | Recordable<any>>>,
       default: null,
     },
     // api params
@@ -66,10 +54,6 @@
       type: Array<OptionsItem>,
       default: [],
     },
-    apiSearch: {
-      type: Object as PropType<ApiSearchOption>,
-      default: () => null,
-    },
     beforeFetch: {
       type: Function as PropType<Fn>,
       default: null,
@@ -88,7 +72,6 @@
   // 首次是否加载过了
   const isFirstLoaded = ref(false);
   const emitData = ref<OptionsItem[]>([]);
-  const searchParams = ref<any>({});
   const { t } = useI18n();
 
   // Embedded in the form, just use the hook binding to perform form verification
@@ -127,29 +110,16 @@
     { deep: true, immediate: props.immediate },
   );
 
-  watch(
-    () => searchParams.value,
-    (value, oldValue) => {
-      if (isEmpty(value) || isEqual(value, oldValue)) return;
-      (async () => {
-        await fetch();
-        searchParams.value = {};
-      })();
-    },
-    { deep: true, immediate: props.immediate },
-  );
-
   async function fetch() {
     let { api, beforeFetch, afterFetch, params, resultField } = props;
     if (!api || !isFunction(api) || loading.value) return;
     optionsRef.value = [];
     try {
       loading.value = true;
-      let apiParams = assignIn({}, params, searchParams.value);
       if (beforeFetch && isFunction(beforeFetch)) {
-        apiParams = (await beforeFetch(apiParams)) || apiParams;
+        params = (await beforeFetch(params)) || params;
       }
-      let res = await api(apiParams);
+      let res = await api(params);
       if (afterFetch && isFunction(afterFetch)) {
         res = (await afterFetch(res)) || res;
       }
@@ -182,32 +152,6 @@
     }
   }
 
-  let debounceSearchFn = useDebounceFn(handleSearch, 500);
-
-  async function handleSearch(value: any) {
-    if (!props.apiSearch) {
-      return;
-    }
-    const { searchName, beforeFetch, interceptFetch } = props.apiSearch;
-    if (!searchName) {
-      return;
-    }
-
-    value = value || undefined;
-    if (beforeFetch && isFunction(beforeFetch)) {
-      value = (await beforeFetch(value)) || value;
-    }
-
-    if (interceptFetch && isFunction(interceptFetch)) {
-      if (!(await interceptFetch(value))) {
-        return;
-      }
-    }
-    searchParams.value = {
-      [searchName]: value,
-    };
-  }
-
   function emitChange() {
     emit('options-change', unref(getOptions));
   }