@qqt-product/ui 14.1.3 → 14.1.5

package/dist/index.es.js

@@ -2154,43 +2154,47 @@ const select = "", _sfc_main$Z = defineComponent({
   props: vxeSelectProps,
   emits: ["update:modelValue", "change"],
   setup(r, n) {
-    const { modelValue: o, busAccount: s, dictCode: l, multiple: c } = toRefs(r), p = qqtApi.useHttp(), { classes: b } = useSelect$1(), y = c.value, O = reactive({
-      realValue: y ? [] : "",
-      options: r.options
-    }), { realValue: x, options: D } = toRefs(O);
+    const { modelValue: o, busAccount: s, dictCode: l, multiple: c } = toRefs(r), p = qqtApi.useHttp(), { classes: b } = useSelect$1(), y = c.value, x = ref(y ? [] : ""), D = r.options.map((ae) => {
+      let { label: Y, title: se, ...ce } = ae;
+      return Y || (Y = se), se || (se = Y), {
+        ...ce,
+        label: Y,
+        title: se
+      };
+    }), P = ref(D);
     watch(
       o,
-      (G) => {
-        const ae = y ? G ? G.split(",") : [] : G;
-        x.value = ae;
+      (ae) => {
+        const Y = y ? ae ? ae.split(",") : [] : ae;
+        x.value = Y;
       },
       { immediate: !0 }
-    ), watch(l, (G) => {
-      !G || D.value && D.value.length > 0 || p.post({
+    ), watch(l, (ae) => {
+      !ae || P.value && P.value.length > 0 || p.post({
         url: "/base/dict/findDictItems",
         data: {
           busAccount: s.value,
-          dictCode: G
+          dictCode: ae
         }
-      }).then((ae) => {
-        if (ae.success) {
-          const Y = ae.result;
-          D.value = Y.map((se) => ({
-            ...se,
-            label: se.title
+      }).then((Y) => {
+        if (Y.success) {
+          const se = Y.result;
+          P.value = se.map((ce) => ({
+            ...ce,
+            label: ce.title
           }));
         }
       });
     }, { immediate: !0 });
-    const R = ({ value: G }) => {
-      let ae = "";
+    const G = ({ value: ae }) => {
+      let Y = "";
       if (y)
-        ae = D.value.filter((Y) => G.includes(Y.value)).map((Y) => Y.label).join(",");
+        Y = P.value.filter((se) => ae.includes(se.value)).map((se) => se.label).join(",");
       else {
-        let Y = D.value.find((se) => se.value === G);
-        Y && (ae = Y.label);
+        let se = P.value.find((ce) => ce.value === ae);
+        se && (Y = se.label);
       }
-      n.emit("update:modelValue", `${G || ""}`), n.emit("change", { value: `${G || ""}`, label: ae });
+      n.emit("update:modelValue", `${ae || ""}`), n.emit("change", { value: `${ae || ""}`, label: Y });
     };
     return {
       classes: b,
@@ -2198,8 +2202,8 @@ const select = "", _sfc_main$Z = defineComponent({
       maxTagCount: r.maxTagCount,
       placeholder: r.placeholder,
       multiple: r.multiple,
-      options: D,
-      onChange: R,
+      options: P,
+      onChange: G,
       props: r
     };
   }
@@ -17737,11 +17741,7 @@ function useRemoteConfig() {
         }));
       });
     });
-    const Sn = computed(() => l.value.busAccount || l.value.elsAccount), ze = Be.map((En) => En.item && En.item.options && En.item.options.length ? Promise.resolve().then(() => (En.item.options.forEach((Ln) => {
-      Ln.title = Ln.label;
-    }), {
-      result: En.item.options
-    })) : r.post({
+    const Sn = computed(() => l.value.busAccount || l.value.elsAccount), ze = Be.map((En) => En.item && En.item.options && En.item.options.length ? Promise.resolve().then(() => En.item.options) : r.post({
       url: "/base/dict/findDictItems",
       data: {
         busAccount: Sn.value,
@@ -17790,13 +17790,13 @@ function useRemoteConfig() {
   };
   return watchEffect(
     async () => {
+      D.value = !1;
       try {
-        D.value = !1, x.value = !0;
         const ce = await P(s.businessType), Be = await G(ce), we = ae(Be);
-        O.value = se(we), y.value = Y(we), D.value = !0;
+        O.value = se(we), y.value = Y(we);
       } catch {
       } finally {
-        x.value = !1;
+        D.value = !0;
       }
     },
     { flush: "post" }
@@ -19071,6 +19071,7 @@ const pageLayout = "", { remove: remove$1, uniqueId: uniqueId$1, download, clone
       layoutConfig: p,
       pageData: P,
       loading: D,
+      isFinishConfig: O,
       layoutLoading: y,
       customLoading: Ln
     };
@@ -19082,7 +19083,7 @@ function _sfc_render$Q(r, n, o, s, l, c) {
     class: normalizeClass(r.classes)
   }, [
     createVNode$1(p, {
-      spinning: r.loading || r.layoutLoading || r.customLoading
+      spinning: !r.isFinishConfig || r.loading || r.layoutLoading || r.customLoading
     }, {
       default: withCtx(() => [
         renderSlot(r.$slots, "default", {