From c33ac9ddcdbed91bd2267bed2a96199441806a04 Mon Sep 17 00:00:00 2001
From: king <18310653075@163.com>
Date: 星期四, 22 九月 2022 17:00:15 +0800
Subject: [PATCH] 2022-09-22

---
 src/templates/sharecomponent/actioncomponent/verifyexcelout/index.jsx |   56 ++++++++++++++++++++++++++++++++++++++++----------------
 1 files changed, 40 insertions(+), 16 deletions(-)

diff --git a/src/templates/sharecomponent/actioncomponent/verifyexcelout/index.jsx b/src/templates/sharecomponent/actioncomponent/verifyexcelout/index.jsx
index e94f798..62d925c 100644
--- a/src/templates/sharecomponent/actioncomponent/verifyexcelout/index.jsx
+++ b/src/templates/sharecomponent/actioncomponent/verifyexcelout/index.jsx
@@ -39,14 +39,15 @@
         inputType: 'input',
         editable: true,
         unique: true,
-        width: '20%'
+        width: '17%'
       },
       {
         title: this.props.dict['model.name'],
         dataIndex: 'Text',
         inputType: 'input',
         editable: true,
-        width: '20%'
+        unique: true,
+        width: '17%'
       },
       {
         title: this.props.dict['model.form.columnWidth'],
@@ -55,25 +56,28 @@
         min: 5,
         max: 200,
         editable: true,
-        width: '14%',
+        width: '12%',
         render: (text) => text || 20
       },
       {
         title: '绫诲瀷',
         dataIndex: 'type',
-        inputType: 'radio',
+        inputType: 'select',
         editable: true,
         required: false,
-        width: '18%',
+        width: '14%',
         render: (text) => {
           if (text === 'image') {
             return '鍥剧墖'
+          } else if (text === 'number') {
+            return '鏁板��'
           } else {
             return '鏂囨湰'
           }
         },
         options: [
           {value: 'text', text: '鏂囨湰'},
+          {value: 'number', text: '鏁板��'},
           {value: 'image', text: '鍥剧墖'}
         ]
       },
@@ -95,6 +99,16 @@
           {value: 'true', text: '鏄�'},
           {value: 'false', text: '鍚�'}
         ]
+      },
+      {
+        title: '灏忔暟浣�',
+        dataIndex: 'decimal',
+        inputType: 'number',
+        min: 0,
+        max: 18,
+        editable: true,
+        required: false,
+        width: '12%'
       },
       {
         title: '瀵煎嚭',
@@ -155,13 +169,13 @@
         render: (text, record) => record.status === 'false' ?
           (
             <div style={{color: '#ff4d4f'}}>
-              {this.props.dict['model.status.forbidden']}
+              绂佺敤
               <StopOutlined style={{marginLeft: '5px'}} />
             </div>
           ) :
           (
             <div style={{color: '#26C281'}}>
-              {this.props.dict['model.status.open']}
+              鍚敤
               <CheckCircleOutlined style={{marginLeft: '5px'}}/>
             </div>
           )
@@ -317,11 +331,13 @@
   }
 
   handleEdit = (record, type) => {
+    let node = null
+
     if (type === 'scripts') {
       this.scriptsForm.edit(record)
+      node = document.getElementById('mk-exout-script')
     }
 
-    let node = document.getElementById('verify-excelout-box-tab').parentNode
 
     if (node && node.scrollTop) {
       let inter = Math.ceil(node.scrollTop / 10)
@@ -657,7 +673,7 @@
         this.setState({
           loading: true
         })
-        Api.getLocalConfig(param).then(res => {
+        Api.genericInterface(param).then(res => {
           this.setState({
             loading: false
           })
@@ -703,7 +719,7 @@
       if (fields.includes(item.field) || !item.field) return
       fields.push(item.field)
 
-      columns.push({
+      let cell = {
         Column: item.field,
         Text: item.label,
         Width: 20,
@@ -711,7 +727,14 @@
         output: 'true',
         type: 'text',
         uuid: Utils.getuuid()
-      })
+      }
+
+      if (item.type === 'number') {
+        cell.type = 'number'
+        cell.decimal = item.decimal
+      }
+
+      columns.push(cell)
     })
 
     this.setState({
@@ -740,7 +763,7 @@
   changeColumns = (columns) => {
     const { verify } = this.state
 
-    if (columns[0] && (columns[0].type !== 'image' && columns[0].type !== 'text')) {
+    if (columns[0] && (columns[0].type !== 'image' && columns[0].type !== 'text' && columns[0].type !== 'number')) {
       columns = columns.map(col => {
         let _cell = {
           uuid: Utils.getuuid(),
@@ -888,7 +911,7 @@
     param.timestamp = timestamp
     param.secretkey = Utils.encrypt('', timestamp)
 
-    Api.getLocalConfig(param).then(result => {
+    Api.genericInterface(param).then(result => {
       if (result.status) {
         _resolve()
       } else {
@@ -920,7 +943,8 @@
     }
 
     return (
-      <div id="verify-excelout-box-tab">
+      <div className="verify-excelout-box-tab">
+        {card.label ? <div className="mk-com-name">{card.label} - 楠岃瘉淇℃伅</div> : null}
         {loading && <Spin size="large" />}
         <Tabs activeKey={activeKey} className="excelout-verify-card-box" onChange={this.tabchange}>
           {card.intertype === 'system' ? <TabPane tab="鍩虹楠岃瘉" key="setting">
@@ -939,7 +963,7 @@
             <Button className="excel-col-add mk-red" title="娓呯┖Excel鍒�" onClick={this.clearField}>
               娓呯┖Excel鍒�
             </Button>
-            <div style={{color: '#959595', fontSize: '13px', paddingLeft: '10px'}}>濡傞渶瀵煎嚭搴忓彿锛岃浣跨敤瀛楁 $Index銆�</div>
+            <div style={{color: '#959595', fontSize: '13px', paddingLeft: '10px'}}>濡傞渶瀵煎嚭搴忓彿锛岃浣跨敤瀛楁 $Index锛涙暟鍊肩被鍨嬪鍑烘椂鍙繘琛屾暟鎹鐞嗭紙鍙栫粷瀵瑰�笺�佷繚鐣欏皬鏁颁綅锛夈��</div>
             <EditTable actions={['edit', 'move', 'copy', 'del']} type="excelcolumn" wrappedComponentRef={(inst) => this.columnRef = inst} data={verify.columns} columns={excelColumns} onChange={this.changeColumns}/>
           </TabPane>
           {card.intertype === 'system' ? <TabPane tab={
@@ -947,7 +971,7 @@
               鑷畾涔夎剼鏈�
               {verify.scripts.length ? <span className="count-tip">{verify.scripts.length}</span> : null}
             </span>
-          } key="scripts" disabled={verify.dataType !== 'custom'}>
+          } key="scripts" disabled={verify.dataType !== 'custom'} id="mk-exout-script">
             <CustomScript
               btn={card}
               sheet={verify.tableName}

--
Gitblit v1.8.0