From 1bec8d69cf14bd88591eee5b0320c5c8f6c25a08 Mon Sep 17 00:00:00 2001
From: king <18310653075@163.com>
Date: 星期五, 08 三月 2024 21:19:31 +0800
Subject: [PATCH] Merge branch 'master' into positec

---
 src/templates/sharecomponent/actioncomponent/verifyexcelout/index.jsx |   73 +++++++++++++++++++++++++-----------
 1 files changed, 51 insertions(+), 22 deletions(-)

diff --git a/src/templates/sharecomponent/actioncomponent/verifyexcelout/index.jsx b/src/templates/sharecomponent/actioncomponent/verifyexcelout/index.jsx
index 5acaeb6..21d53fe 100644
--- a/src/templates/sharecomponent/actioncomponent/verifyexcelout/index.jsx
+++ b/src/templates/sharecomponent/actioncomponent/verifyexcelout/index.jsx
@@ -68,7 +68,7 @@
         editable: true,
         required: false,
         keyCol: true,
-        width: '12%',
+        width: '8%',
         render: (text) => {
           if (text === 'image') {
             return '鍥剧墖'
@@ -90,7 +90,7 @@
         inputType: 'radio',
         editable: true,
         required: false,
-        width: '12%',
+        width: '10%',
         render: (text) => {
           if (text !== 'false') {
             return '鏄�'
@@ -122,11 +122,33 @@
         editable: true,
         required: false,
         keyVals: ['number'],
-        width: '12%',
+        width: '10%',
         render: (text, record) => {
           if (record.type !== 'number') return ''
 
           if (text === 'true') {
+            return '鏄�'
+          } else {
+            return '鍚�'
+          }
+        },
+        options: [
+          {value: 'true', text: '鏄�'},
+          {value: 'false', text: '鍚�'}
+        ]
+      },
+      {
+        title: '0鍊煎鍑�',
+        dataIndex: 'noValue',
+        inputType: 'radio',
+        editable: true,
+        required: false,
+        keyVals: ['number'],
+        width: '10%',
+        render: (text, record) => {
+          if (record.type !== 'number') return ''
+
+          if (text !== 'false') {
             return '鏄�'
           } else {
             return '鍚�'
@@ -235,6 +257,7 @@
       col.type = col.type || 'text'
       col.output = col.output || 'true'
       col.required = col.required || 'false'
+      col.noValue = col.noValue || 'true'
 
       if (!['text', 'image', 'number'].includes(col.type)) {
         if (/^Decimal/ig.test(col.type)) {
@@ -411,7 +434,7 @@
     })
   }
 
-  columnChange = (values) => {
+  columnChange = (values, callback) => {
     let verify = JSON.parse(JSON.stringify(this.state.verify))
 
     let fields = verify.columns.map(item => item.Column)
@@ -422,6 +445,8 @@
         duration: 5
       })
       return
+    } else {
+      callback()
     }
     values.uuid = Utils.getuuid()
     values.abs = 'false'
@@ -528,6 +553,26 @@
         return
       }
 
+      if (verify.dataType === 'custom') {
+        if (this.scriptsForm && this.scriptsForm.props.form.getFieldValue('sql') && !/^\s+$/.test(this.scriptsForm.props.form.getFieldValue('sql'))) {
+          notification.warning({
+            top: 92,
+            message: '瀛樺湪鏈繚瀛樿剼鏈紝璇风偣鍑荤‘瀹氫繚瀛橈紝鎴栫偣鍑诲彇娑堟斁寮冧慨鏀癸紒',
+            duration: 5
+          })
+          this.setState({activeKey: 'scripts'})
+          return
+        }
+      }
+      if (this.columnRef && this.columnRef.state.editingKey) {
+        notification.warning({
+          top: 92,
+          message: '瀛楁鏈繚瀛橈紒',
+          duration: 5
+        })
+        return
+      }
+
       if (card.intertype === 'system' && verify.dataType !== 'custom' && verify.columns.length > 0 && config.$c_ds && config.setting.interType === 'system' && config.columns && config.columns.length > 0) {
         let cols = []
         let columns = config.columns.map(c => c.field)
@@ -585,15 +630,6 @@
           })
         })
       } else if (activeKey === 'columns') {
-        if (this.columnRef && this.columnRef.state.editingKey) {
-          notification.warning({
-            top: 92,
-            message: '瀛楁鏈繚瀛橈紒',
-            duration: 5
-          })
-          return
-        }
-
         if (this.props.card.intertype !== 'system' || verify.dataType !== 'custom') {
           resolve(verify)
         } else {
@@ -612,15 +648,6 @@
           }, verify.scripts)
         }
       } else if (activeKey === 'scripts') {
-        if (this.scriptsForm && this.scriptsForm.props.form.getFieldValue('sql') && !/^\s+$/.test(this.scriptsForm.props.form.getFieldValue('sql'))) {
-          notification.warning({
-            top: 92,
-            message: '瀛樺湪鏈繚瀛樿剼鏈紝璇风偣鍑荤‘瀹氫繚瀛橈紝鎴栫偣鍑诲彇娑堟斁寮冧慨鏀癸紒',
-            duration: 5
-          })
-          return
-        }
-  
         this.setState({loading: true})
         this.sqlverify(() => { // 楠岃瘉鎴愬姛
           this.setState({
@@ -775,6 +802,8 @@
       col.type = col.type || 'text'
       col.output = col.output || 'true'
       col.required = col.required || 'false'
+      col.noValue = col.noValue || 'true'
+      col.Width = col.Width || 20
 
       if (!['text', 'image', 'number'].includes(col.type)) {
         if (/^Decimal/ig.test(col.type)) {

--
Gitblit v1.8.0