From 0ae7068208a32226f8f8812641f31646fb8b54c9 Mon Sep 17 00:00:00 2001
From: king <18310653075@163.com>
Date: 星期五, 29 十一月 2019 09:16:14 +0800
Subject: [PATCH] 2019-11-29-01

---
 src/templates/comtableconfig/index.jsx |  141 +++++++++++++++++++++++------------------------
 1 files changed, 69 insertions(+), 72 deletions(-)

diff --git a/src/templates/comtableconfig/index.jsx b/src/templates/comtableconfig/index.jsx
index 5774698..7129967 100644
--- a/src/templates/comtableconfig/index.jsx
+++ b/src/templates/comtableconfig/index.jsx
@@ -137,8 +137,7 @@
    * 2銆佹牴鎹厤缃俊鎭腑宸蹭娇鐢ㄨ〃鑾峰彇鐩稿叧瀛楁淇℃伅
    */
   componentDidMount () {
-    let _text = "select TbName ,Remark from sDataDictionary where IsKey!='' and Deleted =0 and Remark != '鍏徃'"
-    // let _text = "select TbName ,Remark from sDataDictionary where IsKey!='' and Deleted =0"
+    let _text = "select TbName ,Remark from sDataDictionary where IsKey!='' and Deleted =0"
     _text = Utils.formatOptions(_text)
 
     Api.getSystemConfig({func: 'sPC_Get_SelectedList', LText: _text, obj_name: 'data', arr_field: 'TbName,Remark'}).then(res => {
@@ -475,8 +474,11 @@
             MenuID: 'blank',
             text: this.state.dict['header.form.blank']
           }, {
-            MenuID: 'newpage',
-            text: this.state.dict['header.form.newpage']
+            MenuID: 'innerpage',
+            text: this.state.dict['header.form.newpage.inner']
+          }, {
+            MenuID: 'outerpage',
+            text: this.state.dict['header.form.newpage.outer']
           }]
         },
         {
@@ -489,6 +491,27 @@
         },
         {
           type: 'text',
+          key: 'url',
+          label: this.state.dict['header.form.newpage.url'],
+          initVal: card.url || '',
+          required: true
+        },
+        {
+          type: 'radio',
+          key: 'intertype',
+          label: this.state.dict['header.form.intertype'],
+          initVal: card.intertype,
+          required: true,
+          options: [{
+            MenuID: 'inner',
+            text: this.state.dict['header.form.interface.inner']
+          }, {
+            MenuID: 'outer',
+            text: this.state.dict['header.form.interface.outer']
+          }]
+        },
+        {
+          type: 'text',
           key: 'innerFunc',
           label: this.state.dict['header.form.innerFunc'],
           initVal: card.innerFunc,
@@ -496,24 +519,36 @@
           readonly: false
         },
         {
+          type: 'text',
+          key: 'interface',
+          label: this.state.dict['header.form.interface'],
+          initVal: card.interface,
+          required: true,
+          readonly: false
+        },
+        {
+          type: 'text',
+          key: 'outerFunc',
+          label: this.state.dict['header.form.outerFunc'],
+          initVal: card.outerFunc,
+          required: false,
+          readonly: false
+        },
+        {
           type: 'select',
           key: 'Ot',
           label: this.state.dict['header.form.isRequired'],
-          initVal: card.Ot,
+          initVal: card.Ot || 'requiredSgl',
           required: true,
-          options: [{
-            MenuID: 'notRequired',
-            text: this.state.dict['header.form.notRequired']
-          }, {
-            MenuID: 'requiredSgl',
-            text: this.state.dict['header.form.requiredSgl']
-          }, {
-            MenuID: 'required',
-            text: this.state.dict['header.form.required']
-          }, {
-            MenuID: 'requiredOnce',
-            text: this.state.dict['header.form.requiredOnce']
-          }]
+          options: []
+        },
+        {
+          type: 'text',
+          key: 'callbackFunc',
+          label: this.state.dict['header.form.callbackFunc'],
+          initVal: card.callbackFunc,
+          required: false,
+          readonly: false
         },
         {
           type: 'select',
@@ -548,60 +583,6 @@
         },
         {
           type: 'select',
-          key: 'icon',
-          label: this.state.dict['header.form.icon'],
-          initVal: card.icon,
-          required: false,
-          options: []
-        },
-        {
-          type: 'select',
-          key: 'class',
-          label: this.state.dict['header.form.class'],
-          initVal: card.class,
-          required: false,
-          options: []
-        },
-        {
-          type: 'radio',
-          key: 'intertype',
-          label: this.state.dict['header.form.intertype'],
-          initVal: card.intertype,
-          required: true,
-          options: [{
-            MenuID: 'inner',
-            text: this.state.dict['header.form.interface.inner']
-          }, {
-            MenuID: 'outer',
-            text: this.state.dict['header.form.interface.outer']
-          }]
-        },
-        {
-          type: 'text',
-          key: 'interface',
-          label: this.state.dict['header.form.interface'],
-          initVal: card.interface,
-          required: true,
-          readonly: false
-        },
-        {
-          type: 'text',
-          key: 'outerFunc',
-          label: this.state.dict['header.form.outerFunc'],
-          initVal: card.outerFunc,
-          required: false,
-          readonly: false
-        },
-        {
-          type: 'text',
-          key: 'callbackFunc',
-          label: this.state.dict['header.form.callbackFunc'],
-          initVal: card.callbackFunc,
-          required: false,
-          readonly: false
-        },
-        {
-          type: 'select',
           key: 'execError',
           label: this.state.dict['header.form.execError'],
           initVal: card.execError || 'never',
@@ -617,6 +598,22 @@
             text: this.state.dict['header.form.refresh.view']
           }]
         },
+        {
+          type: 'select',
+          key: 'icon',
+          label: this.state.dict['header.form.icon'],
+          initVal: card.icon,
+          required: false,
+          options: []
+        },
+        {
+          type: 'select',
+          key: 'class',
+          label: this.state.dict['header.form.class'],
+          initVal: card.class,
+          required: false,
+          options: []
+        }
       ]
     })
   }

--
Gitblit v1.8.0