From 137fb8ea6af2789b3238b22bac31d80bced41dfe Mon Sep 17 00:00:00 2001
From: king <18310653075@163.com>
Date: 星期三, 28 七月 2021 11:39:39 +0800
Subject: [PATCH] 2021-07-28

---
 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 8fb4902..f937f81 100644
--- a/src/templates/sharecomponent/actioncomponent/verifyexcelout/index.jsx
+++ b/src/templates/sharecomponent/actioncomponent/verifyexcelout/index.jsx
@@ -33,14 +33,14 @@
         inputType: 'input',
         editable: true,
         unique: true,
-        width: '25%'
+        width: '20%'
       },
       {
         title: this.props.dict['model.name'],
         dataIndex: 'Text',
         inputType: 'input',
         editable: true,
-        width: '25%'
+        width: '20%'
       },
       {
         title: this.props.dict['model.form.columnWidth'],
@@ -49,7 +49,26 @@
         min: 5,
         max: 200,
         editable: true,
-        width: '25%'
+        width: '20%'
+      },
+      {
+        title: '绫诲瀷',
+        dataIndex: 'type',
+        inputType: 'select',
+        editable: true,
+        required: false,
+        width: '20%',
+        render: (text) => {
+          if (text === 'image') {
+            return '鍥剧墖'
+          } else {
+            return '鏂囨湰'
+          }
+        },
+        options: [
+          {value: 'text', text: '鏂囨湰'},
+          {value: 'image', text: '鍥剧墖'}
+        ]
       },
       {
         title: '鍙栫粷瀵瑰��',
@@ -57,7 +76,7 @@
         inputType: 'select',
         editable: true,
         required: false,
-        width: '25%',
+        width: '20%',
         render: (text) => {
           if (text === 'true') {
             return '鏄�'
@@ -87,11 +106,18 @@
     if (card.intertype !== 'system') {
       _verify.enable = 'false'
     }
+    if (_verify.columns[0] && !_verify.columns[0].type) {
+      _verify.columns = _verify.columns.map(col => {
+        col.type = col.type || 'text'
+        return col
+      })
+    }
 
     let defaultscript = ''
     if (!_verify.script && card.intertype === 'system') {
       let search = this.formatSearch(config.search)
       search = Utils.joinMainSearchkey(search)
+      search = search.replace(/@\$@/ig, '')
       search = search ? 'where ' + search : ''
       
       defaultscript = `update ${config.setting.tableName || ''} set idefine5= idefine5+1 ,modifydate=getdate(),cdefine5='宸插鍑�',modifyuserid=@userid@ ${search}`
@@ -113,36 +139,37 @@
 
     let newsearches = []
     searches.forEach(search => {
+      if (!search.field) return
+      
       let item = {
         key: search.field,
         match: search.match,
         type: search.type,
         label: search.label,
-        value: `@${search.field}@`,
+        value: search.initval,
         required: search.required === 'true'
       }
       if (item.type === 'group') {
-        let copy = fromJS(item).toJS()
-        copy.key = search.datefield
+        item.key = search.datefield
+        item.type = 'daterange'
+        item.match = 'between'
+        item.value = [moment().format('YYYY-MM-DD'), moment().format('YYYY-MM-DD')].join(',')
 
-        item.value = `@${search.field}@`
-        item.match = '='
-        
-        copy.type = 'daterange'
-        copy.match = 'between'
-        copy.value = [`@${search.datefield}@`, `@${search.datefield}1@`]
-
-        if (search.transfer === 'true') {
-          newsearches.push(item)
-        }
-        newsearches.push(copy)
+        newsearches.push(item)
         return
+      } else if (item.type === 'date') {
+        item.value = moment().format('YYYY-MM-DD')
+      } else if (item.type === 'datemonth') {
+        item.value = moment().format('YYYY-MM')
       } else if (item.type === 'dateweek') {
-        item.value = [`@${search.field}@`, `@${search.field}1@`]
+        item.value = moment().format('YYYY-MM-DD')
       } else if (item.type === 'daterange') {
-        item.value = [`@${search.field}@`, `@${search.field}1@`]
-      } else if (item.type === 'multiselect') {
-        item.value = [`@${search.field}@`]
+        item.value = [moment().format('YYYY-MM-DD'), moment().format('YYYY-MM-DD')].join(',')
+      } else if (item.type === 'multiselect' || (item.type === 'checkcard' && search.multiple === 'true')) {
+        item.type = 'multi'
+        item.value = '@$@'
+      } else {
+        item.value = '@$@'
       }
       newsearches.push(item)
     })
@@ -370,6 +397,7 @@
         Text: item.label,
         Width: 20,
         abs: 'false',
+        type: 'text',
         uuid: Utils.getuuid()
       })
     })
@@ -428,6 +456,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>
             <EditTable actions={['edit', 'move', 'copy', 'del']} type="exceloutcolumn" data={verify.columns} columns={excelColumns} onChange={(columns) => this.setState({verify: {...verify, columns}})}/>
           </TabPane>
           {card.intertype === 'system' ? <TabPane tab={

--
Gitblit v1.8.0