From 326aa6b3effaccc71cfe0775d47b0f29eb3695a6 Mon Sep 17 00:00:00 2001
From: king <18310653075@163.com>
Date: 星期日, 25 八月 2024 00:36:40 +0800
Subject: [PATCH] 2024-08-25

---
 src/menu/components/form/simple-form/index.jsx |  466 ++++++++++++++++++++++-----------------------------------
 1 files changed, 182 insertions(+), 284 deletions(-)

diff --git a/src/menu/components/form/simple-form/index.jsx b/src/menu/components/form/simple-form/index.jsx
index 20e3704..60e1f9f 100644
--- a/src/menu/components/form/simple-form/index.jsx
+++ b/src/menu/components/form/simple-form/index.jsx
@@ -1,15 +1,13 @@
 import React, {Component} from 'react'
 import PropTypes from 'prop-types'
 import { is, fromJS } from 'immutable'
-import { Popover, Modal, Button, Switch, notification } from 'antd'
-import { PlusOutlined, SettingOutlined, EditOutlined, ToolOutlined, DeleteOutlined, FontColorsOutlined } from '@ant-design/icons'
-import moment from 'moment'
+import { Popover, Modal, Button, Switch, message } from 'antd'
+import { PlusOutlined, SettingOutlined, EditOutlined, ToolOutlined, DeleteOutlined, SwapOutlined, FontColorsOutlined } from '@ant-design/icons'
 
-import Api from '@/api'
 import asyncComponent from '@/utils/asyncComponent'
 import asyncIconComponent from '@/utils/asyncIconComponent'
 import { getModalForm } from '@/templates/zshare/formconfig'
-import { resetStyle, getTables } from '@/utils/utils-custom.js'
+import { resetStyle, getTables, checkComponent, getInterfaces } from '@/utils/utils-custom.js'
 import MKEmitter from '@/utils/events.js'
 import Utils from '@/utils/utils.js'
 import getWrapForm from './options'
@@ -21,10 +19,10 @@
 const CardComponent = asyncComponent(() => import('@/templates/modalconfig/dragelement'))
 const MobCardComponent = asyncComponent(() => import('@/mob/components/formdragelement'))
 const FormAction = asyncComponent(() => import('../formaction'))
+const FormFork = asyncComponent(() => import('@/menu/modalconfig/formfork'))
 const NormalHeader = asyncComponent(() => import('@/menu/components/share/normalheader'))
 const CopyComponent = asyncIconComponent(() => import('@/menu/components/share/copycomponent'))
-const PasteComponent = asyncIconComponent(() => import('@/menu/components/share/pastecomponent'))
-const UserComponent = asyncIconComponent(() => import('@/menu/components/share/usercomponent'))
+const PasteForms = asyncIconComponent(() => import('@/menu/components/share/pasteforms'))
 const FieldsComponent = asyncComponent(() => import('@/templates/sharecomponent/fieldscomponent'))
 
 const { confirm } = Modal
@@ -44,8 +42,7 @@
     visible: false,
     editform: null,
     formlist: null,
