@yoooloo42/joker 1.0.67 → 1.0.68

package/dist/index.cjs.js

@@ -41814,22 +41814,27 @@ const _hoisted_9$3 = { class: "select-submit" };
 
 var script$5 = {
   __name: 'index',
-  props: ["myProps"],
+  props: {
+    myProps: {
+        type: Object,
+        default: () => ({ readOnly: false, value: '', _id: null }) // 提供清晰的默认值
+    }
+},
   emits: ['get-value'],
   setup(__props, { emit: __emit }) {
 
 const props = __props;
 const emit = __emit;
 
-const value = vue.ref(Object.assign({
+const value = vue.reactive({
     code2: '',
     text2: '',
     code4: '',
     text4: '',
     code6: '',
     text6: '',
-}, {code6: props.myProps.value}));
-const popup = vue.ref({
+});
+const popup = vue.reactive({
     visible: false,
     select: {
         arrCode2: [],
@@ -41841,107 +41846,101 @@ const popup = vue.ref({
     }
 });
 
-vue.onMounted(()=>{
-    request.ly0.storpro({
+vue.onMounted(async ()=>{
+    // 异步函数直接在 onMounted 顶层调用是允许的
+    const result = await request.ly0.storpro({
         noSession: true,
         storproName: 'ly0d3.gbt2260code2.init',
-    }).then(result=>{
-        popup.value.select.arrCode2 = result.arrCode2;
     });
+    popup.select.arrCode2 = result.arrCode2;
 });
 
 vue.watch(() => props.myProps.value,
-(valNew, valOld) => {
-        request.ly0.storpro({
+    async (valNew, valOld) => {
+        // 只有当传入的值有效时才进行网络请求
+        if (!valNew) return;
+        
+        const result = await request.ly0.storpro({
             noSession: true,
             storproName: 'ly0d3.gbt2260code6.get',
-            data: {
-                code6: valNew,
-            },
-        }).then(result=>{
-            if(result.itemCode6){
-                value.value = result.itemCode6;
-            }
+            data: { code6: valNew },
         });
+        
+        if(result.itemCode6){
+            // 保持响应式
+            Object.assign(value, result.itemCode6);
+            
+            // 确保按顺序加载级联数据
+            if (value.code2) {
+                await hdlChangeCode2(value.code2);
+            }
+            if (value.code4) {
+                await hdlChangeCode4(value.code4);
+            }
+        }
     },
-    {
-        immediate: true // 关键：让它在组件初始化时立即运行
-    }
+    { immediate: true }
 );
 
-const hdlPopup = () => {
+const hdlPopup = async () => {
     if (!props.myProps.readOnly) {
-        popup.value.select.code2 = value.value.code2;
-        hdlChangeCode2(popup.value.select.code2).then(() => {
-            popup.value.select.code4 = value.value.code4;
-            hdlChangeCode4(popup.value.select.code4).then(() => {
-                popup.value.select.code6 = value.value.code6;
-                popup.value.visible = true;
-            });
-        });
+        popup.select.code2 = value.code2;
+        await hdlChangeCode2(popup.select.code2);
+        
+        popup.select.code4 = value.code4;
+        await hdlChangeCode4(popup.select.code4);
+        
+        popup.select.code6 = value.code6;
+        popup.visible = true;
     }
 };
 
-const hdlChangeCode2 = value => {
-    return new Promise((resolve, reject) => {
-        request.ly0.storpro({
-            noSession: true,
-            storproName: 'ly0d3.gbt2260code4.code2',
-            data: {code2: value},
-        }).then(result => {
-            popup.value.select.arrCode4 = result.arrCode4;
-            popup.value.select.code4 = '';
-            popup.value.select.arrCode6 = [];
-            popup.value.select.code6 = '';
-            resolve();
-        });
-    })
+const hdlChangeCode2 = async value => { // 使用 async 标记
+    const result = await request.ly0.storpro({
+        noSession: true,
+        storproName: 'ly0d3.gbt2260code4.code2',
+        data: {code2: value},
+    });
+    
+    popup.select.arrCode4 = result.arrCode4;
+    popup.select.code4 = '';
+    popup.select.arrCode6 = [];
+    popup.select.code6 = '';
 };
 
-const hdlChangeCode4 = value => {
-    return new Promise((resolve, reject) => {
-        request.ly0.storpro({
-            noSession: true,
-            storproName: 'ly0d3.gbt2260code6.code4',
-            data: {code4: value},
-        }).then(result => {
-            popup.value.select.arrCode6 = result.arrCode6;
-            popup.value.select.code6 = '';
-            resolve();
-        });
-    })
+const hdlChangeCode4 = async value => {
+    const result = await request.ly0.storpro({
+        noSession: true,
+        storproName: 'ly0d3.gbt2260code6.code4',
+        data: {code4: value},
+    });
+    
+    popup.select.arrCode6 = result.arrCode6;
+    popup.select.code6 = '';
 };
 
 const hdlSubmit = () => {
-    value.value.code2 = popup.value.select.code2;
-    value.value.text2 = value.value.code2
-        ? popup.value.select.arrCode2.find(i => {
-            return i.code2 === value.value.code2
-        }).text2
-        : '';
-    value.value.code4 = popup.value.select.code4;
-    value.value.text4 = value.value.code4
-        ? popup.value.select.arrCode4.find(i => {
-            return i.code4 === value.value.code4
-        }).text4
-        : '';
-    value.value.code6 = popup.value.select.code6;
-    value.value.text6 = value.value.code6
-        ? popup.value.select.arrCode6.find(i => {
-            return i.code6 === value.value.code6
-        }).text6
-        : '';
+    // ... (安全查找逻辑) ...
+    value.code2 = popup.select.code2;
+    const foundItem2 = popup.select.arrCode2.find(i => i.code2 === value.code2);
+    value.text2 = foundItem2 ? foundItem2.text2 : '';
+    value.code4 = popup.select.code4;
+    const foundItem4 = popup.select.arrCode4.find(i => i.code4 === value.code4);
+    value.text4 = foundItem4 ? foundItem4.text4 : '';
+    value.code6 = popup.select.code6;
+    const foundItem6 = popup.select.arrCode6.find(i => i.code6 === value.code6);
+    value.text6 = foundItem6 ? foundItem6.text6 : '';
     emit("get-value", {
-        code6: value.value.code6
-            ? value.value.code6
-            : value.value.code4
-                ? value.value.code4
-                : value.value.code2
-                    ? value.value.code2
+        code6: value.code6
+            ? value.code6
+            : value.code4
+                ? value.code4
+                : value.code2
+                    ? value.code2
                     : '',
         _id: '_id' in props.myProps ? props.myProps._id : null,
     });
-    popup.value.visible = false;
+    popup.visible = false;
 };
 
 return (_ctx, _cache) => {
@@ -41970,35 +41969,35 @@ return (_ctx, _cache) => {
               : vue.createCommentVNode("v-if", true)
           ]),
           vue.createElementVNode("td", null, [
-            vue.createElementVNode("span", _hoisted_1$5, vue.toDisplayString('[' + (value.value.code2 ? value.value.code2 : '省') + ']'), 1 /* TEXT */)
+            vue.createElementVNode("span", _hoisted_1$5, vue.toDisplayString('[' + (value.code2 ? value.code2 : '省') + ']'), 1 /* TEXT */)
           ]),
           vue.createElementVNode("td", null, [
-            vue.createElementVNode("span", _hoisted_2$5, vue.toDisplayString(value.value.text2 ? value.value.text2 : ''), 1 /* TEXT */)
+            vue.createElementVNode("span", _hoisted_2$5, vue.toDisplayString(value.text2 ? value.text2 : ''), 1 /* TEXT */)
           ])
         ]),
         vue.createElementVNode("tr", null, [
           _cache[4] || (_cache[4] = vue.createElementVNode("td", null, null, -1 /* CACHED */)),
           vue.createElementVNode("td", null, [
-            vue.createElementVNode("span", _hoisted_3$5, vue.toDisplayString('[' + (value.value.code4 ? value.value.code4 : '市') + ']'), 1 /* TEXT */)
+            vue.createElementVNode("span", _hoisted_3$5, vue.toDisplayString('[' + (value.code4 ? value.code4 : '市') + ']'), 1 /* TEXT */)
           ]),
           vue.createElementVNode("td", null, [
-            vue.createElementVNode("span", _hoisted_4$5, vue.toDisplayString(value.value.text4 ? value.value.text4 : ''), 1 /* TEXT */)
+            vue.createElementVNode("span", _hoisted_4$5, vue.toDisplayString(value.text4 ? value.text4 : ''), 1 /* TEXT */)
           ])
         ]),
         vue.createElementVNode("tr", null, [
           _cache[5] || (_cache[5] = vue.createElementVNode("td", null, null, -1 /* CACHED */)),
           vue.createElementVNode("td", null, [
-            vue.createElementVNode("span", _hoisted_5$5, vue.toDisplayString('[' + (value.value.code6 ? value.value.code6 : '县') + ']'), 1 /* TEXT */)
+            vue.createElementVNode("span", _hoisted_5$5, vue.toDisplayString('[' + (value.code6 ? value.code6 : '县') + ']'), 1 /* TEXT */)
           ]),
           vue.createElementVNode("td", null, [
-            vue.createElementVNode("span", _hoisted_6$5, vue.toDisplayString(value.value.text6 ? value.value.text6 : ''), 1 /* TEXT */)
+            vue.createElementVNode("span", _hoisted_6$5, vue.toDisplayString(value.text6 ? value.text6 : ''), 1 /* TEXT */)
           ])
         ])
       ])
     ]),
     vue.createVNode(_component_el_dialog, {
-      modelValue: popup.value.visible,
-      "onUpdate:modelValue": _cache[3] || (_cache[3] = $event => ((popup.value.visible) = $event)),
+      modelValue: popup.visible,
+      "onUpdate:modelValue": _cache[3] || (_cache[3] = $event => ((popup.visible) = $event)),
       "custom-class": 'code-template-dialog',
       "close-on-press-escape": true,
       "append-to-body": "",
@@ -42015,18 +42014,18 @@ return (_ctx, _cache) => {
               ], -1 /* CACHED */)),
               vue.createElementVNode("td", null, [
                 vue.createVNode(_component_el_select, {
-                  modelValue: popup.value.select.code2,
-                  "onUpdate:modelValue": _cache[0] || (_cache[0] = $event => ((popup.value.select.code2) = $event)),
+                  modelValue: popup.select.code2,
+                  "onUpdate:modelValue": _cache[0] || (_cache[0] = $event => ((popup.select.code2) = $event)),
                   filterable: "",
                   class: "select",
                   onChange: hdlChangeCode2
                 }, {
                   default: vue.withCtx(() => [
-                    (vue.openBlock(true), vue.createElementBlock(vue.Fragment, null, vue.renderList(popup.value.select.arrCode2, (item, index) => {
+                    (vue.openBlock(true), vue.createElementBlock(vue.Fragment, null, vue.renderList(popup.select.arrCode2, (item, index) => {
                       return (vue.openBlock(), vue.createBlock(_component_el_option, {
                         label: item.text2,
                         value: item.code2,
-                        key: index
+                        key: item.code2
                       }, null, 8 /* PROPS */, ["label", "value"]))
                     }), 128 /* KEYED_FRAGMENT */))
                   ]),
@@ -42040,18 +42039,18 @@ return (_ctx, _cache) => {
               ], -1 /* CACHED */)),
               vue.createElementVNode("td", null, [
                 vue.createVNode(_component_el_select, {
-                  modelValue: popup.value.select.code4,
-                  "onUpdate:modelValue": _cache[1] || (_cache[1] = $event => ((popup.value.select.code4) = $event)),
+                  modelValue: popup.select.code4,
+                  "onUpdate:modelValue": _cache[1] || (_cache[1] = $event => ((popup.select.code4) = $event)),
                   filterable: "",
                   class: "select",
                   onChange: hdlChangeCode4
                 }, {
                   default: vue.withCtx(() => [
-                    (vue.openBlock(true), vue.createElementBlock(vue.Fragment, null, vue.renderList(popup.value.select.arrCode4, (item, index) => {
+                    (vue.openBlock(true), vue.createElementBlock(vue.Fragment, null, vue.renderList(popup.select.arrCode4, (item, index) => {
                       return (vue.openBlock(), vue.createBlock(_component_el_option, {
                         label: item.text4,
                         value: item.code4,
-                        key: index
+                        key: item.code4
                       }, null, 8 /* PROPS */, ["label", "value"]))
                     }), 128 /* KEYED_FRAGMENT */))
                   ]),
@@ -42065,17 +42064,17 @@ return (_ctx, _cache) => {
               ], -1 /* CACHED */)),
               vue.createElementVNode("td", null, [
                 vue.createVNode(_component_el_select, {
-                  modelValue: popup.value.select.code6,
-                  "onUpdate:modelValue": _cache[2] || (_cache[2] = $event => ((popup.value.select.code6) = $event)),
+                  modelValue: popup.select.code6,
+                  "onUpdate:modelValue": _cache[2] || (_cache[2] = $event => ((popup.select.code6) = $event)),
                   filterable: "",
                   class: "select"
                 }, {
                   default: vue.withCtx(() => [
-                    (vue.openBlock(true), vue.createElementBlock(vue.Fragment, null, vue.renderList(popup.value.select.arrCode6, (item, index) => {
+                    (vue.openBlock(true), vue.createElementBlock(vue.Fragment, null, vue.renderList(popup.select.arrCode6, (item, index) => {
                       return (vue.openBlock(), vue.createBlock(_component_el_option, {
                         label: item.text6,
                         value: item.code6,
-                        key: index
+                        key: item.code6
                       }, null, 8 /* PROPS */, ["label", "value"]))
                     }), 128 /* KEYED_FRAGMENT */))
                   ]),