From 770b3b95cb550a99d0eef100b8290a62cacaf221 Mon Sep 17 00:00:00 2001
From: king <18310653075@163.com>
Date: 星期三, 22 二月 2023 13:16:49 +0800
Subject: [PATCH] 2023-02-22

---
 src/menu/components/form/simple-form/index.jsx          |   28 ++-----
 src/templates/zshare/modalform/index.jsx                |    2 
 src/templates/modalconfig/index.jsx                     |   29 ++-----
 src/menu/components/form/step-form/index.jsx            |   23 +----
 src/menu/modalconfig/index.jsx                          |   23 +----
 src/mob/modalconfig/index.jsx                           |   23 +----
 src/templates/zshare/formconfig.jsx                     |   23 +++++
 src/menu/components/form/tab-form/index.jsx             |   28 ++-----
 src/templates/formtabconfig/index.jsx                   |   13 +-
 src/templates/zshare/modalform/modaleditable/index.jsx  |    8 +
 src/templates/zshare/modalform/modaleditable/index.scss |    4 
 11 files changed, 79 insertions(+), 125 deletions(-)

diff --git a/src/menu/components/form/simple-form/index.jsx b/src/menu/components/form/simple-form/index.jsx
index 5848926..0875e25 100644
--- a/src/menu/components/form/simple-form/index.jsx
+++ b/src/menu/components/form/simple-form/index.jsx
@@ -340,35 +340,28 @@
     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.field || ''}锛�${item.label}锛塦
-
       if (['text', 'number', 'textarea', 'color'].includes(item.type) && _item.field !== item.field) {
         _inputfields.push({
           field: item.field,
-          label: _inputIndex + '銆�' + label
+          label: item.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
+          label: item.label
         })
-        _tabIndex++
       }
 
       if (item.type === 'switch') {
         _linksupFields.push({
           field: item.field,
-          label: _linkIndex + '銆�' + label
+          label: item.label
         })
       }
       
@@ -378,19 +371,15 @@
         uniq.set(item.field, true)
 
         _linkableFields.push({
-          value: item.field,
-          text: _linkIndex + '銆�' + item.label + ' (琛ㄥ崟)'
+          field: item.field,
+          label: item.label + '-琛ㄥ崟'
         })
         _linksupFields.push({
-          value: item.field,
-          text: _linkIndex + '銆�' + label
+          field: item.field,
+          label: item.label
         })
-
-        _linkIndex++
       }
     })
-
-    _tabfields.unshift({field: '', label: '鍘熻〃鍗�'})
 
     if (index !== null) {
       if (index === 0) {
@@ -406,9 +395,8 @@
 
         _linkableFields.push({
           field: col.field,
-          label: _linkIndex + '銆�' + col.label + ' (鏄剧ず鍒�)'
+          label: col.label + '-鏄剧ず鍒�'
         })
-        _linkIndex++
       }
     })
 
diff --git a/src/menu/components/form/step-form/index.jsx b/src/menu/components/form/step-form/index.jsx
index a10ff62..b16532c 100644
--- a/src/menu/components/form/step-form/index.jsx
+++ b/src/menu/components/form/step-form/index.jsx
@@ -441,36 +441,29 @@
     let index = null
     uniq.set(_form.field, true)
 
