From 1f5c6ac307a134dfa45b64c5723f2481ead9f213 Mon Sep 17 00:00:00 2001
From: king <18310653075@163.com>
Date: 星期日, 16 七月 2023 16:23:09 +0800
Subject: [PATCH] 2023-07-16

---
 src/templates/modalconfig/index.jsx |  739 +++++++++++++++++++++++++-------------------------------
 1 files changed, 330 insertions(+), 409 deletions(-)

diff --git a/src/templates/modalconfig/index.jsx b/src/templates/modalconfig/index.jsx
index 81a6c82..5e51140 100644
--- a/src/templates/modalconfig/index.jsx
+++ b/src/templates/modalconfig/index.jsx
@@ -1,32 +1,34 @@
 import React, {Component} from 'react'
 import PropTypes from 'prop-types'
-import {connect} from 'react-redux'
 import { is, fromJS } from 'immutable'
 import { DndProvider } from 'react-dnd'
 import HTML5Backend from 'react-dnd-html5-backend'
 import moment from 'moment'
-import { Button, Card, Modal, Collapse, notification, Icon, Popover, Switch } from 'antd'
+import { Button, Card, Modal, Collapse, notification, Switch } from 'antd'
+import { SettingOutlined } from '@ant-design/icons'
 
 import Api from '@/api'
 import Utils from '@/utils/utils.js'
-import zhCN from '@/locales/zh-CN/model.js'
-import enUS from '@/locales/en-US/model.js'
 import { getModalForm } from '@/templates/zshare/formconfig'
 
-import ModalForm from '@/templates/zshare/modalform'
-import DragElement from './dragelement'
 import SourceElement from './dragelement/source'
 import SettingForm from './settingform'
-import GroupForm from './groupform'
 import MenuForm from './menuform'
 import asyncComponent from '@/utils/asyncComponent'
 import { BaseConfig, SearchItems } from './source'
+import { updateForm } from '@/utils/utils-update.js'
+import MKEmitter from '@/utils/events.js'
 import './index.scss'
 
 const { Panel } = Collapse
 const { confirm } = Modal
-const CommonDict = localStorage.getItem('lang') !== 'en-US' ? zhCN : enUS
+
+const Versions = asyncComponent(() => import('@/menu/versions'))
+const ReplaceField = asyncComponent(() => import('@/menu/replaceField'))
+const StyleController = asyncComponent(() => import('@/menu/stylecontroller'))
+const ModalForm = asyncComponent(() => import('@/templates/zshare/modalform'))
 const EditComponent = asyncComponent(() => import('@/templates/zshare/editcomponent'))
+const DragElement = asyncComponent(() => import('./dragelement'))
 const TableComponent = asyncComponent(() => import('@/templates/sharecomponent/tablecomponent'))
 const FieldsComponent = asyncComponent(() => import('@/templates/sharecomponent/fieldscomponent'))
 