-    sqlVerifing: false,
-    standardform: null
+    sqlVerifing: false
   }
 
   UNSAFE_componentWillMount () {
@@ -55,8 +52,6 @@
       let _card = {
         uuid: card.uuid,
         type: card.type,
-        tabId: card.tabId || '',
-        parentId: card.parentId || '',
         format: 'object',   // 缁勪欢灞炴�� - 鏁版嵁鏍煎紡
         pageable: false,    // 缁勪欢灞炴�� - 鏄惁鍙垎椤�
         switchable: false,  // 缁勪欢灞炴�� - 鏁版嵁鏄惁鍙垏鎹�
@@ -71,33 +66,13 @@
         scripts: [],
         subcards: [{
           uuid: Utils.getuuid(),
-          setting: {title: '绌�', align: 'left_right', enable: 'true'},
+          setting: {title: '', align: 'left_right', enable: 'true'},
           style: {},
           fields: [],
-          subButton: {label: '鎻愪氦', type: 'submit', intertype: 'system', reload: 'false', sqlType: 'update', sql: '', Ot: 'notRequired', execSuccess: 'never', enable: 'true', style: {backgroundColor: '#1890ff', color: '#ffffff', paddingLeft: '25px', paddingRight: '25px', paddingTop: '5px', paddingBottom: '5px'}},
+          subButton: {label: '鎻愪氦', type: 'submit', intertype: 'system', reload: 'false', sqlType: '', sql: '', Ot: 'notRequired', execSuccess: 'never', enable: 'true', style: {backgroundColor: '#1890ff', color: '#ffffff', paddingLeft: '25px', paddingRight: '25px', paddingTop: '5px', paddingBottom: '5px'}},
         }]
       }
 
-      if (card.config) {
-        let config = fromJS(card.config).toJS()
-
-        _card.wrap = config.wrap
-        _card.wrap.name = card.name
-        _card.style = config.style
-
-        _card.setting = config.setting
-        _card.columns = config.columns
-        _card.scripts = config.scripts
-
-        _card.subcards = config.subcards.map(scard => {
-          scard.uuid = Utils.getuuid()
-          scard.fields = scard.fields.map(elem => {
-            elem.uuid = Utils.getuuid()
-            return elem
-          })
-          return scard
-        })
-      }
       this.updateComponent(_card)
     } else {
       let _card = fromJS(card).toJS()
@@ -108,7 +83,7 @@
   }
 
   componentDidMount () {
-    MKEmitter.addListener('submitComponentStyle', this.updateComponentStyle)
+    MKEmitter.addListener('mkUpdateInter', this.mkUpdateInter)
   }
 
   shouldComponentUpdate (nextProps, nextState) {
@@ -122,24 +97,21 @@
     this.setState = () => {
       return
     }
-    MKEmitter.removeListener('submitComponentStyle', this.updateComponentStyle)
+    MKEmitter.removeListener('mkUpdateInter', this.mkUpdateInter)
   }
 