-    let _inputIndex = 1
-    let _tabIndex = 1
-    let _linkIndex = 1
     group.fields.forEach((item, i) => {
       if (_form.uuid === item.uuid) {
         index = i
       }
 
-      let label = `${item.field || ''}锛�${item.label}锛塦
-
       if (['text', 'number', 'textarea', 'color'].includes(item.type) && _item.field !== item.field) {
         _inputfields.push({
           field: item.field,
-          label: _inputIndex + '銆�' + label
+          label: item.label
         })
-        _inputIndex++
       }
 
       if (_item.field !== item.field && item.hidden !== 'true' && ['text', 'number', 'select', 'link'].includes(item.type)) {
         _tabfields.push({
           field: item.field,
-          label: _tabIndex + '銆�' + label
+          label: item.label
         })
-        _tabIndex++
       }
 
       if (item.type === 'switch') {
         _linksupFields.push({
           field: item.field,
-          label: _linkIndex + '銆�' + label
+          label: item.label
         })
       }
       
@@ -481,17 +474,14 @@
 
         _linkableFields.push({
           field: item.field,
-          label: _linkIndex + '銆�' + item.label + ' (琛ㄥ崟)'
+          label: item.label + '-琛ㄥ崟'
         })
         _linksupFields.push({
           field: item.field,
-          label: _linkIndex + '銆�' + label
+          label: item.label
         })
-        _linkIndex++
       }
     })
-
-    _tabfields.unshift({field: '', label: '鍘熻〃鍗�'})
 
     if (index !== null) {
       if (index === 0) {
@@ -507,9 +497,8 @@
 
         _linkableFields.push({
           field: col.field,
-          label: _linkIndex + '銆�' + col.label + ' (鏄剧ず鍒�)'
+          label: col.label + '-鏄剧ず鍒�'
         })
-        _linkIndex++
       }
     })
 
diff --git a/src/menu/components/form/tab-form/index.jsx b/src/menu/components/form/tab-form/index.jsx
index b3b5b18..cc18525 100644
--- a/src/menu/components/form/tab-form/index.jsx
+++ b/src/menu/components/form/tab-form/index.jsx
@@ -447,35 +447,28 @@
     let index = null
     uniq.set(_form.field, true)
 
-    let _inputIndex = 1
-    let _tabIndex = 1
-    let _linkIndex = 1
     group.fields.forEach((item, i) => {
       if (_form.uuid === item.uuid) {
         index = i
       }
 
-      let label = `${item.field || ''}锛�${item.label}锛塦
-
       if (['text', 'number', 'textarea', 'color'].includes(item.type) && _item.field !== item.field) {
         _inputfields.push({
           field: item.field,
-          label: _inputIndex + '銆�' + label
+          label: item.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
+          label: item.label
         })
-        _tabIndex++
       }
 
       if (item.type === 'switch') {
         _linksupFields.push({
           field: item.field,
-          label: _linkIndex + '銆�' + label
+          label: item.label
         })
       }
       
@@ -485,19 +478,15 @@
         uniq.set(item.field, true)
 
         _linkableFields.push({
-          value: item.field,
-          text: _linkIndex + '銆�' + item.label + ' (琛ㄥ崟)'
+          field: item.field,
+          label: item.label + '-琛ㄥ崟'
         })
         _linksupFields.push({
-          value: item.field,
-          text: _linkIndex + '銆�' + label
+          field: item.field,
+          label: item.label
         })
-
-        _linkIndex++
       }
     })
-
-    _tabfields.unshift({field: '', label: '鍘熻〃鍗�'})
 
     if (index !== null) {
       if (index === 0) {
@@ -513,9 +502,8 @@
 
         _linkableFields.push({
           field: col.field,
-          label: _linkIndex + '銆�' + col.label + ' (鏄剧ず鍒�)'
+          label: col.label + '-鏄剧ず鍒�'
         })
-        _linkIndex++
       }
     })
 
diff --git a/src/menu/modalconfig/index.jsx b/src/menu/modalconfig/index.jsx
index b6a7883..7ed61f4 100644
--- a/src/menu/modalconfig/index.jsx
+++ b/src/menu/modalconfig/index.jsx
@@ -119,35 +119,28 @@
     let index = null
     uniq.set(card.field, true)
 
