From 2b84af9bed8f4b7da94a4bb85e7223d3b18e4fcb Mon Sep 17 00:00:00 2001
From: king <18310653075@163.com>
Date: 星期六, 14 十二月 2019 23:03:26 +0800
Subject: [PATCH] 2019-12-14

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

diff --git a/src/templates/comtableconfig/source.jsx b/src/templates/comtableconfig/source.jsx
index 9fd5ba0..6119305 100644
--- a/src/templates/comtableconfig/source.jsx
+++ b/src/templates/comtableconfig/source.jsx
@@ -7,21 +7,26 @@
 class CommonTableBaseData {
   baseConfig = {
     type: 'system',
+    enabled: false,
     setting: {
       actionfixed: false,
       columnfixed: false,
       tableName: '',
       tableType: 'checkbox',
       primaryKey: '',
-      dataresource: ''
+      order: '',
+      dataresource: '',
+      interType: 'inner',
+      innerFunc: '',
+      interface: '',
+      outerFunc: ''
     },
     tables: [],
     search: [
       {
         origin: true,
-        id: 0,
         uuid: Utils.getuuid(),
-        label: 'text',
+        label: 'label',
         field: '',
         initval: '',
         type: 'text',
@@ -38,9 +43,8 @@
         display: 'dropdown'
       }, {
         origin: true,
-        id: 1,
         uuid: Utils.getuuid(),
-        label: 'select',
+        label: 'label',
         field: '',
         initval: '',
         type: 'select',
@@ -57,9 +61,8 @@
         display: 'dropdown'
       }, {
         origin: true,
-        id: 2,
         uuid: Utils.getuuid(),
-        label: 'date',
+        label: 'label',
         field: '',
         initval: '',
         type: 'date',
@@ -79,13 +82,15 @@
     action: [
       {
         origin: true,
-        id: 0,
         uuid: Utils.getuuid(),
         label: 'add',
         intertype: 'inner',
         innerFunc: '',
         interface: '',
+        method: 'POST',
         outerFunc: '',
+        sql: '',
+        sqlType: '',
         callbackFunc: '',
         Ot: 'notRequired',
         position: 'toolbar',
@@ -98,13 +103,15 @@
         class: 'green'
       }, {
         origin: true,
-        id: 1,
         uuid: Utils.getuuid(),
         label: 'update',
         intertype: 'inner',
         innerFunc: '',
         interface: '',
+        method: 'POST',
         outerFunc: '',
+        sql: '',
+        sqlType: '',
         callbackFunc: '',
         Ot: 'requiredSgl',
         position: 'grid',
@@ -117,13 +124,15 @@
         class: 'purple'
       }, {
         origin: true,
-        id: 2,
         uuid: Utils.getuuid(),
         label: 'delete',
         intertype: 'inner',
         innerFunc: '',
         interface: '',
+        method: 'POST',
         outerFunc: '',
+        sql: '',
+        sqlType: '',
         callbackFunc: '',
         Ot: 'required',
         position: 'toolbar',
@@ -134,32 +143,14 @@
         url: '',
         icon: 'delete',
         class: 'red'
-      }, {
-        origin: true,
-        id: 3,
-        uuid: Utils.getuuid(),
-        label: 'freeze',
-        intertype: 'inner',
-        innerFunc: '',
-        interface: '',
-        outerFunc: '',
-        callbackFunc: '',
-        Ot: 'requiredOnce',
-        position: 'toolbar',
-        OpenType: 'exec',
-        pageTemplate: '',
-        url: '',
-        icon: '',
-        class: 'default'
       }
     ],
     columns: [
       {
         origin: true,
-        id: 0,
         uuid: Utils.getuuid(),
         Align: 'left',
-        label: 'fieldName1',
+        label: 'label',
         field: '',
         Hide: 'false',
         IsSort: 'true',
@@ -167,10 +158,9 @@
         Width: 120
       }, {
         origin: true,
-        id: 1,
         uuid: Utils.getuuid(),
         Align: 'left',
-        label: 'fieldName2',
+        label: 'label',
         field: '',
         Hide: 'false',
         IsSort: 'true',
@@ -178,10 +168,9 @@
         Width: 120
       }, {
         origin: true,
-        id: 2,
         uuid: Utils.getuuid(),
         Align: 'left',
-        label: 'fieldName3',
+        label: 'label',
         field: '',
         Hide: 'false',
         IsSort: 'true',
@@ -189,17 +178,27 @@
         Width: 120
       }, {
         origin: true,
-        id: 3,
         uuid: Utils.getuuid(),
         Align: 'left',
-        label: 'fieldName4',
+        label: 'label',
         field: '',
         Hide: 'false',
         IsSort: 'true',
         type: 'text',
         Width: 120
       }
-    ]
+    ],
+    gridBtn: {
+      display: false,
+      Align: 'center',
+      IsSort: 'false',
+      uuid: Utils.getuuid(),
+      label: CommonDict['header.form.column.action'],
+      type: 'action',
+      style: 'button',
+      show: 'horizontal',
+      Width: 120
+    }
   }
 
   searchItems = [
@@ -274,6 +273,18 @@
     },
     {
       type: 'action',
+      label: CommonDict['header.form.excelIn'],
+      subType: 'excelIn',
+      url: ''
+    },
+    {
+      type: 'action',
+      label: CommonDict['header.form.excelOut'],
+      subType: 'excelOut',
+      url: ''
+    },
+    {
+      type: 'action',
       label: CommonDict['header.form.blank'],
       subType: 'blank',
       url: ''
@@ -304,6 +315,18 @@
       label: CommonDict['header.form.picture'],
       subType: 'picture',
       url: ''
+    },
+    {
+      type: 'columns',
+      label: CommonDict['header.form.number'],
+      subType: 'number',
+      url: ''
+    },
+    {
+      type: 'columns',
+      label: CommonDict['header.form.colspan'],
+      subType: 'colspan',
+      url: ''
     }
   ]
 }

--
Gitblit v1.8.0