From 92108e6c93de657838bbd766a9eb4f27d85e1c2d Mon Sep 17 00:00:00 2001
From: king <18310653075@163.com>
Date: 星期二, 05 五月 2020 16:41:28 +0800
Subject: [PATCH] 2020-05-05

---
 src/templates/comtableconfig/source.jsx |  116 ++++++++++++++++++++++++----------------------------------
 1 files changed, 48 insertions(+), 68 deletions(-)

diff --git a/src/templates/comtableconfig/source.jsx b/src/templates/comtableconfig/source.jsx
index c0240de..502fe78 100644
--- a/src/templates/comtableconfig/source.jsx
+++ b/src/templates/comtableconfig/source.jsx
@@ -1,12 +1,13 @@
 import Utils from '@/utils/utils.js'
-import zhCN from '@/locales/zh-CN/comtable.js'
-import enUS from '@/locales/en-US/comtable.js'
+import zhCN from '@/locales/zh-CN/model.js'
+import enUS from '@/locales/en-US/model.js'
 
 const CommonDict = (!localStorage.getItem('lang') || localStorage.getItem('lang') === 'zh-CN') ? zhCN : enUS
 
 class CommonTableBaseData {
   baseConfig = {
     type: 'system',
+    Template: 'CommonTable',
     enabled: false,
     setting: {
       actionfixed: false,
@@ -17,11 +18,11 @@
       order: '',
       dataresource: '',
       interType: 'inner',
+      sysInterface: 'false',
       innerFunc: '',
       interface: '',
       outerFunc: '',
-      onload: 'true',
-      subtabs: []
+      onload: 'true'
     },
     tables: [],
     search: [
@@ -35,11 +36,6 @@
         resourceType: '0',
         setAll: 'false',
         options: [],
-        dataSource: '',
-        linkField: '',
-        valueField: '',
-        valueText: '',
-        orderBy: '',
         orderType: 'asc',
         match: 'like',
         display: 'dropdown'
@@ -53,11 +49,6 @@
         resourceType: '0',
         setAll: 'false',
         options: [],
-        dataSource: '',
-        linkField: '',
-        valueField: '',
-        valueText: '',
-        orderBy: '',
         orderType: 'asc',
         match: 'equal',
         display: 'dropdown'
@@ -71,11 +62,6 @@
         resourceType: '0',
         setAll: 'false',
         options: [],
-        dataSource: '',
-        linkField: '',
-        valueField: '',
-        valueText: '',
-        orderBy: '',
         orderType: 'asc',
         match: 'greater',
         display: 'dropdown'
@@ -87,21 +73,13 @@
         uuid: Utils.getuuid(),
         label: 'add',
         intertype: 'inner',
-        innerFunc: '',
-        interface: '',
         method: 'POST',
-        outerFunc: '',
-        sql: '',
-        sqlType: '',
-        callbackFunc: '',
         Ot: 'notRequired',
         position: 'toolbar',
         execSuccess: 'grid',
         execError: 'never',
         errorTime: 15,
         OpenType: 'pop',
-        pageTemplate: '',
-        url: '',
         icon: 'plus',
         class: 'green',
         verify: null
@@ -110,21 +88,13 @@
         uuid: Utils.getuuid(),
         label: 'update',
         intertype: 'inner',
-        innerFunc: '',
-        interface: '',
         method: 'POST',
-        outerFunc: '',
-        sql: '',
-        sqlType: '',
-        callbackFunc: '',
         Ot: 'requiredSgl',
         position: 'grid',
         execSuccess: 'grid',
         execError: 'never',
         errorTime: 15,
         OpenType: 'pop',
-        pageTemplate: '',
-        url: '',
         icon: 'form',
         class: 'purple',
         verify: null
@@ -133,21 +103,13 @@
         uuid: Utils.getuuid(),
         label: 'delete',
         intertype: 'inner',
-        innerFunc: '',
-        interface: '',
         method: 'POST',
-        outerFunc: '',
-        sql: '',
-        sqlType: '',
-        callbackFunc: '',
         Ot: 'required',
         position: 'toolbar',
         execSuccess: 'grid',
         execError: 'never',
         errorTime: 15,
         OpenType: 'prompt',
-        pageTemplate: '',
-        url: '',
         icon: 'delete',
         class: 'red',
         verify: null
@@ -207,31 +169,37 @@
       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']
+    tabgroups: [{
+      uuid: 'tabs',
+      sublist: [
+        {
+          origin: true,          // 鏄惁涓虹ず渚�
+          uuid: Utils.getuuid(),
+          label: 'tab1',
+          type: 'SubTable',
+          linkTab: '',
+          supMenu: ''
+        },
+        {
+          origin: true,
+          uuid: Utils.getuuid(),
+          label: 'tab2',
+          type: 'SubTable',
+          linkTab: '',
+          supMenu: ''
+        }
+      ]
+    }],
+    expand: false,
+    charts: [{
+      uuid: Utils.getuuid(),
+      label: '',
+      title: '',
+      chartType: 'table',
+      icon: 'table',
+      Hide: 'false',
+      blacklist: []
+    }]
   }
 
   searchItems = [
@@ -333,6 +301,12 @@
       label: CommonDict['header.form.newpage.outer'],
       subType: 'outerpage',
       url: ''
+    },
+    {
+      type: 'action',
+      label: CommonDict['header.form.funcbutton'],
+      subType: 'funcbutton',
+      url: ''
     }
   ]
 
@@ -357,6 +331,12 @@
     },
     {
       type: 'columns',
+      label: CommonDict['header.form.textarea'],
+      subType: 'textarea',
+      url: ''
+    },
+    {
+      type: 'columns',
       label: CommonDict['header.form.colspan'],
       subType: 'colspan',
       url: ''

--
Gitblit v1.8.0