-    let _inputIndex = 1
-    let _tabIndex = 1
-    let _linkIndex = 1
     config.fields.forEach((item, i) => {
       if (card.uuid === item.uuid) {
         index = i
       }
 
-      let label = `${item.field || ''}锛�${item.label}锛塦
-
       if (['text', 'number', 'textarea', 'color'].includes(item.type) && card.field !== item.field) {
         _inputfields.push({
           field: item.field,
-          label: _inputIndex + '銆�' + label
+          label: item.label
         })
-        _inputIndex++
       }
       if (card.field !== item.field && item.hidden !== 'true' && ['text', 'number', 'select', 'link'].includes(item.type)) {
         _tabfields.push({
           field: item.field,
-          label: _tabIndex + '銆�' + label
+          label: item.label
         })
-        _tabIndex++
       }
 
       if (item.type === 'switch') {
         _linksupFields.push({
           field: item.field,
-          label: _linkIndex + '銆�' + label
+          label: item.label
         })
       }
 
@@ -158,13 +151,12 @@
 
         _linkableFields.push({
           field: item.field,
-          label: _linkIndex + '銆�' + item.label + ' (琛ㄥ崟)'
+          label: item.label + '-琛ㄥ崟'
         })
         _linksupFields.push({
           field: item.field,
-          label: _linkIndex + '銆�' + label
+          label: item.label
         })
-        _linkIndex++
       }
     })
     if (index !== null) {
@@ -174,8 +166,6 @@
         standardform = config.fields[index - 1] || null
       }
     }
-
-    _tabfields.unshift({field: '', label: '鍘熻〃鍗�'})
 
     let columns = componentConfig.columns
     if (btn.$sub) {
@@ -188,9 +178,8 @@
 
         _linkableFields.push({
           field: col.field,
-          label: _linkIndex + '銆�' + col.label + ' (鏄剧ず鍒�)'
+          label: col.label + '-鏄剧ず鍒�'
         })
-        _linkIndex++
       }
     })
 
diff --git a/src/mob/modalconfig/index.jsx b/src/mob/modalconfig/index.jsx
index ae72375..570c637 100644
--- a/src/mob/modalconfig/index.jsx
+++ b/src/mob/modalconfig/index.jsx
@@ -140,35 +140,28 @@
     let index = null
     uniq.set(card.field, true)
 
-    let _inputIndex = 1
-    let _tabIndex = 1
-    let _linkIndex = 1
     config.fields.forEach((item, i) => {
       if (card.uuid === item.uuid) {
         index = i
       }
 
-      let label = `${item.field || ''}锛�${item.label}锛塦
-
       if (['text', 'number', 'textarea', 'color'].includes(item.type) && card.field !== item.field) {
         _inputfields.push({
           field: item.field,
-          label: _inputIndex + '銆�' + label
+          label: item.label
         })
-        _inputIndex++
       }
       if (card.field !== item.field && item.hidden !== 'true' && ['text', 'number', 'select', 'link'].includes(item.type)) {
         _tabfields.push({
           field: item.field,
-          label: _tabIndex + '銆�' + label
+          label: item.label
         })
-        _tabIndex++
       }
 
       if (item.type === 'switch') {
         _linksupFields.push({
           field: item.field,
-          label: _linkIndex + '銆�' + label
+          label: item.label
         })
       }
 
@@ -179,17 +172,14 @@
 
         _linkableFields.push({
           field: item.field,
-          label: _linkIndex + '銆�' + item.label + ' (琛ㄥ崟)'
+          label: item.label + '-琛ㄥ崟'
         })
         _linksupFields.push({
           field: item.field,
-          label: _linkIndex + '銆�' + label
+          label: item.label
         })
-        _linkIndex++
       }
     })
-
-    _tabfields.unshift({field: '', label: '鍘熻〃鍗�'})
 
     if (index !== null) {
       if (index === 0) {
@@ -210,9 +200,8 @@
 
         _linkableFields.push({
           field: col.field,
-          label: _linkIndex + '銆�' + col.label + ' (鏄剧ず鍒�)'
+          label: col.label + '-鏄剧ず鍒�'
         })
-        _linkIndex++
       }
     })
 
diff --git a/src/templates/formtabconfig/index.jsx b/src/templates/formtabconfig/index.jsx
index 028b214..851fb46 100644
--- a/src/templates/formtabconfig/index.jsx
+++ b/src/templates/formtabconfig/index.jsx
@@ -364,7 +364,6 @@
 
     _inputfields = _formfields.filter(item => ['text', 'number', 'textarea', 'color'].includes(item.type) && card.field !== item.field)
     _tabfields = _formfields.filter(item => card.field !== item.field && item.hidden !== 'true' && ['text', 'number', 'select', 'link'].includes(item.type))
-    _tabfields.unshift({field: '', text: '鍘熻〃鍗�'})
     
     if (card.linkSubField && card.linkSubField.length > 0) {
       let fields = _inputfields.map(item => item.field)
@@ -380,12 +379,12 @@
         uniq.set(item.field, true)
 
         _linkableFields.push({
-          value: item.field,
-          text: item.label + ' (琛ㄥ崟)'
+          field: item.field,
+          label: item.label + '-琛ㄥ崟'
         })
         _linksupFields.push({
-          value: item.field,
-          text: item.label
+          field: item.field,
+          label: item.label
         })
       }
     })