@@ -46,8 +48,6 @@
 
   state = {
     menu: null,            // 涓婄骇鑿滃崟锛屼笁绾ц彍鍗曟垨鏍囩
-    dict: CommonDict,      // 瀛楀吀
-    tableFields: [],       // 宸查�夌殑甯哥敤琛�
     config: null,          // 椤甸潰閰嶇疆锛屽寘鎷ā鏉跨被鍨嬨�佹ā鎬佹璁剧疆銆佹坊鍔犺〃鍚嶃�佽〃鍗曞垪琛�
     visible: false,        // 琛ㄥ崟缂栬緫妯℃�佹锛屾樉绀烘帶鍒�
     modalformlist: null,   // 鍩烘湰淇℃伅琛ㄥ崟瀛楁
@@ -58,8 +58,6 @@
     settingVisible: false, // 鍏ㄥ眬閰嶇疆妯℃�佹
     closeVisible: false,   // 鍏抽棴妯℃�佹
     originConfig: null,    // 鍘熷鑿滃崟
-    groupVisible: false,   // 鍏ㄥ眬閰嶇疆妯℃�佹
-    curgroup: null,        // 褰撳墠缁勶紝鏂板缓鎴栫紪杈�
     sqlVerifing: false,    // sql楠岃瘉
     openEdition: '',       // 缂栬緫鐗堟湰鏍囪锛岄槻姝㈠浜烘搷浣�
     showField: false       // 鏄剧ず琛ㄥ崟瀛楁鍊�
@@ -98,28 +96,19 @@
 
     // 涓昏彍鍗曞凡鏈夐�夋嫨鐨勮〃鍚嶏紝妯℃�佹娌℃湁琛ㄥ悕鏃讹紝澶嶅埗涓昏彍鍗曡〃鍚�
     _config.tables = _config.tables.length === 0 ? _menu.tables : _config.tables
-
-    let _source = fromJS(SearchItems).toJS()
-    if (!!this.props.editTab) {
-      _source.push({
-        type: 'form',
-        label: this.state.dict['header.form.linkMain'],
-        subType: 'linkMain',
-        url: ''
-      })
-    }
+    
+    _config = updateForm(_config)
 
     this.setState({
       openEdition: editAction.open_edition || '',
       menu: _menu,
-      source: _source,
       config: _config,
       originConfig: fromJS(_config).toJS(),
       modalformlist: [
         {
           type: 'text',
           key: 'supMenu',
-          label: this.state.dict['model.super'] + this.state.dict['model.menu'],
+          label: '涓婄骇鑿滃崟',
           initVal: _menu.MenuName,
           required: true,
           readonly: true
@@ -136,13 +125,46 @@
     })
   }
 
+  componentDidMount() {
+    window.GLOB.formId = ''
+    MKEmitter.addListener('submitStyle', this.getStyle)
+    document.onkeydown = (event) => {
+      let e = event || window.event
+      let keyCode = e.keyCode || e.which || e.charCode
+      let preKey = ''
+
+      if (e.ctrlKey) {
+        preKey = 'ctrl'
+      }
+      if (e.shiftKey) {
+        preKey = 'shift'
+      } else if (e.altKey) {
+        preKey = 'alt'
+      }
+      
+      if (!preKey || !keyCode) return
+      
+      let _shortcut = `${preKey}+${keyCode}`
+
+      if (_shortcut === 'ctrl+83') {
+        let node = document.getElementById('save-config')
+        if (node && node.click) {
+          node.click()
+        }
+        return false
+      }
+    }
+  }
+
   /**
    * @description 缁勪欢閿�姣侊紝娓呴櫎state鏇存柊
    */
   componentWillUnmount () {
+    MKEmitter.removeListener('submitStyle', this.getStyle)
     this.setState = () => {
       return
     }
+    document.onkeydown = () => {}
   }
 
   // 椤甸潰杩斿洖
@@ -167,84 +189,44 @@
     this.props.handleView(param)
   }
 
+  getStyle = (comIds, style) => {
+    const { config } = this.state
+
+    if (comIds[0] !== 'form') return
+
+    let Index = config.fields.findIndex(n => n.uuid === comIds[1])
+
+    if (Index === -1) return
+    
+    let _config = fromJS(config).toJS()
+
+    _config.fields[Index].style = style
+
+    this.setState({
+      config: _config
+    })
+  }
+
   /**
    * @description 琛ㄥ崟鍙樺寲
    * 1銆佽〃鍗曟嫋鎷芥坊鍔犳椂锛屾鏌ユ槸鍚﹀瓨鍦ㄧず渚嬭〃鍗曪紝濡傚瓨鍦ㄥ垯鍘婚櫎绀轰緥
    * 2銆佽〃鍗曠Щ鍔ㄥ悗锛屼繚瀛樼Щ鍔ㄥ悗鐨勯『搴�
    * 3銆佹柊澧炶〃鍗曟椂锛岀洿鎺ユ墦寮�缂栬緫妗�
    */
-  handleList = (list, group, elementId, newcard) => {
+  handleList = (list, newcard) => {
     let _config = fromJS(this.state.config).toJS()
 
-    if (!group && !elementId) {
-      // 娌℃湁鍒嗙粍鏃讹紙鎷栨嫿娣诲姞锛�
-      if (list.length > _config.fields.length) {
-        _config.fields = list.filter(item => !item.origin)
-  
-        this.setState({
-          config: _config
-        }, () => {
-          this.handleForm(newcard)
-        })
-      } else {
-        _config.fields = list
-        this.setState({config: _config})
-      }
-    } else if (group && !elementId) {
-      // 瀛樺湪鍒嗙粍鏃讹紝鎷栨嫿娣诲姞
-      if (list.length > group.sublist.length) {
-        group.sublist = list
-        _config.groups = _config.groups.map(item => {
-          if (item.uuid === group.uuid) {
-            return group
-          } else {
-            return item
-          }
-        })
-  
-        this.setState({
-          config: _config
-        }, () => {
-          this.handleForm(newcard)
-        })
-      } else {
-        group.sublist = list
-        _config.groups = _config.groups.map(item => {
-          if (item.uuid === group.uuid) {
-            return group
-          } else {
-            return item
-          }
-        })
-        this.setState({config: _config})
-      }
-    } else if (group && elementId) {
-      // 淇敼宸叉湁鍏冪礌鐨勫垎缁�
-      let element = null
-      _config.groups.forEach(item => {
-        item.sublist = item.sublist.filter(cell => {
-          if (cell.uuid !== elementId) {
-            return true
-          } else {
-            element = cell
-            return false
-          }
-        })
-      })
-
-      group.sublist.push(element)
-
-      _config.groups = _config.groups.map(item => {
-        if (item.uuid === group.uuid) {
-          return group
-        } else {
-          return item
-        }
-      })
+    if (list.length > _config.fields.length) {
+      _config.fields = list.filter(item => !item.origin)
 
       this.setState({
         config: _config
+      }, () => {
+        this.handleForm(newcard)
       })
+    } else {
+      _config.fields = list
+      this.setState({config: _config})
     }
   }
 
@@ -256,47 +238,71 @@
    */
   handleForm = (_card) => {
     const { menu, tabConfig, subTabConfig } = this.props
-    let card = fromJS(_card).toJS()
     const { config } = this.state
+    let card = fromJS(_card).toJS()
     let _inputfields = []
     let _tabfields = []
     let _linkableFields = []
-    let _linksupFields = [{
-      value: '',
-      text: '绌�'
-    }]
-    let _formfields = []
-
-    // 璁剧疆涓嬫媺鑿滃崟鍙叧鑱斿瓧娈�(涓婄骇涓庝笅绾�)
-    if (config.groups.length > 0) {
-      config.groups.forEach(group => {
-        _formfields = [..._formfields, ...group.sublist]
-      })
-    } else {
-      _formfields = config.fields
-    }
-
-    _inputfields = _formfields.filter(item => item.type === 'text' || item.type === 'number' || item.type === 'textarea' || item.type === 'color')
-    _tabfields = _formfields.filter(item => card.field !== item.field && item.hidden !== 'true' && ['text', 'number', 'select', 'link'].includes(item.type))
-    _tabfields.unshift({field: '', text: '鍘熻〃鍗�'})
+    let _linksupFields = []
+    let standardform = null
 
     let uniq = new Map()
+    let index = null
     uniq.set(card.field, true)
-    _formfields.forEach(item => {
-      if (item.type !== 'select' && item.type !== 'link' && item.type !== 'radio') return
-      if (item.field && !uniq.has(item.field)) {
+
+    config.fields.forEach((item, i) => {
+      if (card.uuid === item.uuid) {
+        index = i
+      }
+
+      if (!item.field) return
+
+      if (['text', 'number', 'textarea', 'color'].includes(item.type) && card.field !== item.field) {
+        _inputfields.push({
+          field: item.field,
+          label: item.label
+        })
+      }
+      if (card.field !== item.field && item.hidden !== 'true' && ['text', 'number', 'select', 'link'].includes(item.type)) {
+        _tabfields.push({
+          field: item.field,
+          label: item.label
+        })
+      }
+
+      if (item.type === 'switch' || item.type === 'check') {
+        _linksupFields.push({
+          field: item.field,
+          label: item.label
+        })
+      }
+
+      if (!['select', 'link', 'radio', 'checkcard', 'multiselect'].includes(item.type)) return
+
+      _linksupFields.push({
+        field: item.field,
+        label: item.label
+      })
+
+      if (item.type === 'multiselect' || (item.type === 'checkcard' && item.multiple === 'true')) return
+
+      if (!uniq.has(item.field)) {
         uniq.set(item.field, true)
 
         _linkableFields.push({
-          value: item.field,
-          text: item.label + ' (琛ㄥ崟)'
-        })
-        _linksupFields.push({
-          value: item.field,
-          text: item.label
+          field: item.field,
+          label: item.label + '-琛ㄥ崟'
         })
       }
     })
+
+    if (index !== null) {
+      if (index === 0) {
+        standardform = config.fields[index + 1] || null
+      } else {
+        standardform = config.fields[index - 1] || null
+      }
+    }
 
     if (subTabConfig) {
       subTabConfig.columns.forEach(col => {
@@ -304,8 +310,8 @@
           uniq.set(col.field, true)
 
           _linkableFields.push({
-            value: col.field,
-            text: col.label + ' (鏄剧ず鍒�)'
+            field: col.field,
+            label: col.label + '-鏄剧ず鍒�'
           })
         }
       })
@@ -315,8 +321,8 @@
           uniq.set(col.field, true)
 
           _linkableFields.push({
-            value: col.field,
-            text: col.label + ' (鏄剧ず鍒�)'
+            field: col.field,
+            label: col.label + '-鏄剧ず鍒�'
           })
         }
       })
@@ -326,8 +332,8 @@
           uniq.set(col.field, true)
 
           _linkableFields.push({
-            value: col.field,
-            text: col.label + ' (鏄剧ず鍒�)'
+            field: col.field,
+            label: col.label + '-鏄剧ず鍒�'
           })
         }
       })
@@ -338,10 +344,19 @@
       card.linkSubField = card.linkSubField.filter(item => fields.includes(item))
     }
 
