cnhis-design-vue 3.1.18-beta.5 → 3.1.18-beta.8

package/es/components/form-render/src/components/renderer/select.js

@@ -1,12 +1,12 @@
 import { defineComponent, computed, ref, inject, nextTick, watch, createVNode } from 'vue';
 import { isField } from '@formily/core';
 import { cloneDeep, isEqual, isString } from 'lodash-es';
-import { useCommonInjection } from '../../hooks/useCommonInjection.js';
-import { InjectAsyncQueue, InjectionChangeContextCollector, InjectionFormItemDepsCollector } from '../../constants/index.js';
+import { useCommonInjection } from '../../hooks/useCommonInjection2.js';
+import { InjectAsyncQueue, InjectionChangeContextCollector, InjectionFormItemDepsCollector } from '../../constants/index2.js';
 import '@vueuse/core';
-import '../../../index.js';
+import '../../../index2.js';
 import { formRenderLog } from '../../utils/index.js';
-import { useFormField } from '../../hooks/useFormField.js';
+import { useFormField } from '../../hooks/useFormField2.js';
 import '../../../../../shared/utils/tapable/SyncHook.js';
 import '../../../../../shared/utils/tapable/SyncBailHook.js';
 import '../../../../../shared/utils/tapable/SyncWaterfallHook.js';
@@ -24,7 +24,7 @@ import './formItem.js';
 import './textarea.js';
 import './inputNumber.js';
 import './linebar.js';
-import './inputGroup.js';
+import './inputGroup2.js';
 import './date.js';
 import './cascader.js';
 import './jsonCombination/index.js';
@@ -37,7 +37,7 @@ import './slider.js';
 import './complex.js';
 import './simpleComponent.js';
 import { NSelect } from 'naive-ui';
