@yoooloo42/joker 1.0.68 → 1.0.70

package/dist/dist/bundle.css

@@ -30,41 +30,6 @@
 .avatar[data-v-6fc32e0e]:hover {
   border-color: #409EFF;
 }
-.value-code {
-  color: #6a6a6a;
-}
-
-.value-text {
-  color: #0000bb;
-  padding-left: 10px;
-}
-
-.select {
-  width: 300px;
-  margin-top: 10px;
-  margin-bottom: 10px;
-}
-.select :deep(.el-select__wrapper) {
-  height: 40px;
-  line-height: 40px;
-}
-
-.select-label {
-  text-align: right;
-  font-size: medium;
-  padding-right: 20px;
-}
-
-.select-submit {
-  text-align: right;
-}
-
-.line {
-  height: 1px;
-  background-color: #999999;
-  margin-top: 10px;
-  margin-bottom: 10px;
-}
 .value-item {
   display: inline-block;
   margin: 10px;

package/dist/index.cjs.js

@@ -22455,13 +22455,13 @@ script$h.__file = "src/form/LabelBox.vue";
 
 const _hoisted_1$e = { key: 12 };
 const _hoisted_2$d = { key: 0 };
-const _hoisted_3$8 = { key: 13 };
-const _hoisted_4$7 = { key: 0 };
-const _hoisted_5$6 = { key: 14 };
-const _hoisted_6$6 = { key: 0 };
-const _hoisted_7$6 = { key: 16 };
-const _hoisted_8$5 = ["innerHTML"];
-const _hoisted_9$4 = { key: 17 };
+const _hoisted_3$7 = { key: 13 };
+const _hoisted_4$6 = { key: 0 };
+const _hoisted_5$5 = { key: 14 };
+const _hoisted_6$5 = { key: 0 };
+const _hoisted_7$5 = { key: 16 };
+const _hoisted_8$4 = ["innerHTML"];
+const _hoisted_9$3 = { key: 17 };
 const _hoisted_10$2 = ["width", "height", "poster"];
 const _hoisted_11$1 = ["src"];
 const _hoisted_12 = ["src"];
@@ -22989,7 +22989,7 @@ return (_ctx, _cache) => {
       vue.createCommentVNode(" 图片&富文本&视频 "),
       vue.createCommentVNode(" 图片 "),
       (__props.item.inputType === 'image')
-        ? (vue.openBlock(), vue.createElementBlock("div", _hoisted_3$8, [
+        ? (vue.openBlock(), vue.createElementBlock("div", _hoisted_3$7, [
             vue.createElementVNode("div", null, [
               vue.createVNode(_component_el_image, {
                 style: vue.normalizeStyle(style.image(__props.item, __props.myProps)),
@@ -23001,7 +23001,7 @@ return (_ctx, _cache) => {
             ]),
             vue.createCommentVNode(" 设置了图片删除功能，同时图片不为空 "),
             (!!__props.item.imageDelete && !!__props.dataBox.fieldsValue[__props.item.fieldName])
-              ? (vue.openBlock(), vue.createElementBlock("div", _hoisted_4$7, [
+              ? (vue.openBlock(), vue.createElementBlock("div", _hoisted_4$6, [
                   vue.createVNode(_component_el_button, {
                     size: "small",
                     icon: !__props.dataBox.fieldsValue[__props.item.imageDelete] ? 'el-icon-delete' : 'el-icon-magic-stick',
@@ -23018,7 +23018,7 @@ return (_ctx, _cache) => {
         : vue.createCommentVNode("v-if", true),
       vue.createCommentVNode(" 多个图片 "),
       (__props.item.inputType === 'images')
-        ? (vue.openBlock(), vue.createElementBlock("div", _hoisted_5$6, [
+        ? (vue.openBlock(), vue.createElementBlock("div", _hoisted_5$5, [
             (vue.openBlock(true), vue.createElementBlock(vue.Fragment, null, vue.renderList(__props.dataBox.fieldsValue[__props.item.fieldName], (itemImages, indexImages) => {
               return (vue.openBlock(), vue.createElementBlock("div", {
                 key: indexImages,
@@ -23032,7 +23032,7 @@ return (_ctx, _cache) => {
                   }, null, 8 /* PROPS */, ["style", "src", "preview-src-list"])
                 ]),
                 (!!__props.item.imageDelete)
-                  ? (vue.openBlock(), vue.createElementBlock("div", _hoisted_6$6, [
+                  ? (vue.openBlock(), vue.createElementBlock("div", _hoisted_6$5, [
                       vue.createVNode(_component_el_button, {
                         size: "small",
                         icon: "el-icon-delete",
@@ -23064,15 +23064,15 @@ return (_ctx, _cache) => {
         : vue.createCommentVNode("v-if", true),
       vue.createCommentVNode(" 富文本show "),
       (__props.item.inputType === 'richtextShow')
-        ? (vue.openBlock(), vue.createElementBlock("div", _hoisted_7$6, [
+        ? (vue.openBlock(), vue.createElementBlock("div", _hoisted_7$5, [
             vue.createElementVNode("div", {
               innerHTML: __props.dataBox.fieldsValue[__props.item.fieldName]
-            }, null, 8 /* PROPS */, _hoisted_8$5)
+            }, null, 8 /* PROPS */, _hoisted_8$4)
           ]))
         : vue.createCommentVNode("v-if", true),
       vue.createCommentVNode(" 视频 "),
       (__props.item.inputType === 'video')
-        ? (vue.openBlock(), vue.createElementBlock("div", _hoisted_9$4, [
+        ? (vue.openBlock(), vue.createElementBlock("div", _hoisted_9$3, [
             vue.createElementVNode("div", null, [
               vue.createElementVNode("video", {
                 width: style.video(__props.item, __props.myProps).width,
@@ -23274,8 +23274,8 @@ script$g.__file = "src/form/InputBox.vue";
 
 const _hoisted_1$d = { key: 0 };
 const _hoisted_2$c = ["colspan"];
-const _hoisted_3$7 = { key: 0 };
-const _hoisted_4$6 = ["colspan"];
+const _hoisted_3$6 = { key: 0 };
+const _hoisted_4$5 = ["colspan"];
 
 
 var script$f = {
@@ -23367,7 +23367,7 @@ return (_ctx, _cache) => {
                                                             ? item2.hdlVisible(__props.scopeThis, __props.dataBox.fieldsValue)
                                                             : true
                                                         )
-                                                      ? (vue.openBlock(), vue.createElementBlock("tr", _hoisted_3$7, [
+                                                      ? (vue.openBlock(), vue.createElementBlock("tr", _hoisted_3$6, [
                                                           (item2.label)
                                                             ? (vue.openBlock(), vue.createElementBlock("td", {
                                                                 key: 0,
@@ -23391,7 +23391,7 @@ return (_ctx, _cache) => {
                                                               dataBox: __props.dataBox,
                                                               item: item2
                                                             }, null, 8 /* PROPS */, ["scopeThis", "myProps", "dataBox", "item"])
-                                                          ], 12 /* STYLE, PROPS */, _hoisted_4$6)
+                                                          ], 12 /* STYLE, PROPS */, _hoisted_4$5)
                                                         ]))
                                                       : vue.createCommentVNode("v-if", true)
                                                   ], 64 /* STABLE_FRAGMENT */))
@@ -41720,7 +41720,7 @@ var script$6 = {
 
 const _hoisted_1$6 = { class: "el-upload__tip" };
 const _hoisted_2$6 = ["src"];
-const _hoisted_3$6 = {
+const _hoisted_3$5 = {
   key: 0,
   style: {"font-size":"xx-small"}
 };
@@ -41771,7 +41771,7 @@ function render(_ctx, _cache, $props, $setup, $data, $options) {
       _: 1 /* STABLE */
     }, 8 /* PROPS */, ["modelValue"]),
     (_ctx.fileList.length>0)
-      ? (vue.openBlock(), vue.createElementBlock("div", _hoisted_3$6, vue.toDisplayString("已上传"+_ctx.fileList.length+"个图片"), 1 /* TEXT */))
+      ? (vue.openBlock(), vue.createElementBlock("div", _hoisted_3$5, vue.toDisplayString("已上传"+_ctx.fileList.length+"个图片"), 1 /* TEXT */))
       : vue.createCommentVNode("v-if", true),
     (_ctx.fileList.length>0)
       ? (vue.openBlock(), vue.createBlock(_component_el_button, {
@@ -41801,15 +41801,8 @@ var upload = {
   Upload_pictureCard: script$6
 };
 
-const _hoisted_1$5 = { class: "value-code" };
-const _hoisted_2$5 = { class: "value-text" };
-const _hoisted_3$5 = { class: "value-code" };
-const _hoisted_4$5 = { class: "value-text" };
-const _hoisted_5$5 = { class: "value-code" };
-const _hoisted_6$5 = { class: "value-text" };
-const _hoisted_7$5 = { class: "select-row" };
-const _hoisted_8$4 = { class: "select-row" };
-const _hoisted_9$3 = { class: "select-submit" };
+const _hoisted_1$5 = { style: {"width":"100%"} };
+const _hoisted_2$5 = { style: {"width":"30%"} };
 
 
 var script$5 = {
@@ -41846,29 +41839,26 @@ const popup = vue.reactive({
     }
 });
 
-vue.onMounted(async ()=>{
-    // 异步函数直接在 onMounted 顶层调用是允许的
-    const result = await request.ly0.storpro({
-        noSession: true,
-        storproName: 'ly0d3.gbt2260code2.init',
-    });
-    popup.select.arrCode2 = result.arrCode2;
-});
-
 vue.watch(() => props.myProps.value,
     async (valNew, valOld) => {
         // 只有当传入的值有效时才进行网络请求
         if (!valNew) return;
         
-        const result = await request.ly0.storpro({
+        const result2 = await request.ly0.storpro({
+            noSession: true,
+            storproName: 'ly0d3.gbt2260code2.init',
+        });
+        popup.select.arrCode2 = result2.arrCode2.filter(item => item.code2);
+        
+        const result6 = await request.ly0.storpro({
             noSession: true,
             storproName: 'ly0d3.gbt2260code6.get',
             data: { code6: valNew },
         });
         
-        if(result.itemCode6){
+        if(result6.itemCode6){
             // 保持响应式
-            Object.assign(value, result.itemCode6);
+            Object.assign(value, result6.itemCode6);
             
             // 确保按顺序加载级联数据
             if (value.code2) {
@@ -41902,7 +41892,7 @@ const hdlChangeCode2 = async value => { // 使用 async 标记
         data: {code2: value},
     });
     
-    popup.select.arrCode4 = result.arrCode4;
+    popup.select.arrCode4 = result.arrCode4.filter(item => item.code4);
     popup.select.code4 = '';
     popup.select.arrCode6 = [];
     popup.select.code6 = '';
@@ -41915,7 +41905,7 @@ const hdlChangeCode4 = async value => {
         data: {code4: value},
     });
     
-    popup.select.arrCode6 = result.arrCode6;
+    popup.select.arrCode6 = result.arrCode6.filter(item => item.code6);
     popup.select.code6 = '';
 };
 
@@ -41943,6 +41933,41 @@ const hdlSubmit = () => {
     popup.visible = false;
 };
 
+const style = vue.reactive({
+    value: {
+        code: {
+            color: '#6a6a6a',
+        },
+        text: {
+            color: '#0000bb',
+            'padding-left': '10px',
+        }
+    },
+    popup: {
+        label: {
+            'text-align': 'right',
+            'font-size': 'medium',
+            'padding-right': '20px'
+        },
+        select: {
+            width: '300px',
+            'margin-top': '10px',
+            'margin-bottom': '10px',
+            height: '40px',
+            'line-height': '40px'
+        },
+        submit: {
+            'text-align': 'right'
+        }
+    },
+    line: {
+        height: '1px',
+        'background-color': '#999999',
+        'margin-top': '10px',
+        'margin-bottom': '10px'
+    }
+});
+
 return (_ctx, _cache) => {
   const _component_edit = vue.resolveComponent("edit");
   const _component_el_icon = vue.resolveComponent("el-icon");
@@ -41969,28 +41994,40 @@ return (_ctx, _cache) => {
               : vue.createCommentVNode("v-if", true)
           ]),
           vue.createElementVNode("td", null, [
-            vue.createElementVNode("span", _hoisted_1$5, vue.toDisplayString('[' + (value.code2 ? value.code2 : '省') + ']'), 1 /* TEXT */)
+            vue.createElementVNode("span", {
+              style: vue.normalizeStyle(style.value.code)
+            }, vue.toDisplayString('[' + (value.code2 ? value.code2 : '省') + ']'), 5 /* TEXT, STYLE */)
           ]),
           vue.createElementVNode("td", null, [
-            vue.createElementVNode("span", _hoisted_2$5, vue.toDisplayString(value.text2 ? value.text2 : ''), 1 /* TEXT */)
+            vue.createElementVNode("span", {
+              style: vue.normalizeStyle(style.value.text)
+            }, vue.toDisplayString(value.text2 ? value.text2 : ''), 5 /* TEXT, STYLE */)
           ])
         ]),
         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.code4 ? value.code4 : '市') + ']'), 1 /* TEXT */)
+            vue.createElementVNode("span", {
+              style: vue.normalizeStyle(style.value.code)
+            }, vue.toDisplayString('[' + (value.code4 ? value.code4 : '市') + ']'), 5 /* TEXT, STYLE */)
           ]),
           vue.createElementVNode("td", null, [
-            vue.createElementVNode("span", _hoisted_4$5, vue.toDisplayString(value.text4 ? value.text4 : ''), 1 /* TEXT */)
+            vue.createElementVNode("span", {
+              style: vue.normalizeStyle(style.value.text)
+            }, vue.toDisplayString(value.text4 ? value.text4 : ''), 5 /* TEXT, STYLE */)
           ])
         ]),
         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.code6 ? value.code6 : '县') + ']'), 1 /* TEXT */)
+            vue.createElementVNode("span", {
+              style: vue.normalizeStyle(style.value.code)
+            }, vue.toDisplayString('[' + (value.code6 ? value.code6 : '县') + ']'), 5 /* TEXT, STYLE */)
           ]),
           vue.createElementVNode("td", null, [
-            vue.createElementVNode("span", _hoisted_6$5, vue.toDisplayString(value.text6 ? value.text6 : ''), 1 /* TEXT */)
+            vue.createElementVNode("span", {
+              style: vue.normalizeStyle(style.value.text)
+            }, vue.toDisplayString(value.text6 ? value.text6 : ''), 5 /* TEXT, STYLE */)
           ])
         ])
       ])
@@ -42006,18 +42043,20 @@ return (_ctx, _cache) => {
       "destroy-on-close": true
     }, {
       default: vue.withCtx(() => [
-        vue.createElementVNode("table", null, [
+        vue.createElementVNode("table", _hoisted_1$5, [
           vue.createElementVNode("tbody", null, [
             vue.createElementVNode("tr", null, [
-              _cache[6] || (_cache[6] = vue.createElementVNode("td", { style: {"width":"30%"} }, [
-                vue.createElementVNode("div", { class: "select-label" }, "省")
-              ], -1 /* CACHED */)),
+              vue.createElementVNode("td", _hoisted_2$5, [
+                vue.createElementVNode("div", {
+                  style: vue.normalizeStyle(style.popup.label)
+                }, "省", 4 /* STYLE */)
+              ]),
               vue.createElementVNode("td", null, [
                 vue.createVNode(_component_el_select, {
                   modelValue: popup.select.code2,
                   "onUpdate:modelValue": _cache[0] || (_cache[0] = $event => ((popup.select.code2) = $event)),
                   filterable: "",
-                  class: "select",
+                  style: vue.normalizeStyle(style.popup.select),
                   onChange: hdlChangeCode2
                 }, {
                   default: vue.withCtx(() => [
@@ -42030,19 +42069,21 @@ return (_ctx, _cache) => {
                     }), 128 /* KEYED_FRAGMENT */))
                   ]),
                   _: 1 /* STABLE */
-                }, 8 /* PROPS */, ["modelValue"])
+                }, 8 /* PROPS */, ["modelValue", "style"])
               ])
             ]),
-            vue.createElementVNode("tr", _hoisted_7$5, [
-              _cache[7] || (_cache[7] = vue.createElementVNode("td", null, [
-                vue.createElementVNode("div", { class: "select-label" }, "市")
-              ], -1 /* CACHED */)),
+            vue.createElementVNode("tr", null, [
+              vue.createElementVNode("td", null, [
+                vue.createElementVNode("div", {
+                  style: vue.normalizeStyle(style.popup.label)
+                }, "市", 4 /* STYLE */)
+              ]),
               vue.createElementVNode("td", null, [
                 vue.createVNode(_component_el_select, {
                   modelValue: popup.select.code4,
                   "onUpdate:modelValue": _cache[1] || (_cache[1] = $event => ((popup.select.code4) = $event)),
                   filterable: "",
-                  class: "select",
+                  style: vue.normalizeStyle(style.popup.select),
                   onChange: hdlChangeCode4
                 }, {
                   default: vue.withCtx(() => [
@@ -42055,19 +42096,21 @@ return (_ctx, _cache) => {
                     }), 128 /* KEYED_FRAGMENT */))
                   ]),
                   _: 1 /* STABLE */
-                }, 8 /* PROPS */, ["modelValue"])
+                }, 8 /* PROPS */, ["modelValue", "style"])
               ])
             ]),
-            vue.createElementVNode("tr", _hoisted_8$4, [
-              _cache[8] || (_cache[8] = vue.createElementVNode("td", null, [
-                vue.createElementVNode("div", { class: "select-label" }, "县")
-              ], -1 /* CACHED */)),
+            vue.createElementVNode("tr", null, [
+              vue.createElementVNode("td", null, [
+                vue.createElementVNode("div", {
+                  style: vue.normalizeStyle(style.popup.label)
+                }, "县", 4 /* STYLE */)
+              ]),
               vue.createElementVNode("td", null, [
                 vue.createVNode(_component_el_select, {
                   modelValue: popup.select.code6,
                   "onUpdate:modelValue": _cache[2] || (_cache[2] = $event => ((popup.select.code6) = $event)),
                   filterable: "",
-                  class: "select"
+                  style: vue.normalizeStyle(style.popup.select)
                 }, {
                   default: vue.withCtx(() => [
                     (vue.openBlock(true), vue.createElementBlock(vue.Fragment, null, vue.renderList(popup.select.arrCode6, (item, index) => {
@@ -42079,24 +42122,28 @@ return (_ctx, _cache) => {
                     }), 128 /* KEYED_FRAGMENT */))
                   ]),
                   _: 1 /* STABLE */
-                }, 8 /* PROPS */, ["modelValue"])
+                }, 8 /* PROPS */, ["modelValue", "style"])
               ])
             ])
           ])
         ]),
-        _cache[10] || (_cache[10] = vue.createElementVNode("div", { class: "line" }, null, -1 /* CACHED */)),
-        vue.createElementVNode("div", _hoisted_9$3, [
+        vue.createElementVNode("div", {
+          style: vue.normalizeStyle(style.line)
+        }, null, 4 /* STYLE */),
+        vue.createElementVNode("div", {
+          style: vue.normalizeStyle(style.popup.submit)
+        }, [
           vue.createVNode(_component_el_button, {
             type: "danger",
             plain: "",
             onClick: hdlSubmit
           }, {
-            default: vue.withCtx(() => [...(_cache[9] || (_cache[9] = [
+            default: vue.withCtx(() => [...(_cache[6] || (_cache[6] = [
               vue.createTextVNode("确认", -1 /* CACHED */)
             ]))]),
             _: 1 /* STABLE */
           })
-        ])
+        ], 4 /* STYLE */)
       ]),
       _: 1 /* STABLE */
     }, 8 /* PROPS */, ["modelValue"])
@@ -42106,7 +42153,6 @@ return (_ctx, _cache) => {
 
 };
 
-script$5.__scopeId = "data-v-38e9d5a6";
 script$5.__file = "src/gbt2260/index.vue";
 
 const _hoisted_1$4 = { key: 0 };