+    if (!card.span && standardform && standardform.span) {
+      card.span = standardform.span
+      card.labelwidth = standardform.labelwidth
+    } else if (!card.span) {
+      card.span = 12
+      card.labelwidth = 33.3
+    }
+
     this.setState({
+      standardform,
       visible: true,
       card: card,
-      formlist: getModalForm(card, _inputfields, _tabfields, _linkableFields, _linksupFields, !!this.props.editTab)
+      formlist: getModalForm(card, _inputfields, _tabfields, _linkableFields, _linksupFields)
     })
   }
 
@@ -355,39 +370,21 @@
     this.formRef.handleConfirm().then(res => {
       let _config = fromJS(this.state.config).toJS()
       let fieldrepet = false // 瀛楁閲嶅
-      let labelrepet = false // 鎻愮ず鏂囧瓧閲嶅
 
-      if (_config.groups.length > 0) {
-        _config.groups.forEach(group => {
-          group.sublist = group.sublist.map(item => {
-            if (item.uuid !== res.uuid && item.field.toLowerCase() === res.field.toLowerCase()) {
-              fieldrepet = true
-            } else if (item.uuid !== res.uuid && item.label === res.label) {
-              labelrepet = true
-            }
+      _config.fields = _config.fields.map(item => {
+        if (item.uuid !== res.uuid && res.field && item.field && item.field.toLowerCase() === res.field.toLowerCase()) {
+          fieldrepet = true
+        }
 
-            if (item.uuid === res.uuid) {
-              return res
-            } else {
-              return item
-            }
-          })
-        })
-      } else {
-        _config.fields = _config.fields.map(item => {
-          if (item.uuid !== res.uuid && item.field.toLowerCase() === res.field.toLowerCase()) {
-            fieldrepet = true
-          } else if (item.uuid !== res.uuid && item.label === res.label) {
-            labelrepet = true
+        if (item.uuid === res.uuid) {
+          if (item.style) {
+            res.style = item.style
           }
-
-          if (item.uuid === res.uuid) {
-            return res
-          } else {
-            return item
-          }
-        })
-      }
+          return res
+        } else {
+          return item
+        }
+      })
 
       if (fieldrepet) {
         notification.warning({
@@ -396,38 +393,36 @@
           duration: 10
         })
         return
-      } else if (labelrepet) {
-        notification.warning({
-          top: 92,
-          message: '鍚嶇О宸插瓨鍦紒',
-          duration: 10
-        })
-        return
       }
 
       _config.fields = _config.fields.filter(item => !item.origin)
 
-      if ((res.type === 'select' || res.type === 'multiselect' || res.type === 'link') && res.resourceType === '1' && /\s/.test(res.dataSource)) {
+      window.GLOB.formId = res.uuid
+
+      if (['select', 'multiselect', 'link', 'checkbox', 'radio', 'checkcard'].includes(res.type) && res.resourceType === '1' && /\s/.test(res.dataSource)) {
         this.setState({
           sqlVerifing: true
         })
 
         let param = {
           func: 's_debug_sql',
-          LText: res.dataSource
+          exec_type: 'y',
+          LText: `declare @mk_departmentcode nvarchar(512),@mk_organization nvarchar(512),@mk_user_type nvarchar(20)
+            ${res.dataSource}`
         }
 
-        param.LText = param.LText.replace(/@\$|\$@/ig, '')
+        param.timestamp = moment().format('YYYY-MM-DD HH:mm:ss')
+        param.LText = param.LText.replace(/@\$|\$@/ig, '').replace(/@(BID|ID|LoginUID|SessionUid|UserID|Appkey|time_id)@/ig, `'${param.timestamp}'`)
+        param.LText = param.LText.replace(/\n/g, ' ')
         
         param.LText = Utils.formatOptions(param.LText)
-        param.timestamp = moment().format('YYYY-MM-DD HH:mm:ss')
-        param.secretkey = Utils.encrypt(param.LText, param.timestamp)
+        param.secretkey = Utils.encrypt('', param.timestamp)
 
         if (window.GLOB.mainSystemApi && res.database === 'sso') {
           param.rduri = window.GLOB.mainSystemApi
         }
         
-        Api.getLocalConfig(param).then(result => {
+        Api.genericInterface(param).then(result => {
           if (result.status) {
             this.setState({
               sqlVerifing: false,
@@ -460,17 +455,10 @@
     let _this = this
 
     confirm({
-      content: `纭畾鍒犻櫎<<${card.label}>>鍚楋紵`,
+      content: `纭畾鍒犻櫎${card.label ? `<<${card.label}>>` : ''}鍚楋紵`,
       onOk() {
         let _config = fromJS(_this.state.config).toJS()
-
-        if (_config.groups.length > 0) {
-          _config.groups.forEach(group => {
-            group.sublist = group.sublist.filter(item => !(item.uuid === card.uuid))
-          })
-        } else {
-          _config.fields = _config.fields.filter(item => !(item.uuid === card.uuid))
-        }
+        _config.fields = _config.fields.filter(item => !(item.uuid === card.uuid))
 
         _this.setState({
           config: _config,
@@ -484,7 +472,7 @@
     const { editAction } = this.props
     const { config, menu, openEdition } = this.state
 
-    if ((!config.groups[0] && !config.fields[0]) || (config.fields[0] && config.fields[0].origin)) {
+    if (config.fields[0] && config.fields[0].origin) {
       notification.warning({
         top: 92,
         message: '璇锋坊鍔犺〃鍗�',
@@ -587,18 +575,6 @@
   }
 
   /**
-   * @description 鏇存柊甯哥敤琛ㄤ俊鎭紝蹇嵎娣诲姞鍚庢洿鏂伴厤缃俊鎭�
-   */
-  updatetable = (config, fields) => {
-    const { tableFields } = this.state
-
-    this.setState({
-      config: config,
-      tableFields: fields ? fields : tableFields
-    })
-  }
-
-  /**
    * @description 鍏ㄥ眬璁剧疆妯℃�佹
    */
   changeSetting = () => {
@@ -620,115 +596,12 @@
     })
   }
 
-  handleGroup = (group) => {
-    let curgroup = ''
-
-    if (group) {
-      curgroup = group
-    } else {
-      curgroup = {
-        isnew: true,
-        label: '',
-        default: false,
-        uuid: Utils.getuuid(),
-        sublist: []
-      }
-    }
-
-    this.setState({
-      groupVisible: true,
-      curgroup: curgroup
-    })
-  }
-
-  closeGroup = (group) => {
-    let _this = this
-
-    confirm({
-      content: `纭畾鍒犻櫎鍒嗙粍<<${group.label}>>鍚楋紵`,
-      onOk() {
-        let _config = fromJS(_this.state.config).toJS()
-        _config.groups = _config.groups.filter(item => !(item.uuid === group.uuid))
-        let _length = _config.groups.length
-        
-        if (_length === 1) {
-          _config.fields = [...group.sublist, ..._config.groups[0].sublist]
-          _config.groups = []
-        } else {
-          _config.groups[_length - 1].sublist = [...group.sublist, ..._config.groups[_length - 1].sublist]
-        }
-
-        _this.setState({
-          config: _config
-        })
-      },
-      onCancel() {}
-    })
-  }
-
-  handleGroupSave = () => {
-    let _group = fromJS(this.state.curgroup).toJS()
-    let config = fromJS(this.state.config).toJS()
-
-    this.groupRef.handleConfirm().then(res => {
-      _group = {..._group, ...res.target}
-
-      if (_group.isnew) {
-        delete _group.isnew
-        config.groups.unshift(_group)
-
-        if (config.groups.length > 1) {
-          config.groups = config.groups.map(item => {
-            if (item.default) {
-              return res.default
-            } else {
-              return item
-            }
-          })
-        } else {
-          config.groups.push(res.default)
-        }
-      } else {
-        config.groups = config.groups.map(item => {
-          if (item.uuid === _group.uuid) {
-            return _group
-          } else if (item.default) {
-            return res.default
-          } else {
-            return item
-          }
-        })
-      }
-
-      config.fields = []
-
-      config.groups = config.groups.sort((a, b) => {
-        return a.sort - b.sort
-      })
-      
-      this.setState({
-        groupVisible: false,
-        curgroup: '',
-        config: config
-      })
-    })
-  }
-
   editModalCancel = () => {
     const { config, card } = this.state
 
     if (card.focus) {
-      let _config = null
-      if (config.groups.length > 0) {
-        let _groups = config.groups.map(group => {
-          group.sublist = group.sublist.filter(item => item.uuid !== card.uuid)
-          return group
-        })
-        _config = {...config, groups: _groups}
-      } else {
-        let _fields = config.fields.filter(item => item.uuid !== card.uuid)
-        _config = {...config, fields: _fields}
-      }
+      let _fields = config.fields.filter(item => item.uuid !== card.uuid)
+      let _config = {...config, fields: _fields}
 
       this.setState({
         card: null,
@@ -744,18 +617,6 @@
   }
 
   /**
-   * @description 缂栬緫鍔熻兘瀹屾垚鏇存柊锛屽寘鎷В鍐绘寜閽�佺矘璐淬�佹浛鎹㈢瓑
-   */
-  updateEditConfig = (res) => {
-    if (res.type === 'paste') {
-      this.setState({
-        config: res.config
-      })
-      this.handleForm(res.newform)
-    }
-  }
-
-  /**
    * @description 鏇存柊閰嶇疆淇℃伅
    */
   updateconfig = (config) => {
@@ -764,107 +625,192 @@
     })
   }
 
-  render () {
-    const { config, source, dict } = this.state
+  changecols = (type) => {
+    let config = fromJS(this.state.config).toJS()
+    let _this = this
 
+    config.fields = config.fields.map(item => {
+      item.labelwidth = 33.3
+      item.span = 24
+      if (['textarea','split','hint','checkcard','brafteditor'].includes(item.type)) {
+        if (type === 2) {
+          item.labelwidth = 16.3
+        } else if (type === 3) {
+          item.labelwidth = 10.5
+        } else if (type === 4) {
+          item.labelwidth = 8.3
+        }
+      } else if (type === 2) {
+        item.span = 12
+      } else if (type === 3) {
+        item.span = 8
+      } else if (type === 4) {
+        item.span = 6
+      }
+      return item
+    })
+    
+    confirm({
+      content: `纭畾鍒囨崲涓�${type}鍒楀悧锛焋,
+      onOk() {
+        _this.setState({config})
+      },
+      onCancel() {}
+    })
+  }
+
+  refreshConfig = () => {
+    const { editAction } = this.props
+    
+    let param = {
+      func: 'sPC_Get_LongParam',
+      MenuID: editAction.uuid
+    }
+
+    Api.getSystemConfig(param).then(res => {
+      if (res.status) {
+        let _config = ''
+        if (res.LongParam) {
+          try {
+            _config = JSON.parse(window.decodeURIComponent(window.atob(res.LongParam)))
+          } catch (e) {
+            console.warn('Parse Failure')
+            _config = ''
+          }
+        }
+
+        if (!_config) {
+          notification.warning({
+            top: 92,
+            message: '鏈幏鍙栧埌閰嶇疆淇℃伅锛�',
+            duration: 5
+          })
+          return
+        }
+
+        // 鐗堟湰鍏煎
+        _config = updateForm(_config)
+
+        this.setState({
+          config: null
+        }, () => {
+          this.setState({
+            config: _config,
+            openEdition: res.open_edition || '',
+            originConfig: fromJS(_config).toJS()
+          })
+        })
+      } else {
+        notification.warning({
+          top: 92,
+          message: res.message,
+          duration: 5
+        })
+      }
+    })
+  }
+
+  plusFields = (items) => {
+    let _config = fromJS(this.state.config).toJS()
+
+    if (_config.fields[0] && _config.fields[0].origin) {
+      _config.fields = _config.fields.filter(item => !item.origin)
+    }
+
+    _config.fields.push(...items)
+
+    this.setState({
+      config: _config
+    }, () => {
+      if (items.length === 1 && items[0].focus) {
+        this.handleForm(items[0])
+      }
+    })
+  }
+
+  clearConfig = () => {
+    const _this = this
+    let _config = {...this.state.config, fields: []}
+
+    confirm({
+      content: '纭畾娓呯┖琛ㄥ崟鍚楋紵',
+      onOk() {
+        _this.setState({ config: _config })
+      },
+      onCancel() {}
+    })
+  }
+
+  render () {
+    const { editAction } = this.props
+    const { config, openEdition } = this.state
+
+    if (!config) return null
+    
     return (
       <div className="modal-form-board">
         <DndProvider backend={HTML5Backend}>
           <div className="tools">
             <Collapse accordion defaultActiveKey="1" bordered={false}>
-              <Panel forceRender={true} header={dict['header.menu.basedata']} key="0" id="modal-basedata">
-                <MenuForm
-                  dict={dict}
-                  formlist={this.state.modalformlist}
-                />
+              <Panel forceRender={true} header="鍩烘湰淇℃伅" key="0" id="modal-basedata">
+                <MenuForm formlist={this.state.modalformlist}/>
                 {/* 琛ㄥ悕娣诲姞 */}
                 <TableComponent
                   config={config}
                   containerId="modal-basedata"
-                  updatetable={this.updatetable}
+                  updatetable={this.updateconfig}
                 />
               </Panel>
-              <Panel header={dict['header.menu.form']} key="1">
+              <Panel header="琛ㄥ崟" key="1">
                 <div className="search-element">
-                  {source.map((item, index) => {
+                  {SearchItems.map((item, index) => {
                     return (<SourceElement key={index} content={item}/>)
                   })}
                 </div>
-                <FieldsComponent
-                  config={config}
-                  type="form"
-                  tableFields={this.state.tableFields}
-                  updatefield={this.updateconfig}
-                />
-                <Button type="primary" block onClick={() => this.handleGroup()}>{dict['header.menu.group.add']}</Button>
+                <FieldsComponent config={config} type="form" plusFields={this.plusFields}/>
               </Panel>
             </Collapse>
           </div>
           <div className="setting">
-            <Card title={dict['header.menu.form.configurable']} bordered={false} extra={
+            <Card title="琛ㄥ崟閰嶇疆" bordered={false} extra={
               <div>
-                <EditComponent dict={dict} options={['form']} config={this.state.config} refresh={this.updateEditConfig}/>
-                <Button type="primary" onClick={this.submitConfig} loading={this.state.menuloading}>{dict['model.save']}</Button>
-                <Button onClick={this.cancelConfig}>{dict['model.back']}</Button>
+                <Button type="danger" onClick={this.clearConfig}>娓呯┖</Button>
+                <Versions MenuId={editAction.uuid} open_edition={openEdition} updateConfig={this.refreshConfig}/>
+                <ReplaceField type="form" config={config} updateConfig={this.updateconfig}/>
+                <EditComponent options={['form']} type="formboard" config={this.state.config} plusFields={this.plusFields}/>
+                <Button type="primary" id="save-config" onClick={this.submitConfig} loading={this.state.menuloading}>淇濆瓨</Button>
+                <Button onClick={this.cancelConfig}>杩斿洖</Button>
               </div>
             } style={{ width: '100%' }}>
-              <Icon type="setting" onClick={this.changeSetting} />
-              <div className="ant-modal-content" style={{width: config.setting.width + '%'}}>
+              <SettingOutlined onClick={this.changeSetting} />
+              <div className="ant-modal-content" style={{width: config.setting.width > 100 ? config.setting.width : config.setting.width + '%'}}>
                 <div className="ant-modal-header">
                   <div className="ant-modal-title">{config.setting.title}</div>
-                  <Switch checkedChildren={dict['model.switch.open']} unCheckedChildren={dict['model.switch.close']} defaultChecked={this.state.showField} onChange={(val) => this.setState({showField: val})} />
+                  <Button className="mk-cols-change" onClick={() => this.changecols(1)}>1鍒�</Button>
+                  <Button className="mk-cols-change" onClick={() => this.changecols(2)}>2鍒�</Button>
+                  <Button className="mk-cols-change" onClick={() => this.changecols(3)}>3鍒�</Button>
+                  <Button className="mk-cols-change" onClick={() => this.changecols(4)}>4鍒�</Button>
+                  <Switch checkedChildren="寮�" unCheckedChildren="鍏�" defaultChecked={this.state.showField} onChange={(val) => this.setState({showField: val})} />
                 </div>
                 <div className="ant-modal-body">
                   <div className="modal-form">
-                    {config.groups.length > 0 &&
-                      config.groups.map(group => {
-                        return (
-                          <div key={group.uuid}>
-                            <div className="group-title">
-                              {!group.default ? <Popover overlayClassName="mk-popover-control-wrap" mouseLeaveDelay={0.2} mouseEnterDelay={0.2} content={
-                                <div className="mk-popover-control">
-                                  <Icon className="edit" type="edit" onClick={() => {this.handleGroup(group)}} />
-                                  <Icon className="edit close" type="close" onClick={() => {this.closeGroup(group)}} />
-                                </div>
-                              } trigger="hover">
-                                <span>{group.label}</span>
-                              </Popover> : null}
-                              {group.default ? <span style={{color: '#bcbcbc'}}>{group.label}</span> : null}
-                            </div>
-                            <DragElement
-                              group={group}
-                              list={group.sublist}
-                              setting={config.setting}
-                              showField={this.state.showField}
-                              placeholder={dict['header.form.modal.placeholder']}
-                              handleList={this.handleList}
-                              handleForm={this.handleForm}
-                              closeForm={this.closeForm}
-                            />
-                          </div>
-                        )
-                      })
-                    }
-                    {config.groups.length === 0 ?
-                      <DragElement
-                        list={config.fields}
-                        setting={config.setting}
-                        showField={this.state.showField}
-                        placeholder={dict['header.form.modal.placeholder']}
-                        handleList={this.handleList}
-                        handleForm={this.handleForm}
-                        closeForm={this.closeForm}
-                      /> : null
-                    }
+                    <DragElement
+                      list={config.fields}
+                      setting={config.setting}
+                      showField={this.state.showField}
+                      handleList={this.handleList}
+                      handleForm={this.handleForm}
+                      closeForm={this.closeForm}
+                    />
                   </div>
                 </div>
                 <div className="ant-modal-footer">
                   <div>
                     <button type="button" className="ant-btn">
-                      <span>{dict['model.cancel']}</span>
+                      <span>鍙栨秷</span>
                     </button>
                     <button type="button" className="ant-btn ant-btn-primary">
-                      <span>{dict['model.confirm']}</span>
+                      <span>纭畾</span>
                     </button>
                   </div>
                   <div className="action-mask"></div>
@@ -874,9 +820,9 @@
           </div>
         </DndProvider>
         <Modal
-          title={dict['model.edit']}
+          title="缂栬緫"
           visible={this.state.visible}
-          width={850}
+          width={950}
           maskClosable={false}
           onCancel={this.editModalCancel}
           onOk={this.handleSubmit}
@@ -884,17 +830,17 @@
           destroyOnClose
         >
           <ModalForm
-            dict={dict}
             card={this.state.card}
             formlist={this.state.formlist}
             inputSubmit={this.handleSubmit}
+            standardform={this.state.standardform}
             wrappedComponentRef={(inst) => this.formRef = inst}
           />
         </Modal>
         <Modal
-          title={dict['model.edit']}
+          title="缂栬緫"
           visible={this.state.settingVisible}
-          width={700}
+          width={900}
           maskClosable={false}
           onOk={this.settingSave}
           onCancel={() => { this.setState({ settingVisible: false }) }}
@@ -902,7 +848,6 @@
         >
           <SettingForm
             config={config}
-            dict={dict}
             isSubTab={!!this.props.editTab}
             inputSubmit={this.settingSave}
             wrappedComponentRef={(inst) => this.settingRef = inst}
@@ -915,42 +860,18 @@
           visible={this.state.closeVisible}
           onCancel={() => { this.setState({closeVisible: false}) }}
           footer={[
-            <Button key="save" className="mk-btn mk-green" loading={this.state.closeloading} onClick={this.submitConfig}>{dict['model.save']}</Button>,
-            <Button key="confirm" className="mk-btn mk-yellow" onClick={this.handleViewBack}>{dict['model.notsave']}</Button>,
-            <Button key="cancel" onClick={() => { this.setState({closeVisible: false}) }}>{dict['model.cancel']}</Button>
+            <Button key="save" className="mk-btn mk-green" loading={this.state.closeloading} onClick={this.submitConfig}>淇濆瓨</Button>,
+            <Button key="confirm" className="mk-btn mk-yellow" onClick={this.handleViewBack}>涓嶄繚瀛�</Button>,
+            <Button key="cancel" onClick={() => { this.setState({closeVisible: false}) }}>鍙栨秷</Button>
           ]}
           destroyOnClose
         >
-          {dict['header.menu.config.placeholder']}
+          閰嶇疆宸蹭慨鏀癸紝鏄惁淇濆瓨閰嶇疆淇℃伅锛�
         </Modal>
-        <Modal
-          title={dict['header.menu.group.manage']}
-          visible={this.state.groupVisible}
-          width={700}
-          maskClosable={false}
-          onOk={this.handleGroupSave}
-          onCancel={() => { this.setState({ groupVisible: false }) }}
-          destroyOnClose
-        >
-          <GroupForm
-            dict={dict}
-            config={config}
-            group={this.state.curgroup}
-            inputSubmit={this.handleGroupSave}
-            wrappedComponentRef={(inst) => this.groupRef = inst}
-          />
-        </Modal>
+        <StyleController />
       </div>
     )
   }
 }
 
-const mapStateToProps = () => {
-  return {}
-}
-
-const mapDispatchToProps = () => {
-  return {}
-}
-
-export default connect(mapStateToProps, mapDispatchToProps)(ComModalConfig)
\ No newline at end of file
+export default ComModalConfig
\ No newline at end of file

--
Gitblit v1.8.0