@@ -396,8 +395,8 @@
           uniq.set(col.field, true)
 
           _linkableFields.push({
-            value: col.field,
-            text: col.label + ' (鏄剧ず鍒�)'
+            field: col.field,
+            label: col.label + '-鏄剧ず鍒�'
           })
         }
       })
diff --git a/src/templates/modalconfig/index.jsx b/src/templates/modalconfig/index.jsx
index 7ec9759..2a2d203 100644
--- a/src/templates/modalconfig/index.jsx
+++ b/src/templates/modalconfig/index.jsx
@@ -249,35 +249,28 @@
     let index = null
     uniq.set(card.field, true)
 
-    let _inputIndex = 1
-    let _tabIndex = 1
-    let _linkIndex = 1
     config.fields.forEach((item, i) => {
       if (card.uuid === item.uuid) {
         index = i
       }
 
-      let label = `${item.field || ''}锛�${item.label}锛塦
-
       if (['text', 'number', 'textarea', 'color'].includes(item.type) && card.field !== item.field) {
         _inputfields.push({
           field: item.field,
-          label: _inputIndex + '銆�' + label
+          label: item.label
         })
-        _inputIndex++
       }
       if (card.field !== item.field && item.hidden !== 'true' && ['text', 'number', 'select', 'link'].includes(item.type)) {
         _tabfields.push({
           field: item.field,
-          label: _tabIndex + '銆�' + label
+          label: item.label
         })
-        _tabIndex++
       }
 
       if (item.type === 'switch') {
         _linksupFields.push({
           field: item.field,
-          label: _linkIndex + '銆�' + label
+          label: item.label
         })
       }
 
@@ -288,17 +281,14 @@
 
         _linkableFields.push({
           field: item.field,
-          label: _linkIndex + '銆�' + item.label + ' (琛ㄥ崟)'
+          label: item.label + '-琛ㄥ崟'
         })
         _linksupFields.push({
           field: item.field,
-          label: _linkIndex + '銆�' + label
+          label: item.label
         })
-        _linkIndex++
       }
     })
-
-    _tabfields.unshift({field: '', label: '鍘熻〃鍗�'})
 
     if (index !== null) {
       if (index === 0) {
@@ -315,9 +305,8 @@
 
           _linkableFields.push({
             field: col.field,
-            label: _linkIndex + '銆�' + col.label + ' (鏄剧ず鍒�)'
+            label: col.label + '-鏄剧ず鍒�'
           })
-          _linkIndex++
         }
       })
     } else if (tabConfig) {
@@ -327,9 +316,8 @@
 
           _linkableFields.push({
             field: col.field,
-            label: _linkIndex + '銆�' + col.label + ' (鏄剧ず鍒�)'
+            label: col.label + '-鏄剧ず鍒�'
           })
-          _linkIndex++
         }
       })
     } else if (menu.LongParam) {
@@ -339,9 +327,8 @@
 
           _linkableFields.push({
             field: col.field,
-            label: _linkIndex + '銆�' + col.label + ' (鏄剧ず鍒�)'
+            label: col.label + '-鏄剧ず鍒�'
           })
-          _linkIndex++
         }
       })
     }
diff --git a/src/templates/zshare/formconfig.jsx b/src/templates/zshare/formconfig.jsx
index 12122a1..d11afb9 100644
--- a/src/templates/zshare/formconfig.jsx
+++ b/src/templates/zshare/formconfig.jsx
@@ -2383,7 +2383,7 @@
 /**
  * @description 鑾峰彇琛ㄥ崟閰嶇疆淇℃伅
  * @param {*} card            // 琛ㄥ崟瀵硅薄
- * @param {*} inputfields     // 鍙叧鑱旇〃鍗�
+ * @param {*} inputfields     // 鍙啓鍏ヨ〃鍗�
  * @param {*} tabfields       // 鍙垏鎹㈣〃鍗�
  * @param {*} linkableFields  // 鍙叧鑱旇〃鍗�
  * @param {*} linksupFields   // 涓婄骇琛ㄥ崟
@@ -2407,6 +2407,27 @@
   } else {
     roleList = []
   }
+
+  inputfields = inputfields.map((item, index) => {
+    item.label = `${index + 1}銆�${item.field || ''}锛�${item.label}锛塦
+    return item
+  })
+  tabfields = tabfields.map((item, index) => {
+    item.label = `${index + 1}銆�${item.field || ''}锛�${item.label}锛塦
+    return item
+  })
+
+  tabfields.unshift({field: '', label: '鍘熻〃鍗�'})
+
+  linkableFields = linkableFields.map((item, index) => {
+    item.label = `${index + 1}銆�${item.field || ''}锛�${item.label}锛塦
+    return item
+  })
+
+  linksupFields = linksupFields.map((item, index) => {
+    item.label = `${index + 1}銆�${item.field || ''}锛�${item.label}锛塦
+    return item
+  })
   
   let _openType = [{
     value: 'text',
diff --git a/src/templates/zshare/modalform/index.jsx b/src/templates/zshare/modalform/index.jsx
index 6a870d9..6bd3be2 100644
--- a/src/templates/zshare/modalform/index.jsx
+++ b/src/templates/zshare/modalform/index.jsx
@@ -66,7 +66,7 @@
 
       if (item.key === 'linkSubField') {
         item.options.forEach(cell => {
-          transfield[cell.field] = cell.label
+          transfield[cell.field] = cell.label.replace(/^\d+銆�/, '')
         })
       }
     })
diff --git a/src/templates/zshare/modalform/modaleditable/index.jsx b/src/templates/zshare/modalform/modaleditable/index.jsx
index 9edfdf9..5e84435 100644
--- a/src/templates/zshare/modalform/modaleditable/index.jsx
+++ b/src/templates/zshare/modalform/modaleditable/index.jsx
@@ -168,7 +168,7 @@
 
         if (col.dataIndex !== 'operation') {
           col.title = <div>
-            Value
+            {col.$title}
             <Popconfirm
               title={`纭畾鍒囨崲涓�${col.datatype === 'number' ? '鏂囨湰' : '鏁板��'}鍚楋紵`}
               overlayClassName="popover-confirm"
@@ -309,6 +309,7 @@
       fields = subFields.map(field => {
         return {
           title: transfield[field] || field,
+          $title: transfield[field] || field,
           dataIndex: field,
           editable: true,
           datatype: dataItem && typeof(dataItem[field]) === 'number' ? 'number' : 'string'
@@ -321,12 +322,14 @@
     let columns = [
       {
         title: 'Value',
+        $title: 'Value',
         dataIndex: 'Value',
         editable: true,
         datatype: dataItem && typeof(dataItem.Value) === 'number' ? 'number' : 'string'
       },
       {
         title: 'Text',
+        $title: 'Text',
         dataIndex: 'Text',
         editable: true,
         datatype: dataItem && typeof(dataItem.Text) === 'number' ? 'number' : 'string'
@@ -358,6 +361,7 @@
     if (type === 'link') {
       columns.unshift({
         title: 'ParentID',
+        $title: 'ParentID',
         dataIndex: 'ParentID',
         editable: true,
         datatype: dataItem && typeof(dataItem.ParentID) === 'number' ? 'number' : 'string'
@@ -368,7 +372,7 @@
       columns: columns.map(col => {
         if (col.dataIndex !== 'operation') {
           col.title = <div>
-            Value
+            {col.$title}
             <Popconfirm
               title={`纭畾鍒囨崲涓�${col.datatype === 'number' ? '鏂囨湰' : '鏁板��'}鍚楋紵`}
               overlayClassName="popover-confirm"
diff --git a/src/templates/zshare/modalform/modaleditable/index.scss b/src/templates/zshare/modalform/modaleditable/index.scss
index c802fbe..7c097fd 100644
--- a/src/templates/zshare/modalform/modaleditable/index.scss
+++ b/src/templates/zshare/modalform/modaleditable/index.scss
@@ -21,9 +21,9 @@
 
     .anticon-swap {
       position: absolute;
-      right: 16px;
+      right: 12px;
       font-size: 14px;
-      top: 12px;
+      // top: 12px;
       color: #b8b8b8;
     }
   }

--
Gitblit v1.8.0