-import { assignUpdateValue, assignValueBindKey, traverseDependKey } from '../../utils/schema.js';
+import { assignUpdateValue, traverseDependKey } from '../../utils/schema2.js';
 
 const script = defineComponent({
   name: "FormSelect",
@@ -97,7 +97,7 @@ const script = defineComponent({
       } catch (e) {
         isString(e) && formRenderLog(e, "warn");
       }
-      async function createParams(config, field2, key) {
+      async function createParams(config, field2, key2) {
         const _params = {};
         try {
           traverseDependKey(config.dependKey, (dependKey, valueKey2, required) => {
@@ -115,7 +115,7 @@ const script = defineComponent({
         return {
           ...config,
           params: Object.assign({}, config.params, _params),
-          key
+          key: key2
         };
       }
       function configFor(target) {
@@ -162,10 +162,12 @@ const script = defineComponent({
     });
     const {
       injectValueValidate,
-      injectValueWatchFromEmpty
+      injectValueWatchFromEmpty,
+      injectValueBindKey
     } = useCommonInjection();
     injectValueWatchFromEmpty(valueRef, fetchData);
     injectValueValidate(valueRef);
+    const key = injectValueBindKey(valueRef);
     function focusDecorator(onFocus) {
       return (...args) => {
         if (isField(field.value)) {
@@ -175,6 +177,7 @@ const script = defineComponent({
       };
     }
     return () => createVNode(NSelect, {
+      "key": key.value,
       "remote": true,
       "filterable": true,
       "value": valueRef.value,
@@ -190,6 +193,6 @@ const script = defineComponent({
 });
 const SELECT = connect(script, mapProps({
   dataSource: "options"
-}, assignUpdateValue, assignValueBindKey));
+}, assignUpdateValue));
 
 export { SELECT };

package/es/components/form-render/src/components/renderer/slider.js

@@ -2,7 +2,7 @@ import { defineComponent, computed, createVNode } from 'vue';
 import { connect, mapProps } from '@formily/vue';
 import { NSlider } from 'naive-ui';
 import { parseNumberFromMaybeString } from '../../utils/index.js';
-import { assignUpdateValue, assignValueBindKey } from '../../utils/schema.js';
+import { assignUpdateValue, assignValueBindKey } from '../../utils/schema2.js';
 
 const script = defineComponent({
   props: {

package/es/components/form-render/src/components/renderer/switch.js

@@ -4,7 +4,7 @@ import '@formily/path';
 import '@vue/shared';
 import 'lodash-es';
 import 'date-fns';
-import { assignUpdateValue, assignValueBindKey } from '../../utils/schema.js';
+import { assignUpdateValue, assignValueBindKey } from '../../utils/schema2.js';
 import { connect, mapProps } from '@formily/vue';
 
 const script = defineComponent({

package/es/components/form-render/src/components/renderer/textarea.js

@@ -1,10 +1,10 @@
 import { defineComponent, computed, createVNode } from 'vue';
-import { useCommonInjection } from '../../hooks/useCommonInjection.js';
+import { useCommonInjection } from '../../hooks/useCommonInjection2.js';
 import '@formily/path';
 import '@vue/shared';
 import 'lodash-es';
 import 'date-fns';
-import { assignUpdateValue } from '../../utils/schema.js';
+import { assignUpdateValue } from '../../utils/schema2.js';
 import { connect, mapProps } from '@formily/vue';
 import { NInput } from 'naive-ui';
 

package/es/components/form-render/src/constants/index.js

@@ -1,41 +1 @@
-const InjectAsyncQueue = Symbol("InjectAsyncQueue");
-const InjectionSchemaField = Symbol("InjectionSchemaField");
-const InjectionBusinessCollector = Symbol("InjectionBusinessCollector");
-const InjectionChangeContextCollector = Symbol("InjectionChangeContextCollector");
-const InjectionFormItemDepsCollector = Symbol("InjectionFormItemDepsCollector");
-const InjectionFormUUID = Symbol("InjectionFormUUID");
-const InjectionAnnotation = Symbol("InjectionAnnotation");
-const FormItemLineBarDepKeyPrepend = "__dep_LINEBAR_";
-var FIELD_BUSINESS_TYPE = /* @__PURE__ */ ((FIELD_BUSINESS_TYPE2) => {
-  FIELD_BUSINESS_TYPE2["PASSWORD"] = "password";
-  FIELD_BUSINESS_TYPE2["ID_CARD"] = "id_card";
-  FIELD_BUSINESS_TYPE2["AGE"] = "age";
-  FIELD_BUSINESS_TYPE2["AGE_UNIT"] = "age_unit";
-  FIELD_BUSINESS_TYPE2["MOBILE"] = "mobile";
-  FIELD_BUSINESS_TYPE2["TELEPHONE"] = "telephone";
-  FIELD_BUSINESS_TYPE2["EMAIL"] = "email";
-  FIELD_BUSINESS_TYPE2["SEX"] = "sex";
-  FIELD_BUSINESS_TYPE2["BIRTHDAY"] = "birthday";
-  FIELD_BUSINESS_TYPE2["BANK_CARD"] = "bank_card";
-  FIELD_BUSINESS_TYPE2["WEBSITE"] = "website";
-  FIELD_BUSINESS_TYPE2["GESTATIONAL_WEEKS"] = "gestational_weeks";
-  FIELD_BUSINESS_TYPE2["GESTATIONAL_STAGE"] = "gestational_stage";
-  FIELD_BUSINESS_TYPE2["CUSTOMER_NAME"] = "customer_name";
-  return FIELD_BUSINESS_TYPE2;
-})(FIELD_BUSINESS_TYPE || {});
-var FIELD_SEX_VALUE = /* @__PURE__ */ ((FIELD_SEX_VALUE2) => {
-  FIELD_SEX_VALUE2["MALE"] = "1";
-  FIELD_SEX_VALUE2["FEMALE"] = "2";
-  return FIELD_SEX_VALUE2;
-})(FIELD_SEX_VALUE || {});
-var FIELD_AGE_UNIT = /* @__PURE__ */ ((FIELD_AGE_UNIT2) => {
-  FIELD_AGE_UNIT2["DAY"] = "D";
-  FIELD_AGE_UNIT2["MONTH"] = "M";
-  FIELD_AGE_UNIT2["YEAR"] = "Y";
-  FIELD_AGE_UNIT2["HOUR"] = "H";
-  FIELD_AGE_UNIT2["WEEK"] = "W";
-  FIELD_AGE_UNIT2["MINUTE"] = "N";
-  return FIELD_AGE_UNIT2;
-})(FIELD_AGE_UNIT || {});
-
-export { FIELD_AGE_UNIT, FIELD_BUSINESS_TYPE, FIELD_SEX_VALUE, FormItemLineBarDepKeyPrepend, InjectAsyncQueue, InjectionAnnotation, InjectionBusinessCollector, InjectionChangeContextCollector, InjectionFormItemDepsCollector, InjectionFormUUID, InjectionSchemaField };
+export { FIELD_AGE_UNIT, FIELD_BUSINESS_TYPE, FIELD_SEX_VALUE, FormItemLineBarDepKeyPrepend, InjectAsyncQueue, InjectionAnnotation, InjectionBusinessCollector, InjectionChangeContextCollector, InjectionFormItemDepsCollector, InjectionFormUUID, InjectionSchemaField } from './index2.js';

package/es/components/form-render/src/constants/index2.js

@@ -0,0 +1,41 @@
+const InjectAsyncQueue = Symbol("InjectAsyncQueue");
+const InjectionSchemaField = Symbol("InjectionSchemaField");
+const InjectionBusinessCollector = Symbol("InjectionBusinessCollector");
+const InjectionChangeContextCollector = Symbol("InjectionChangeContextCollector");
+const InjectionFormItemDepsCollector = Symbol("InjectionFormItemDepsCollector");
+const InjectionFormUUID = Symbol("InjectionFormUUID");
+const InjectionAnnotation = Symbol("InjectionAnnotation");
+const FormItemLineBarDepKeyPrepend = "__dep_LINEBAR_";
+var FIELD_BUSINESS_TYPE = /* @__PURE__ */ ((FIELD_BUSINESS_TYPE2) => {
+  FIELD_BUSINESS_TYPE2["PASSWORD"] = "password";
+  FIELD_BUSINESS_TYPE2["ID_CARD"] = "id_card";
+  FIELD_BUSINESS_TYPE2["AGE"] = "age";
+  FIELD_BUSINESS_TYPE2["AGE_UNIT"] = "age_unit";
+  FIELD_BUSINESS_TYPE2["MOBILE"] = "mobile";
+  FIELD_BUSINESS_TYPE2["TELEPHONE"] = "telephone";
+  FIELD_BUSINESS_TYPE2["EMAIL"] = "email";
+  FIELD_BUSINESS_TYPE2["SEX"] = "sex";
+  FIELD_BUSINESS_TYPE2["BIRTHDAY"] = "birthday";
+  FIELD_BUSINESS_TYPE2["BANK_CARD"] = "bank_card";
+  FIELD_BUSINESS_TYPE2["WEBSITE"] = "website";
+  FIELD_BUSINESS_TYPE2["GESTATIONAL_WEEKS"] = "gestational_weeks";
+  FIELD_BUSINESS_TYPE2["GESTATIONAL_STAGE"] = "gestational_stage";
+  FIELD_BUSINESS_TYPE2["CUSTOMER_NAME"] = "customer_name";
+  return FIELD_BUSINESS_TYPE2;
+})(FIELD_BUSINESS_TYPE || {});
+var FIELD_SEX_VALUE = /* @__PURE__ */ ((FIELD_SEX_VALUE2) => {
+  FIELD_SEX_VALUE2["MALE"] = "1";
+  FIELD_SEX_VALUE2["FEMALE"] = "2";
+  return FIELD_SEX_VALUE2;
+})(FIELD_SEX_VALUE || {});
+var FIELD_AGE_UNIT = /* @__PURE__ */ ((FIELD_AGE_UNIT2) => {
+  FIELD_AGE_UNIT2["DAY"] = "D";
+  FIELD_AGE_UNIT2["MONTH"] = "M";
+  FIELD_AGE_UNIT2["YEAR"] = "Y";
+  FIELD_AGE_UNIT2["HOUR"] = "H";
+  FIELD_AGE_UNIT2["WEEK"] = "W";
+  FIELD_AGE_UNIT2["MINUTE"] = "N";
+  return FIELD_AGE_UNIT2;
+})(FIELD_AGE_UNIT || {});
+
+export { FIELD_AGE_UNIT, FIELD_BUSINESS_TYPE, FIELD_SEX_VALUE, FormItemLineBarDepKeyPrepend, InjectAsyncQueue, InjectionAnnotation, InjectionBusinessCollector, InjectionChangeContextCollector, InjectionFormItemDepsCollector, InjectionFormUUID, InjectionSchemaField };

package/es/components/form-render/src/hooks/index.js

@@ -1,13 +1,13 @@
-export { useFieldListAdaptor } from './useFieldListAdaptor.js';
-export { useFormRequest } from './useFormRequest.js';
-export { useCommonLog } from './useCommonLog.js';
-export { useFormField } from './useFormField.js';
-export { AsyncQueue, useAsyncQueue } from './useAsyncQueue.js';
-export { useFieldVisitor } from './useFieldVisitor.js';
-export { useFieldNormalize } from './useFieldNormalize.js';
-export { useFormValidator } from './useFormValidator.js';
-export { BusinessCollector, useBusinessBinding } from './useBusinessBinding.js';
-export { ContextCollector, useChangeContext } from './useChangeContext.js';
-export { FormItemDepsCollector, useFormItemDeps } from './useFormItemDeps.js';
-export { useAnchor } from './useAnchor.js';
-export { useFormContext } from './useFormContext.js';
+export { useFieldListAdaptor } from './useFieldListAdaptor2.js';
+export { useFormRequest } from './useFormRequest2.js';
+export { useCommonLog } from './useCommonLog2.js';
+export { useFormField } from './useFormField2.js';
+export { AsyncQueue, useAsyncQueue } from './useAsyncQueue2.js';
+export { useFieldVisitor } from './useFieldVisitor2.js';
+export { useFieldNormalize } from './useFieldNormalize2.js';
+export { useFormValidator } from './useFormValidator2.js';
+export { BusinessCollector, useBusinessBinding } from './useBusinessBinding2.js';
+export { ContextCollector, useChangeContext } from './useChangeContext2.js';
+export { FormItemDepsCollector, useFormItemDeps } from './useFormItemDeps2.js';
+export { useAnchor } from './useAnchor2.js';
+export { useFormContext } from './useFormContext2.js';

package/es/components/form-render/src/hooks/useAnchor.js

@@ -1,90 +1 @@
-import { doAnimation } from '../../../../shared/utils/anime.js';
-import { useDebounceFn } from '@vueuse/core';
-import { isNumber } from 'lodash-es';
-import { ref, computed, watch, nextTick } from 'vue';
-import { FormItemLineBarDepKeyPrepend } from '../constants/index.js';
-import '@formily/path';
-import '@vue/shared';
-import 'date-fns';
-import { createLinebarId, traverseSchema } from '../utils/schema.js';
-
-function useAnchor(props, scrollbarRef, collector) {
-  const __currentAnchor = ref("");
-  const formHeight = computed(() => {
-    if (isNumber(props.maxHeight))
-      return props.maxHeight + "px";
-    return props.maxHeight;
-  });
-  const anchorIdList = ref([]);
-  function generateAnchorList(schema) {
-    anchorIdList.value.length = 0;
-    traverseSchema(schema, (_schema) => {
-      var _a;
-      if (_schema["x-component"] === "LINEBAR") {
-        anchorIdList.value.push({ title: _schema.title, name: ((_a = _schema.name) == null ? void 0 : _a.toString()) || "" });
-      }
-    });
-  }
-  let scrollLock = false;
-  async function scrollTo(id) {
-    scrollLock = true;
-    try {
-      if (!scrollbarRef.value)
-        return;
-      collector.trigger(FormItemLineBarDepKeyPrepend + id, true);
-      await nextTick();
-      const targetAnchor = scrollbarRef.value.querySelector(`#${createLinebarId(id)}`);
-      if (!targetAnchor)
-        return;
-      await new Promise((resolve) => {
-        doAnimation(scrollbarRef.value.scrollTop, targetAnchor.offsetTop, 300, (top) => {
-          var _a;
-          (_a = scrollbarRef.value) == null ? void 0 : _a.scrollTo({ top });
-        }, "easeInSine", () => setTimeout(resolve, 300));
-      });
-    } finally {
-      scrollLock = false;
-    }
-  }
-  const onScroll = useDebounceFn(function() {
-    var _a;
-    if (scrollLock || !scrollbarRef.value)
-      return;
-    const { scrollTop, clientHeight } = scrollbarRef.value;
-    const result = anchorIdList.value.find((anchor, idx, arr) => {
-      const nextAnchor = arr[idx + 1];
-      if (!nextAnchor)
-        return true;
-      const node = scrollbarRef.value.querySelector(`#${createLinebarId(nextAnchor.name)}`);
-      if (!node)
-        return;
-      return node.offsetTop > scrollTop + clientHeight / 2;
-    }) || anchorIdList.value[anchorIdList.value.length - 1];
-    __currentAnchor.value = (_a = result == null ? void 0 : result.name) != null ? _a : "";
-  }, 300);
-  watch(anchorIdList, (_anchorIdList) => {
-    var _a, _b;
-    __currentAnchor.value = (_b = (_a = _anchorIdList[0]) == null ? void 0 : _a.name) != null ? _b : "";
-  }, { deep: true, immediate: true });
-  const currentAnchor = computed({
-    get() {
-      return __currentAnchor.value;
-    },
-    async set(id) {
-      __currentAnchor.value = id;
-      await new Promise((resolve) => setTimeout(resolve, 100));
-      await scrollTo(id);
-    }
-  });
-  return {
-    currentAnchor,
-    onScroll,
-    formHeight,
-    anchorIdList,
-    generateAnchorList,
-    scrollbarRef,
-    scrollTo
-  };
-}
-
-export { useAnchor };
+export { useAnchor } from './useAnchor2.js';

package/es/components/form-render/src/hooks/useAnchor2.js

@@ -0,0 +1,90 @@
+import { doAnimation } from '../../../../shared/utils/anime2.js';
+import { useDebounceFn } from '@vueuse/core';
+import { isNumber } from 'lodash-es';
+import { ref, computed, watch, nextTick } from 'vue';
+import { FormItemLineBarDepKeyPrepend } from '../constants/index2.js';
+import '@formily/path';
+import '@vue/shared';
+import 'date-fns';
+import { createLinebarId, traverseSchema } from '../utils/schema2.js';
+
+function useAnchor(props, scrollbarRef, collector) {
+  const __currentAnchor = ref("");
+  const formHeight = computed(() => {
+    if (isNumber(props.maxHeight))
+      return props.maxHeight + "px";
+    return props.maxHeight;
+  });
+  const anchorIdList = ref([]);
+  function generateAnchorList(schema) {
+    anchorIdList.value.length = 0;
+    traverseSchema(schema, (_schema) => {
+      var _a;
+      if (_schema["x-component"] === "LINEBAR") {
+        anchorIdList.value.push({ title: _schema.title, name: ((_a = _schema.name) == null ? void 0 : _a.toString()) || "" });
+      }
+    });
+  }
+  let scrollLock = false;
+  async function scrollTo(id) {
+    scrollLock = true;
+    try {
+      if (!scrollbarRef.value)
+        return;
+      collector.trigger(FormItemLineBarDepKeyPrepend + id, true);
+      await nextTick();
+      const targetAnchor = scrollbarRef.value.querySelector(`#${createLinebarId(id)}`);
+      if (!targetAnchor)
+        return;
+      await new Promise((resolve) => {
+        doAnimation(scrollbarRef.value.scrollTop, targetAnchor.offsetTop, 300, (top) => {
+          var _a;
+          (_a = scrollbarRef.value) == null ? void 0 : _a.scrollTo({ top });
+        }, "easeInSine", () => setTimeout(resolve, 300));
+      });
+    } finally {
+      scrollLock = false;
+    }
+  }
+  const onScroll = useDebounceFn(function() {
+    var _a;
+    if (scrollLock || !scrollbarRef.value)
+      return;
+    const { scrollTop, clientHeight } = scrollbarRef.value;
+    const result = anchorIdList.value.find((anchor, idx, arr) => {
+      const nextAnchor = arr[idx + 1];
+      if (!nextAnchor)
+        return true;
+      const node = scrollbarRef.value.querySelector(`#${createLinebarId(nextAnchor.name)}`);
+      if (!node)
+        return;
+      return node.offsetTop > scrollTop + clientHeight / 2;
+    }) || anchorIdList.value[anchorIdList.value.length - 1];
+    __currentAnchor.value = (_a = result == null ? void 0 : result.name) != null ? _a : "";
+  }, 300);
+  watch(anchorIdList, (_anchorIdList) => {
+    var _a, _b;
+    __currentAnchor.value = (_b = (_a = _anchorIdList[0]) == null ? void 0 : _a.name) != null ? _b : "";
+  }, { deep: true, immediate: true });
+  const currentAnchor = computed({
+    get() {
+      return __currentAnchor.value;
+    },
+    async set(id) {
+      __currentAnchor.value = id;
+      await new Promise((resolve) => setTimeout(resolve, 100));
+      await scrollTo(id);
+    }
+  });
+  return {
+    currentAnchor,
+    onScroll,
+    formHeight,
+    anchorIdList,
+    generateAnchorList,
+    scrollbarRef,
+    scrollTo
+  };
+}
+
+export { useAnchor };

package/es/components/form-render/src/hooks/useAsyncQueue.js

@@ -1,144 +1 @@
-import { isFunction } from 'lodash-es';
-import '../../index.js';
-import { useCommonLog } from './useCommonLog.js';
-import { useFormRequest } from './useFormRequest.js';
-
-class AsyncQueueEntry {
-  constructor(item, key, callback) {
-    this.item = item;
-    this.key = key;
-    this.state = 0 /* PENDING */;
-    this.callback = callback;
-  }
-}
-class ArrayQueue {
-  constructor(items) {
-    this._list = items ? Array.from(items) : [];
-  }
-  enqueue(item) {
-    this._list.push(item);
-  }
-  dequeue() {
-    return this._list.shift();
-  }
-}
-class AsyncQueue {
-  constructor({ name, processor, getKey, parallelism }) {
-    this._queued = new ArrayQueue();
-    this._entries = /* @__PURE__ */ new Map();
-    this._activeTasks = 0;
-    this._processingLock = false;
-    this._stopped = false;
-    this.name = name;
-    this.processor = processor;
-    this.getKey = getKey;
-    this.parallelism = parallelism || 100;
-  }
-  add(item, callback) {
-    if (this._stopped)
-      return callback(new Error("Queue was stopped"));
-    const key = this.getKey(item);
-    if (this._entries.has(key)) {
-      const entry = this._entries.get(key);
-      if (entry.state === 1 /* DONE */) {
-        setTimeout(() => {
-          callback && callback(entry.error, entry.result);
-        });
-      } else if (!entry.callbacks) {
-        entry.callbacks = [callback];
-      } else {
-        entry.callbacks.push(callback);
-      }
-      return;
-    }
-    const newEntry = new AsyncQueueEntry(item, key, callback);
-    this._entries.set(key, newEntry);
-    this._queued.enqueue(newEntry);
-    if (!this._processingLock) {
-      this._processingLock = true;
-      Promise.resolve().then(this._ensureProcessing.bind(this));
-    }
-  }
-  addAsync(item) {
-    return new Promise((resolve, reject) => {
-      this.add(item, (err, result) => {
-        err && reject(err);
-        resolve(result);
-      });
-    });
-  }
-  _ensureProcessing() {
-    while (this._activeTasks < this.parallelism) {
-      const entry = this._queued.dequeue();
-      if (!entry)
-        break;
-      this._activeTasks++;
-      entry.state = 0 /* PENDING */;
-      this._startProcess(entry);
-    }
-    this._processingLock = false;
-  }
-  _startProcess(entry) {
-    this.processor(entry.item, (e, r) => {
-      if (e) {
-        this._handlerResult(entry, e);
-        return;
-      }
-      this._handlerResult(entry, e, r);
-    }, () => this._entries.delete(entry.key));
-  }
-  _handlerResult(entry, e, r) {
-    const callback = entry.callback;
-    entry.state = 1 /* DONE */;
-    entry.callback = void 0;
-    entry.result = r;
-    entry.error = e;
-    this._activeTasks--;
-    callback && callback(e, r);
-    if (entry.callbacks) {
-      entry.callbacks.forEach((cb) => cb(e, r));
-    }
-    if (!this._processingLock) {
-      this._processingLock = true;
-      Promise.resolve().then(this._ensureProcessing.bind(this));
-    }
-  }
-}
-function useAsyncQueue() {
-  const { getHttpInstance } = useFormRequest();
-  function create(parallelism = 3, option) {
-    return new AsyncQueue({
-      name: "FormRenderAsyncQueue",
-      parallelism,
-      async processor({ key, method = "post", params, url }, cb, removeCache) {
-        var _a;
-        const http = getHttpInstance();
-        if (!http) {
-          useCommonLog().invalidHttpInstanceLog();
-          cb();
-          removeCache();
-          return;
-        }
-        try {
-          if (option && isFunction(option.beforeRequest)) {
-            params = (_a = option.beforeRequest(key, params)) != null ? _a : {};
-          }
-          let res = await http[method](url, params);
-          if (option && isFunction(option.afterRequest)) {
-            res = option.afterRequest(key, res);
-          }
-          cb(void 0, Array.isArray(res) ? res : []);
-        } catch (e) {
-          cb(new Error(`Request error => ${e}`));
-          removeCache();
-        }
-      },
-      getKey({ url, method = "post", params }) {
-        return url + method + JSON.stringify(params || {});
-      }
-    });
-  }
-  return { create };
-}
-
-export { AsyncQueue, useAsyncQueue };
+export { AsyncQueue, useAsyncQueue } from './useAsyncQueue2.js';