From 73c0258e4e30f1d2e407cb067feea8e79fad081d Mon Sep 17 00:00:00 2001
From: king <18310653075@163.com>
Date: 星期四, 16 九月 2021 14:37:10 +0800
Subject: [PATCH] 2021-09-16

---
 src/menu/components/card/cardcellcomponent/elementform/index.jsx |   49 +++++++++++++++++++++++++++++++++++++------------
 1 files changed, 37 insertions(+), 12 deletions(-)

diff --git a/src/menu/components/card/cardcellcomponent/elementform/index.jsx b/src/menu/components/card/cardcellcomponent/elementform/index.jsx
index c116d50..306d61c 100644
--- a/src/menu/components/card/cardcellcomponent/elementform/index.jsx
+++ b/src/menu/components/card/cardcellcomponent/elementform/index.jsx
@@ -10,19 +10,21 @@
 const { TextArea } = Input
 const ColorSketch = asyncComponent(() => import('@/mob/colorsketch'))
 const SourceComponent = asyncComponent(() => import('@/menu/components/share/sourcecomponent'))
+const MkIcon = asyncComponent(() => import('@/components/mkIcon'))
 
 const cardTypeOptions = {
   sequence: ['eleType', 'width'],
-  text: ['eleType', 'datatype', 'format', 'width', 'height', 'prefix', 'postfix', 'link'],
+  text: ['eleType', 'datatype', 'format', 'width', 'height', 'prefix', 'postfix', 'link', 'noValue'],
   number: ['eleType', 'datatype', 'format', 'width', 'height', 'prefix', 'postfix'],
-  picture: ['eleType', 'datatype', 'width', 'lenWidRadio', 'link'],
-  video: ['eleType', 'datatype', 'width', 'aspectRatio', 'autoPlay', 'loop'],
+  picture: ['eleType', 'datatype', 'width', 'lenWidRadio', 'maxWidth', 'link', 'noValue'],
+  video: ['eleType', 'datatype', 'width', 'aspectRatio', 'autoPlay', 'loop', 'noValue'],
   icon: ['eleType', 'icon', 'datatype', 'width'],
   slider: ['eleType', 'datatype', 'width', 'color', 'maxValue'],
   splitline: ['eleType', 'color', 'width', 'borderWidth'],
-  barcode: ['eleType', 'datatype', 'width', 'barHeight', 'displayValue', 'interval'],
-  qrcode: ['eleType', 'datatype', 'width', 'qrWidth', 'color', 'url'],
+  barcode: ['eleType', 'datatype', 'width', 'barHeight', 'displayValue', 'interval', 'noValue'],
+  qrcode: ['eleType', 'datatype', 'width', 'qrWidth', 'color', 'url', 'noValue'],
   currentDate: ['eleType', 'width', 'dateFormat', 'prefix', 'postfix'],
+  formula: ['eleType', 'width', 'height', 'prefix', 'postfix', 'formula'],
 }
 
 class MainSearch extends Component {
@@ -55,12 +57,12 @@
         if (item.key === 'field' || item.key === 'linkurl') {
           item.options = []
           config.columns.forEach(col => {
-            if (!/^Nvarchar/ig.test(col.datatype) && (card.eleType === 'number' || card.eleType === 'slider')) {
+            if (/^(Int|Decimal)/ig.test(col.datatype) && (card.eleType === 'number' || card.eleType === 'slider')) {
               item.options.push({
                 value: col.field,
                 text: col.label
               })
-            } else if (/^Nvarchar/ig.test(col.datatype) && card.eleType !== 'number' && card.eleType !== 'slider') {
+            } else if (/^(Nvarchar|date)/ig.test(col.datatype) && card.eleType !== 'number' && card.eleType !== 'slider') {
               item.options.push({
                 value: col.field,
                 text: col.label
@@ -104,10 +106,12 @@
         if (link === 'dynamic' || link === 'static' || link === 'custom') {
           _options.push('linkurl', 'joint')
         } else if (link === 'page') {
-          _options.push('copyMenuId', 'joint')
+          _options.push('copyMenuId', 'joint', 'open')
         } else if (link === 'linkpage') {
-          _options.push('linkmenu', 'joint')
+          _options.push('linkmenu', 'joint', 'open')
         }
+      } else if (eleType === 'picture' && !link) {
+        _options.push('scale')
       }
     } else if (eleType === 'icon') {
       if (datatype === 'dynamic') {
@@ -139,12 +143,12 @@
         if (item.key === 'field') {
           item.options = []
           config.columns.forEach(col => {
-            if (!/^Nvarchar/ig.test(col.datatype) && (value === 'number' || value === 'slider')) {
+            if (/^(Int|Decimal)/ig.test(col.datatype) && (value === 'number' || value === 'slider')) {
               item.options.push({
                 value: col.field,
                 text: col.label
               })
-            } else if (/^Nvarchar/ig.test(col.datatype) && value !== 'number' && value !== 'slider') {
+            } else if (/^(Nvarchar|date)/ig.test(col.datatype) && value !== 'number' && value !== 'slider') {
               item.options.push({
                 value: col.field,
                 text: col.label
@@ -298,7 +302,7 @@
                     message: formRule.input.message
                   }
                 ]
-              })(<TextArea rows={2} disabled={item.readonly} />)}
+              })(<TextArea rows={2} disabled={item.readonly} placeholder={item.placeholder || ''} />)}
             </Form.Item>
           </Col>
         )
@@ -353,6 +357,27 @@
             </Form.Item>
           </Col>
         )
+      } else if (item.type === 'icon') {
+        fields.push(
+          <Col span={12} key={index}>
+            <Form.Item label={item.tooltip ?
+              <Tooltip placement="topLeft" title={item.tooltip}>
+                <Icon type="question-circle" />
+                {item.label}
+              </Tooltip> : item.label
+            }>
+              {getFieldDecorator(item.key, {
+                initialValue: item.initVal || '',
+                rules: [{
+                  required: !!item.required,
+                  message: this.props.dict['form.required.select'] + item.label + '!'
+                }]
+              })(
+                <MkIcon />
+              )}
+            </Form.Item>
+          </Col>
+        )
       } else if (item.type === 'radio') {
         fields.push(
           <Col span={12} key={index}>

--
Gitblit v1.8.0