@jctrans-materials/comps-vue3 1.0.41-beta.4 → 1.0.41-beta.6

package/dist/index.esm.js

@@ -3461,27 +3461,22 @@ const useIsEn = (lang = "") => {
 };
 const _hoisted_1$l = { class: "global-company-input" };
 const _hoisted_2$j = { class: "company-option-item" };
-const _sfc_main$p = {
+const CHINA_COUNTRY_ID = 1;
+const _sfc_main$p = /* @__PURE__ */ defineComponent({
   __name: "index",
   props: {
-    lang: { type: String, default: "" },
-    companyName: { type: String, default: "" },
-    countryId: { type: [String, Number, null], required: true },
+    lang: { default: "" },
+    companyName: { default: "" },
+    countryId: {},
     useKq: { type: Boolean, default: false },
-    kqCode: { type: [String, Number], default: "" },
-    kqInfo: { type: Object, default: () => ({}) },
-    city: { type: Object, default: () => ({}) },
+    kqCode: { default: "" },
+    kqInfo: { default: () => ({}) },
+    city: { default: () => ({}) },
     disabled: { type: Boolean, default: false },
     defaultFirstOption: { type: Boolean, default: false },
     allowCreate: { type: Boolean, default: false }
   },
-  emits: [
-    "update:companyName",
-    "update:useKq",
-    "update:kqCode",
-    "update:kqInfo",
-    "change"
-  ],
+  emits: ["update:companyName", "update:useKq", "update:kqCode", "update:kqInfo", "change"],
   setup(__props, { emit: __emit }) {
     const props = __props;
     const emit = __emit;
@@ -3493,7 +3488,9 @@ const _sfc_main$p = {
       get: () => props.companyName,
       set: (val) => emit("update:companyName", val)
     });
+    const isChina = computed(() => props.countryId === CHINA_COUNTRY_ID);
     const isDisabled = ref(false);
+    let abortController = null;
     const handleRemoteSearch = (query) => {
       if (query) {
         loading.value = true;
@@ -3502,28 +3499,34 @@ const _sfc_main$p = {
         options.value = [];
       }
     };
-    const fetchOptionsDebounced = debounce((query) => {
-      var _a;
-      console.log("🍉 ~ index.vue:119 ~ props.city:", props.city);
+    const fetchOptionsDebounced = debounce(async (query) => {
+      var _a, _b, _c, _d;
+      if (abortController) {
+        abortController.abort();
+      }
+      abortController = new AbortController();
       const data = {
         current: 1,
         size: 50,
         compName: query,
         cityName: ((_a = props.city) == null ? void 0 : _a.nameCn) + "市"
       };
-      getCompanyOptionApi(data).then((res) => {
-        var _a2;
-        options.value = ((_a2 = res.data.data.records) == null ? void 0 : _a2.map((i) => ({
+      try {
+        const res = await getCompanyOptionApi(data);
+        options.value = ((_d = (_c = (_b = res == null ? void 0 : res.data) == null ? void 0 : _b.data) == null ? void 0 : _c.records) == null ? void 0 : _d.map((i) => ({
           value: i.nameCn,
           code: i.kqId,
+          kqId: i.kqId,
           ...i
         }))) || [];
-      }).catch((err) => {
-        console.error("获取公司选项失败:", err);
+      } catch (err) {
+        if ((err == null ? void 0 : err.name) !== "AbortError" && (err == null ? void 0 : err.name) !== "CanceledError") {
+          console.error("获取公司选项失败:", err);
+        }
         options.value = [];
-      }).finally(() => {
+      } finally {
         loading.value = false;
-      });
+      }
     }, 800);
     const handleSelectChange = (val) => {
       const selectedObj = options.value.find((item) => item.value === val);
@@ -3543,7 +3546,10 @@ const _sfc_main$p = {
       emit("update:useKq", false);
       emit("update:kqCode", "");
       emit("change", val);
-      (_a = formItem == null ? void 0 : formItem.validate) == null ? void 0 : _a.call(formItem, "change").catch(() => {
+      (_a = formItem == null ? void 0 : formItem.validate) == null ? void 0 : _a.call(formItem, "change").catch((err) => {
+        if (process.env.NODE_ENV === "development") {
+          console.warn("[ChineseCompanySearch] formItem.validate 失败:", err);
+        }
       });
     };
     const resetKq = () => {
@@ -3552,7 +3558,10 @@ const _sfc_main$p = {
       emit("update:useKq", false);
       emit("update:kqCode", "");
       emit("update:kqInfo", {});
-      (_a = formItem == null ? void 0 : formItem.validate) == null ? void 0 : _a.call(formItem, "change").catch(() => {
+      (_a = formItem == null ? void 0 : formItem.validate) == null ? void 0 : _a.call(formItem, "change").catch((err) => {
+        if (process.env.NODE_ENV === "development") {
+          console.warn("[ChineseCompanySearch] formItem.validate 失败:", err);
+        }
       });
       options.value = [];
     };
@@ -3564,10 +3573,13 @@ const _sfc_main$p = {
     );
     onBeforeUnmount(() => {
       fetchOptionsDebounced.cancel();
+      if (abortController) {
+        abortController.abort();
+      }
     });
     return (_ctx, _cache) => {
       return openBlock(), createElementBlock("div", _hoisted_1$l, [
-        [1].includes(Number(props.countryId)) ? (openBlock(), createBlock(unref(ElSelect), {
+        isChina.value ? (openBlock(), createBlock(unref(ElSelect), {
           key: 0,
           modelValue: companyNameValue.value,
           "onUpdate:modelValue": _cache[0] || (_cache[0] = ($event) => companyNameValue.value = $event),
@@ -3575,13 +3587,12 @@ const _sfc_main$p = {
           remote: "",
           "reserve-keyword": "",
           clearable: "",
-          "allow-create": __props.allowCreate,
-          "default-first-option": __props.defaultFirstOption,
+          "allow-create": props.allowCreate,
+          "default-first-option": props.defaultFirstOption,
           "remote-method": handleRemoteSearch,
           loading: loading.value,
           disabled: isDisabled.value || props.disabled,
           placeholder: unref(isEn) ? "Company Name in Chinese" : "请输入您的公司中文名称",
-          style: { "width": "100%" },
           "popper-class": `company-search dialog-join-us`,
           onChange: handleSelectChange
         }, {
@@ -3591,7 +3602,7 @@ const _sfc_main$p = {
           default: withCtx(() => [
             (openBlock(true), createElementBlock(Fragment, null, renderList(options.value, (item) => {
               return openBlock(), createBlock(unref(ElOption), {
-                key: item.code,
+                key: item.kqId,
                 label: item.value,
                 value: item.value
               }, {
@@ -3612,7 +3623,6 @@ const _sfc_main$p = {
           disabled: isDisabled.value || props.disabled,
           placeholder: unref(isEn) ? "Company name in English" : "请输入您的公司英文名称",
           "max-length": "200",
-          style: { "width": "100%" },
           onChange: handleChange
         }, {
           prepend: withCtx(() => [
@@ -3623,8 +3633,8 @@ const _sfc_main$p = {
       ]);
     };
   }
-};
-const ChineseCompanySearch$1 = /* @__PURE__ */ _export_sfc(_sfc_main$p, [["__scopeId", "data-v-07246d14"]]);
+});
+const ChineseCompanySearch$1 = /* @__PURE__ */ _export_sfc(_sfc_main$p, [["__scopeId", "data-v-1c4f606a"]]);
 const __vite_glob_0_1 = /* @__PURE__ */ Object.freeze(/* @__PURE__ */ Object.defineProperty({
   __proto__: null,
   default: ChineseCompanySearch$1

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@jctrans-materials/comps-vue3",
-  "version": "1.0.41-beta.4",
+  "version": "1.0.41-beta.6",
   "private": false,
   "description": "",
   "type": "module",
@@ -38,7 +38,7 @@
     "nanoid": "^5.1.6",
     "qrcode": "^1.5.4",
     "tailwindcss": "4.1.18",
-    "@jctrans-materials/shared": "1.0.41-beta.4"
+    "@jctrans-materials/shared": "1.0.41-beta.6"
   },
   "devDependencies": {
     "@tailwindcss/postcss": "4.1.18",