From 7ea1c5f53702951fc4df60e969fc67ef5d7af4dd Mon Sep 17 00:00:00 2001
From: king <18310653075@163.com>
Date: 星期二, 14 一月 2020 10:13:05 +0800
Subject: [PATCH] 2020-01-14

---
 src/templates/comtableconfig/source.jsx |   95 ++++++++++++++++++++++++++++++++---------------
 1 files changed, 64 insertions(+), 31 deletions(-)

diff --git a/src/templates/comtableconfig/source.jsx b/src/templates/comtableconfig/source.jsx
index 195337b..c0240de 100644
--- a/src/templates/comtableconfig/source.jsx
+++ b/src/templates/comtableconfig/source.jsx
@@ -17,13 +17,16 @@
       order: '',
       dataresource: '',
       interType: 'inner',
-      innerFunc: ''
+      innerFunc: '',
+      interface: '',
+      outerFunc: '',
+      onload: 'true',
+      subtabs: []
     },
     tables: [],
     search: [
       {
         origin: true,
-        id: 0,
         uuid: Utils.getuuid(),
         label: 'label',
         field: '',
@@ -42,7 +45,6 @@
         display: 'dropdown'
       }, {
         origin: true,
-        id: 1,
         uuid: Utils.getuuid(),
         label: 'label',
         field: '',
@@ -61,7 +63,6 @@
         display: 'dropdown'
       }, {
         origin: true,
-        id: 2,
         uuid: Utils.getuuid(),
         label: 'label',
         field: '',
@@ -83,7 +84,6 @@
     action: [
       {
         origin: true,
-        id: 0,
         uuid: Utils.getuuid(),
         label: 'add',
         intertype: 'inner',
@@ -98,14 +98,15 @@
         position: 'toolbar',
         execSuccess: 'grid',
         execError: 'never',
+        errorTime: 15,
         OpenType: 'pop',
         pageTemplate: '',
         url: '',
         icon: 'plus',
-        class: 'green'
+        class: 'green',
+        verify: null
       }, {
         origin: true,
-        id: 1,
         uuid: Utils.getuuid(),
         label: 'update',
         intertype: 'inner',
@@ -120,14 +121,15 @@
         position: 'grid',
         execSuccess: 'grid',
         execError: 'never',
+        errorTime: 15,
         OpenType: 'pop',
         pageTemplate: '',
         url: '',
         icon: 'form',
-        class: 'purple'
+        class: 'purple',
+        verify: null
       }, {
         origin: true,
-        id: 2,
         uuid: Utils.getuuid(),
         label: 'delete',
         intertype: 'inner',
@@ -142,17 +144,18 @@
         position: 'toolbar',
         execSuccess: 'grid',
         execError: 'never',
+        errorTime: 15,
         OpenType: 'prompt',
         pageTemplate: '',
         url: '',
         icon: 'delete',
-        class: 'red'
+        class: 'red',
+        verify: null
       }
     ],
     columns: [
       {
         origin: true,
-        id: 0,
         uuid: Utils.getuuid(),
         Align: 'left',
         label: 'label',
@@ -163,7 +166,6 @@
         Width: 120
       }, {
         origin: true,
-        id: 1,
         uuid: Utils.getuuid(),
         Align: 'left',
         label: 'label',
@@ -174,7 +176,6 @@
         Width: 120
       }, {
         origin: true,
-        id: 2,
         uuid: Utils.getuuid(),
         Align: 'left',
         label: 'label',
@@ -185,7 +186,6 @@
         Width: 120
       }, {
         origin: true,
-        id: 3,
         uuid: Utils.getuuid(),
         Align: 'left',
         label: 'label',
@@ -206,7 +206,32 @@
       style: 'button',
       show: 'horizontal',
       Width: 120
-    }
+    },
+    tabs: [
+      {
+        origin: true,          // 鏄惁涓虹ず渚�
+        groupId: 'tabs',
+        uuid: Utils.getuuid(),
+        label: 'tab1',
+        icon: '',
+        type: 'SubTable',
+        linkTab: '',
+        subtabs: [],
+        supMenu: ''
+      },
+      {
+        origin: true,
+        groupId: 'tabs',
+        uuid: Utils.getuuid(),
+        label: 'tab2',
+        icon: '',
+        type: 'SubTable',
+        linkTab: '',
+        subtabs: [],
+        supMenu: ''
+      }
+    ],
+    tabgroups: ['tabs']
   }
 
   searchItems = [
@@ -257,12 +282,6 @@
     },
     {
       type: 'action',
-      label: CommonDict['header.form.popview'],
-      subType: 'popview',
-      url: ''
-    },
-    {
-      type: 'action',
       label: CommonDict['header.form.prompt'],
       subType: 'prompt',
       url: ''
@@ -275,12 +294,6 @@
     },
     {
       type: 'action',
-      label: CommonDict['header.form.tab'],
-      subType: 'tab',
-      url: ''
-    },
-    {
-      type: 'action',
       label: CommonDict['header.form.excelIn'],
       subType: 'excelIn',
       url: ''
@@ -289,6 +302,18 @@
       type: 'action',
       label: CommonDict['header.form.excelOut'],
       subType: 'excelOut',
+      url: ''
+    },
+    {
+      type: 'action',
+      label: CommonDict['header.form.popview'],
+      subType: 'popview',
+      url: ''
+    },
+    {
+      type: 'action',
+      label: CommonDict['header.form.tab'],
+      subType: 'tab',
       url: ''
     },
     {
@@ -320,14 +345,14 @@
     },
     {
       type: 'columns',
-      label: CommonDict['header.form.picture'],
-      subType: 'picture',
+      label: CommonDict['header.form.number'],
+      subType: 'number',
       url: ''
     },
     {
       type: 'columns',
-      label: CommonDict['header.form.number'],
-      subType: 'number',
+      label: CommonDict['header.form.picture'],
+      subType: 'picture',
       url: ''
     },
     {
@@ -337,6 +362,14 @@
       url: ''
     }
   ]
+
+  tabItems = [
+    {
+      type: 'tabs',
+      label: CommonDict['header.menu.tab.subtable'],
+      subType: 'SubTable',
+    }
+  ]
 }
 
 export default new CommonTableBaseData()

--
Gitblit v1.8.0