iZaiZaiA 2 anos atrás
pai
commit
2eaeb53c8a

+ 19 - 1
src/components/plugins/table-form/hc-form-select-search.vue

@@ -7,6 +7,8 @@
 <script setup>
 import {ref, watch} from 'vue'
 import {getDapSiteData} from "~api/other"
+import {getObjNullValue} from "vue-utils-plus"
+
 const props = defineProps({
     val: {
         type: [Number,String],
@@ -74,8 +76,24 @@ const getDapSiteDataApi = async (query, key) => {
             pkId: props.pkeyid,
             key: key
         }, false)
+        //处理数据
+        //const resData = getObjNullValue(data)
+        /*if (!error && code === 200 && resData) {
+
+        } else {
+
+        }*/
+        const resData = {
+            JGX1: {
+                key_16__10_0: '123456',
+                key_16__10_1: 'abc123465',
+            },
+            JGX2: {
+                key_16__10_0: '123abc',
+                key_16__10_1: '123abc465',
+            }
+        }
 
-        console.log(data)
     }
 }
 

+ 14 - 13
src/views/data-fill/components/ListItem.vue

@@ -128,7 +128,6 @@ import {ref,watch,nextTick} from "vue";
 import notableform from '~src/assets/view/notableform.svg';
 import HTableForm from "~src/plugins/HTableForm"
 import wbsApi from "~api/data-fill/wbs"
-import {getDapSiteData} from "~api/other"
 import HcUpload from "./HcUpload.vue"
 import {utilsText, isType, formValidate,deepClone} from "vue-utils-plus"
 
@@ -276,21 +275,23 @@ const getExcelHtml = async (item,index) => {
 
 //正则效验
 const setTableFormBlurReg = (pkeyId, event, key, reg, val, msg, item, index) => {
-    const dom = document.getElementById(key).parentElement
-    if (val && reg) {
-        let regx = new RegExp(reg);
-        let state = regx.test(val);
-        if (state) {
+    const dom = document.getElementById(key)?.parentElement ?? ''
+    if (dom) {
+        if (val && reg) {
+            let regx = new RegExp(reg);
+            let state = regx.test(val);
+            if (state) {
+                delete formRegExpJson.value[pkeyId]
+                dom.style = ''
+            } else {
+                formRegExpJson.value[pkeyId] = {key, reg, val, msg, state, nodeName: item.nodeName, itemId: `item-${index}-${item?.pkeyId}`}
+                dom.style = '--el-input-border-color: #fe0000'
+                window?.$message?.warning(msg)
+            }
+        } else {
             delete formRegExpJson.value[pkeyId]
             dom.style = ''
-        } else {
-            formRegExpJson.value[pkeyId] = {key, reg, val, msg, state, nodeName: item.nodeName, itemId: `item-${index}-${item?.pkeyId}`}
-            dom.style = '--el-input-border-color: #fe0000'
-            window?.$message?.warning(msg)
         }
-    } else {
-        delete formRegExpJson.value[pkeyId]
-        dom.style = ''
     }
 }