-  updateComponentStyle = (parentId, keys, style) => {
+  mkUpdateInter = (inter, split) => {
     const { card } = this.state
+    
+    if (card.wrap.datatype === 'public' && card.wrap.publicId === inter.uuid) {
+      let _card = {...card, columns: fromJS(inter.columns).toJS()}
 
-    if (card.uuid !== parentId) return
+      split.delay = split.delay + 10
 
-    let subcards = card.subcards.map(item => {
-      if (keys.includes(item.uuid)) {
-        item.style = {...item.style, ...style}
-      }
-      return item
-    })
-
-    this.setState({card: {...card, subcards: []}}, () => {
-      this.updateComponent({...card, subcards: subcards})
-    })
+      setTimeout(() => {
+        this.updateComponent(_card)
+      }, split.delay)
+    }
   }
 
   /**
@@ -149,50 +121,72 @@
     card.width = card.wrap.width
     card.name = card.wrap.name
     card.errors = []
+    let idCtrl = false
 
-    if (card.wrap.datatype !== 'static') {
+    if (card.wrap.datatype === 'dynamic') {
       let supModule = card.setting.supModule ? card.setting.supModule[card.setting.supModule.length - 1] || '' : ''
       if (supModule === 'empty') {
         supModule = ''
       }
-      let columns = card.columns.map(c => c.field)
 
-      if (card.setting.interType === 'system' && card.setting.execute !== 'false' && !card.setting.dataresource) {
-        card.errors.push({ level: 0, detail: '鏈缃暟鎹簮锛�'})
-      } else if (card.setting.interType === 'system' && card.setting.execute === 'false' && card.scripts.filter(script => script.status !== 'false').length === 0) {
-        card.errors.push({ level: 0, detail: '鏁版嵁婧愪腑鏃犲彲鐢ㄨ剼鏈紒'})
-      } else if (!card.setting.primaryKey) {
-        card.errors.push({ level: 0, detail: '鏈缃富閿紒'})
-      } else if (!columns.includes(card.setting.primaryKey)) {
-        card.errors.push({ level: 0, detail: '涓婚敭宸插け鏁堬紒'})
-      } else if (!card.setting.supModule) {
-        card.errors.push({ level: 0, detail: '鏈缃笂绾х粍浠讹紒'})
-      }
+      card.$c_ds = true
+      card.errors = checkComponent(card)
 
       if (card.errors.length === 0) {
         card.$tables = getTables(card)
       }
 
       card.subcards.forEach(item => {
+        if (item.subButton.intertype === 'system' && !item.subButton.sqlType) {
+          card.errors.push({ level: 0, detail: `${item.subButton.label} 鎸夐挳璇疯缃搷浣滅被鍨媊})
+        }
+        if (item.subButton.verify && !item.subButton.output) {
+          if (item.subButton.verify.noteEnable === 'true') {
+            card.errors.push({ level: 0, detail: `${item.subButton.label} 鎸夐挳鏈缃繑鍥炲�肩煭淇″彂閫佹棤鏁堬紒`})
+          } else if (item.subButton.verify.emailEnable === 'true') {
+            card.errors.push({ level: 0, detail: `${item.subButton.label} 鎸夐挳鏈缃繑鍥炲�奸偖浠跺彂閫佹棤鏁堬紒`})
+          }
+        }
         item.fields.forEach(m => {
+          if (m.dataSource && /@ID@/ig.test(m.dataSource)) {
+            idCtrl = true
+          }
           if (m.type === 'linkMain' && !supModule) {
             card.errors.push({ level: 1, detail: `璇锋鏌ュ叧鑱斾富琛ㄢ��${m.label}鈥濇槸鍚︽湁鏁坄})
           }
         })
       })
     } else {
-      let supModule = card.wrap.supModule ? card.wrap.supModule[card.wrap.supModule.length - 1] : ''
+      let supModule = ''
+      if (card.wrap.datatype === 'static') {
+        supModule = card.wrap.supModule ? card.wrap.supModule[card.wrap.supModule.length - 1] : ''
+      }
 
       card.$tables = getTables(card)
 
       card.subcards.forEach(item => {
+        if (item.subButton.intertype === 'system' && !item.subButton.sqlType) {
+          card.errors.push({ level: 0, detail: `${item.subButton.label} 鎸夐挳璇疯缃搷浣滅被鍨媊})
+        }
+        if (item.subButton.verify && !item.subButton.output) {
+          if (item.subButton.verify.noteEnable === 'true') {
+            card.errors.push({ level: 0, detail: `${item.subButton.label} 鎸夐挳鏈缃繑鍥炲�肩煭淇″彂閫佹棤鏁堬紒`})
+          } else if (item.subButton.verify.emailEnable === 'true') {
+            card.errors.push({ level: 0, detail: `${item.subButton.label} 鎸夐挳鏈缃繑鍥炲�奸偖浠跺彂閫佹棤鏁堬紒`})
+          }
+        }
         item.fields.forEach(m => {
-          if (m.type === 'linkMain' && !supModule) {
+          if (m.dataSource && /@ID@/ig.test(m.dataSource)) {
+            idCtrl = true
+          }
+          if (m.type === 'linkMain' && !supModule && card.wrap.datatype === 'static') {
             card.errors.push({ level: 1, detail: `璇锋鏌ュ叧鑱斾富琛ㄢ��${m.label}鈥濇槸鍚︽湁鏁坄})
           }
         })
       })
     }
+
+    card.idCtrl = idCtrl
 
     this.setState({
       card: card
@@ -218,7 +212,7 @@
   changeStyle = () => {
     const { card } = this.state
 
-    MKEmitter.emit('changeStyle', ['height', 'background', 'border', 'padding', 'margin', 'shadow'], card.style, this.getStyle)
+    MKEmitter.emit('changeStyle', ['height', 'background', 'border', 'padding', 'margin', 'shadow', 'clear', 'minHeight'], card.style, this.getStyle)
   }
 
   getStyle = (style) => {
@@ -247,7 +241,7 @@
   
   changecols = (type) => {
     let card = fromJS(this.state.card).toJS()
-    let _this = this
+    let that = this
 
     card.subcards[0].fields = card.subcards[0].fields.map(item => {
       item.labelwidth = 33.3
@@ -273,7 +267,7 @@
     confirm({
       content: `纭畾鍒囨崲涓�${type}鍒楀悧锛焋,
       onOk() {
-        _this.updateComponent(card)
+        that.updateComponent(card)
       },
       onCancel() {}
     })
@@ -294,14 +288,14 @@
 
   closeForm = (cell) => {
     let card = fromJS(this.state.card).toJS()
-    let _this = this
+    let that = this
 
     card.subcards[0].fields = card.subcards[0].fields.filter(item => item.uuid !== cell.uuid)
 
     confirm({
       content: `纭畾鍒犻櫎<<${cell.label}>>鍚楋紵`,
       onOk() {
-        _this.updateComponent(card)
+        that.updateComponent(card)
       },
       onCancel() {}
     })
@@ -346,114 +340,22 @@
     card.subcards[0].fields = card.subcards[0].fields.filter(item => !item.focus)
 
     this.setState({card, visible: false, editform: null})
+
+    this.updateComponent(card)
   }
 
   /**
    * @description 琛ㄥ崟缂栬緫
    */
   handleForm = (_item) => {
-    const { card, appType } = this.state
+    const { card } = this.state
+
     let _form = fromJS(_item).toJS()
-    let _inputfields = []
-    let _tabfields = []
-    let _linkableFields = []
-    let _linksupFields = []
-    let standardform = null
-
-    let uniq = new Map()
-    let index = null
-    uniq.set(_form.field, true)
-
-    let _inputIndex = 1
-    let _tabIndex = 1
-    let _linkIndex = 1
-    card.subcards[0].fields.forEach((item, i) => {
-      if (_form.uuid === item.uuid) {
-        index = i
-      }
-
-      let label = item.label || ''
-      if (item.field && item.field.toLowerCase() !== label.toLowerCase()) {
-        label = label + ' (' + item.field + ')'
-      }
-
-      if (['text', 'number', 'textarea', 'color'].includes(item.type) && _item.field !== item.field) {
-        _inputfields.push({
-          field: item.field,
-          label: _inputIndex + '銆�' + label
-        })
-        _inputIndex++
-      }
-      if (_form.field !== item.field && item.hidden !== 'true' && ['text', 'number', 'select', 'link'].includes(item.type)) {
-        _tabfields.push({
-          field: item.field,
-          label: _tabIndex + '銆�' + label
-        })
-        _tabIndex++
-      }
-
-      if (item.type === 'switch') {
-        _linksupFields.push({
-          field: item.field,
-          label: _linkIndex + '銆�' + label
-        })
-      }
-      
-      if (!['select', 'link', 'radio', 'checkcard'].includes(item.type)) return
-      if (item.type === 'checkcard' && item.multiple === 'true') return // 閫夐」鍗″閫�
-      if (item.field && !uniq.has(item.field)) {
-        uniq.set(item.field, true)
-
-        _linkableFields.push({
-          value: item.field,
-          text: _linkIndex + '銆�' + item.label + ' (琛ㄥ崟)'
-        })
-        _linksupFields.push({
-          value: item.field,
-          text: _linkIndex + '銆�' + label
-        })
-
-        _linkIndex++
-      }
-    })
-
-    _tabfields.unshift({field: '', label: '鍘熻〃鍗�'})
-
-    if (index !== null) {
-      if (index === 0) {
-        standardform = card.subcards[0].fields[index + 1] || null
-      } else {
-        standardform = card.subcards[0].fields[index - 1] || null
-      }
-    }
-
-    card.columns.forEach(col => {
-      if (col.field && !uniq.has(col.field)) {
-        uniq.set(col.field, true)
-
-        _linkableFields.push({
-          field: col.field,
-          label: _linkIndex + '銆�' + col.label + ' (鏄剧ず鍒�)'
-        })
-        _linkIndex++
-      }
-    })
-
-    if (_form.linkSubField && _form.linkSubField.length > 0) {
-      let fields = _inputfields.map(item => item.field)
-      _form.linkSubField = _form.linkSubField.filter(item => fields.includes(item))
-    }
-
-    if (appType !== 'mob' && !_form.span && standardform && standardform.span) {
-      _form.span = standardform.span
-      _form.labelwidth = standardform.labelwidth
-    }
 
     this.setState({
-      standardform,
       visible: true,
       editform: _form,
-      formlist: getModalForm(_form, _inputfields, _tabfields, _linkableFields, _linksupFields)
+      formlist: getModalForm(_form, card.subcards[0].fields, card.columns)
     })
   }
 
@@ -464,70 +366,33 @@
    * 3銆侀�氳繃loading鍒锋柊
    */
   handleSubmit = () => {
+    let _config = fromJS(this.state.card).toJS()
+
     this.formRef.handleConfirm().then(res => {
-      let _config = fromJS(this.state.card).toJS()
-      let fieldrepet = false // 瀛楁閲嶅
-
       _config.subcards[0].fields = _config.subcards[0].fields.map(item => {
-        if (item.uuid !== res.uuid && res.field && item.field && item.field.toLowerCase() === res.field.toLowerCase()) {
-          fieldrepet = true
-        }
+        delete item.focus
 
-        if (item.uuid === res.uuid) {
-          if (item.style) {
-            res.style = item.style
-          }
-          return res
+        if (item.uuid === res.values.uuid) {
+          return res.values
         } else {
           return item
         }
       })
 
-      if (fieldrepet) {
-        notification.warning({
-          top: 92,
-          message: '瀛楁宸插瓨鍦紒',
-          duration: 10
-        })
-        return
-      }
-
-      if (['select', 'multiselect', 'link', 'checkbox', 'radio', 'checkcard'].includes(res.type) && res.resourceType === '1' && /\s/.test(res.dataSource)) {
+      if (res.loading) {
         this.setState({
           sqlVerifing: true
         })
 
-        let param = {
-          func: 's_debug_sql',
-          exec_type: 'y',
-          LText: res.dataSource
-        }
-
-        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 = Utils.formatOptions(param.LText)
-        param.secretkey = Utils.encrypt('', param.timestamp)
-
-        if (window.GLOB.mainSystemApi && res.database === 'sso') {
-          param.rduri = window.GLOB.mainSystemApi
-        }
-        
-        Api.genericInterface(param).then(result => {
-          if (result.status) {
-            this.setState({
-              sqlVerifing: false,
-              editform: null,
-              visible: false
-            })
-            this.updateComponent(_config)
-          } else {
-            this.setState({sqlVerifing: false})
-            
-            Modal.error({
-              title: result.message
-            })
-          }
+        res.promise().then(() => {
+          this.setState({
+            sqlVerifing: false,
+            editform: null,
+            visible: false
+          })
+          this.updateComponent(_config)
+        }, () => {
+          this.setState({sqlVerifing: false})
         })
       } else {
         this.setState({
@@ -539,67 +404,45 @@
     })
   }
 
-  pasteForm = (res) => {
+  pasteForm = (forms, res) => {
     let _config = fromJS(this.state.card).toJS()
 
+    forms.forEach(item => {
+      delete item.focus
+    })
+
+    _config.subcards[0].fields = forms
+
     if (res.subButton) {
-      let _this = this
+      let that = this
 
-      _config.subcards[0].setting.focus = res.focus
-      _config.subcards[0].setting.cache = res.cache
-      _config.subcards[0].setting.align = res.align
-      _config.subcards[0].setting.enable = res.enable
-      _config.subcards[0].setting.verticalSpace = res.verticalSpace || ''
-      _config.wrap.focus = res.focus
-      _config.wrap.cache = res.cache
-      _config.wrap.align = res.align
-      _config.wrap.enable = res.enable
-      _config.wrap.verticalSpace = res.verticalSpace || ''
-
-      _config.subcards[0].subButton = res.subButton
+      // _config.subcards[0].setting.focus = res.focus
+      // _config.subcards[0].setting.cache = res.cache
+      // _config.subcards[0].setting.align = res.align
+      // _config.subcards[0].setting.enable = res.enable
+      // _config.subcards[0].setting.verticalSpace = res.verticalSpace || ''
+      // _config.wrap.focus = res.focus
+      // _config.wrap.cache = res.cache
+      // _config.wrap.align = res.align
+      // _config.wrap.enable = res.enable
+      // _config.wrap.verticalSpace = res.verticalSpace || ''
       
-      _config.subcards[0].fields = res.fields.map(item => {
-        item.uuid = Utils.getuuid()
-        return item
-      })
-
       confirm({
-        content: `鏇挎崲琛ㄥ崟鍙婃寜閽厤缃紵`,
+        content: '鏄惁鏇挎崲鎸夐挳閰嶇疆锛�',
+        okText: '鏄�',
+        cancelText: '鍚�',
         onOk() {
-          _this.updateComponent(_config)
+          _config.subcards[0].subButton = res.subButton
+          
+          that.updateComponent(_config)
         },
-        onCancel() {}
+        onCancel() {
+          that.updateComponent(_config)
+        }
       })
-      return
+    } else {
+      this.updateComponent(_config)
     }
-
-    let fieldrepet = false // 瀛楁閲嶅
-
-    _config.subcards[0].fields.forEach(item => {
-      if (res.field && item.field && item.field.toLowerCase() === res.field.toLowerCase()) {
-        fieldrepet = true
-      }
-    })
-
-    if (fieldrepet) {
-      notification.warning({
-        top: 92,
-        message: '瀛楁宸插瓨鍦紒',
-        duration: 10
-      })
-      return
-    }
-    _config.subcards[0].fields.push(res)
-
-    this.updateComponent(_config)
-
-    this.handleForm(res)
-
-    notification.success({
-      top: 92,
-      message: '绮樿创鎴愬姛锛�',
-      duration: 2
-    })
   }
 
   getWrapForms = () => {
@@ -607,13 +450,33 @@
   }
 
   updateWrap = (res) => {
-    let _card = {...this.state.card, wrap: res}
+    let _card = fromJS(this.state.card).toJS()
+    let buttons = res.buttons
+
+    delete res.buttons
+
+    res.enable = buttons.includes('enable') ? 'true' : 'false'
+    res.closeEnable = buttons.includes('closeEnable') ? 'true' : 'false'
+    res.resetEnable = buttons.includes('resetEnable') ? 'true' : 'false'
+
+    _card.wrap = res
 
     if (res.datatype === 'static') {
       if (res.supModule && res.supModule.length > 0) {
         _card.setting.supModule = res.supModule
       } else {
         _card.setting.supModule = ''
+      }
+    } else if (res.datatype === 'public') {
+      let interfaces = getInterfaces()
+
+      let d = interfaces.filter(m => m.value === res.publicId)[0]
+
+      if (d) {
+        _card.columns = fromJS(d.columns).toJS()
+
+        _card.setting = { interType: 'system' }
+        _card.scripts = []
       }
     }
 
@@ -622,20 +485,32 @@
     _card.subcards[0].setting.align = _card.wrap.align
     _card.subcards[0].setting.enable = _card.wrap.enable
     _card.subcards[0].setting.verticalSpace = _card.wrap.verticalSpace
+    _card.subcards[0].subButton.enable = _card.wrap.enable
+
+    if (_card.wrap.closeEnable === 'true' && !_card.subcards[0].closeButton) {
+      _card.subcards[0].closeButton = {label: '鍏抽棴', enable: 'true', type: 'close', style: {backgroundColor: '#ffffff', color: 'rgba(0,0,0,0.65)', borderColor: '#d9d9d9', borderWidth: '1px', paddingLeft: '25px', paddingRight: '25px', paddingTop: '5px', paddingBottom: '5px', marginLeft: '10px'}}
+    } else if (_card.subcards[0].closeButton) {
+      _card.subcards[0].closeButton.enable = _card.wrap.closeEnable
+    }
+    if (_card.wrap.resetEnable === 'true' && !_card.subcards[0].resetButton) {
+      _card.subcards[0].resetButton = {label: '閲嶇疆', enable: 'true', type: 'reset', style: {backgroundColor: '#ffffff', color: 'rgba(0,0,0,0.65)', borderColor: '#d9d9d9', borderWidth: '1px', paddingLeft: '25px', paddingRight: '25px', paddingTop: '5px', paddingBottom: '5px', marginLeft: '10px'}}
+    } else if (_card.subcards[0].resetButton) {
+      _card.subcards[0].resetButton.enable = _card.wrap.resetEnable
+    }
 
     this.updateComponent(_card)
   }
 
   clearGroup = () => {
     let card = fromJS(this.state.card).toJS()
-    let _this = this
+    let that = this
 
     card.subcards[0].fields = []
 
     confirm({
       content: `纭畾娓呯┖琛ㄥ崟鍚楋紵`,
       onOk() {
-        _this.updateComponent(card)
+        that.updateComponent(card)
       },
       onCancel() {}
     })
@@ -644,7 +519,13 @@
   clickComponent = (e) => {
     if (sessionStorage.getItem('style-control') === 'true' || sessionStorage.getItem('style-control') === 'component') {
       e.stopPropagation()
-      MKEmitter.emit('clickComponent', this.state.card)
+      MKEmitter.emit('clickComponent', this.state.card.uuid, null, (style) => {
+        let _card = {...this.state.card}
+        _card.style = {..._card.style, ...style}
+
+        this.setState({ card: _card })
+        this.props.updateConfig(_card)
+      })
     }
   }
 
@@ -660,25 +541,33 @@
               <EditOutlined style={{color: '#1890ff'}} title="缂栬緫"/>
             </NormalForm>
             <CopyComponent type="simpleform" card={card}/>
-            <PasteComponent config={card} options={['form', 'formgroup']} updateConfig={this.pasteForm} />
+            <PasteForms config={card.subcards[0]} update={this.pasteForm} />
             <FontColorsOutlined className="style" title="璋冩暣鏍峰紡" onClick={this.changeStyle}/>
-            <UserComponent config={card}/>
             <DeleteOutlined className="close" title="鍒犻櫎缁勪欢" onClick={() => this.props.deletecomponent(card.uuid)} />
-            {card.wrap.datatype !== 'static' ? <SettingComponent config={card} updateConfig={this.updateComponent} /> : null}
-            {card.wrap.datatype === 'static' ? <SettingOutlined style={{color: '#eeeeee', cursor: 'not-allowed'}}/> : null}
+            {card.wrap.datatype === 'dynamic' ? <SettingComponent config={card} updateConfig={this.updateComponent} /> : <SettingOutlined style={{color: '#eeeeee', cursor: 'not-allowed'}}/>}
           </div>
         } trigger="hover">
           <ToolOutlined />
         </Popover>
-        <div className="form-area">
+        <div className={`form-area mk-${card.wrap.formStyle || ''}`}>
           <PlusOutlined className="plus" title="娣诲姞琛ㄥ崟" onClick={this.addForm}/>
           <FieldsComponent config={card.subcards[0]} type="form" plusFields={this.plusFields} />
-          <span style={{color: 'red', marginLeft: '30px', cursor: 'pointer'}} onClick={this.clearGroup}>娓呯┖</span>
-          <Switch checkedChildren="寮�" unCheckedChildren="鍏�" defaultChecked={this.state.showField} onChange={(val) => this.setState({showField: val})} />
-          {appType !== 'mob' ? <Button className="mk-cols-change" onClick={() => this.changecols(1)}>1鍒�</Button> : null}
-          {appType !== 'mob' ? <Button className="mk-cols-change" onClick={() => this.changecols(2)}>2鍒�</Button> : null}
-          {appType !== 'mob' ? <Button className="mk-cols-change" onClick={() => this.changecols(3)}>3鍒�</Button> : null}
-          {appType !== 'mob' ? <Button className="mk-cols-change" onClick={() => this.changecols(4)}>4鍒�</Button> : null}
+          <div className="mk-form-tool">
+            <DeleteOutlined title="娓呯┖" onClick={this.clearGroup} />
+            {appType !== 'mob' ? <Popover title="鍒囨崲甯冨眬" overlayClassName="mk-popover-control-wrap" mouseLeaveDelay={0.2} mouseEnterDelay={0.2} content={
+              <>
+                <Button style={{marginRight: '10px'}} onClick={() => this.changecols(1)}>1鍒�</Button>
+                <Button style={{marginRight: '10px'}} onClick={() => this.changecols(2)}>2鍒�</Button>
+                <Button style={{marginRight: '10px'}} onClick={() => this.changecols(3)}>3鍒�</Button>
+                <Button onClick={() => this.changecols(4)}>4鍒�</Button>
+              </>
+            } trigger="hover">
+              <SwapOutlined />
+            </Popover> : null}
+            <FormFork forms={card.subcards[0].fields}/>
+            {/* <CopyOutlined title="澶嶅埗" onClick={this.triggerCopy} /> */}
+            <Switch checkedChildren="寮�" unCheckedChildren="鍏�" defaultChecked={this.state.showField} onChange={(val) => this.setState({showField: val})} />
+          </div>
           <div style={{clear: 'both'}}></div>
           {appType !== 'mob' ? <CardComponent
             list={card.subcards[0].fields}
@@ -699,7 +588,15 @@
         </div>
         <div className="component-name">
           <div className="center">
-            <div className="title">{card.name}</div>
+            <div className="title" onDoubleClick={() => {
+              let oInput = document.createElement('input')
+              oInput.value = 'anchor' + card.uuid
+              document.body.appendChild(oInput)
+              oInput.select()
+              document.execCommand('Copy')
+              document.body.removeChild(oInput)
+              message.success('澶嶅埗鎴愬姛銆�')
+            }}>{card.name}</div>
             <div className="content">
               {card.errors && card.errors.map((err, index) => {
                 if (err.level === 0) {
@@ -713,6 +610,7 @@
         </div>
         <Modal
           title="缂栬緫"
+          wrapClassName="mk-scroll-modal"
           visible={this.state.visible}
           width={950}
           maskClosable={false}
@@ -725,7 +623,7 @@
             card={this.state.editform}
             formlist={this.state.formlist}
             inputSubmit={this.handleSubmit}
-            standardform={this.state.standardform}
+            fields={card.subcards[0].fields}
             wrappedComponentRef={(inst) => this.formRef = inst}
           />
         </Modal>

--
Gitblit v1.8.0