From 2d3f82c3e07e6acaedbeae8b4ce0849dd588abc6 Mon Sep 17 00:00:00 2001
From: king <18310653075@163.com>
Date: 星期三, 29 七月 2020 10:09:32 +0800
Subject: [PATCH] 2020-07-29

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

diff --git a/src/templates/comtableconfig/source.jsx b/src/templates/comtableconfig/source.jsx
index 502fe78..ec96326 100644
--- a/src/templates/comtableconfig/source.jsx
+++ b/src/templates/comtableconfig/source.jsx
@@ -2,10 +2,11 @@
 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
+const CommonDict = localStorage.getItem('lang') !== 'en-US' ? zhCN : enUS
 
 class CommonTableBaseData {
   baseConfig = {
+    version: '1.0',
     type: 'system',
     Template: 'CommonTable',
     enabled: false,
@@ -163,7 +164,7 @@
       Align: 'center',
       IsSort: 'false',
       uuid: Utils.getuuid(),
-      label: CommonDict['header.form.column.action'],
+      label: CommonDict['model.form.column.action'],
       type: 'action',
       style: 'button',
       show: 'horizontal',
@@ -205,38 +206,56 @@
   searchItems = [
     {
       type: 'search',
-      label: '鏂囨湰妗�',
+      label: CommonDict['model.form.text'],
       subType: 'text',
       url: ''
     },
     {
       type: 'search',
-      label: '涓嬫媺妗�',
+      label: CommonDict['model.form.select'],
       subType: 'select',
       url: ''
     },
     {
       type: 'search',
-      label: '鏃堕棿妗嗭紙澶╋級',
+      label: CommonDict['model.form.multiselect'],
+      subType: 'multiselect',
+      url: ''
+    },
+    {
+      type: 'search',
+      label: CommonDict['model.form.link'],
+      subType: 'link',
+      url: ''
+    },
+    {
+      type: 'search',
+      label: CommonDict['model.form.dateday'],
       subType: 'date',
       url: ''
     },
     {
       type: 'search',
-      label: '鏃堕棿妗嗭紙鍛級',
+      label: CommonDict['model.form.dateweek'],
       subType: 'dateweek',
       url: ''
     },
     {
       type: 'search',
-      label: '鏃堕棿妗嗭紙鏈堬級',
+      label: CommonDict['model.form.datemonth'],
       subType: 'datemonth',
       url: ''
     },
     {
       type: 'search',
-      label: '鏃堕棿妗嗭紙鍖洪棿锛�',
+      label: CommonDict['model.form.daterange'],
       subType: 'daterange',
+      url: ''
+    },
+    {
+      type: 'search',
+      label: CommonDict['model.form.dategroup'],
+      subType: 'group',
       url: ''
     }
   ]
@@ -244,67 +263,55 @@
   actionItems = [
     {
       type: 'action',
-      label: CommonDict['header.form.popform'],
+      label: CommonDict['model.form.popform'],
       subType: 'pop',
       url: ''
     },
     {
       type: 'action',
-      label: CommonDict['header.form.prompt'],
+      label: CommonDict['model.form.prompt'],
       subType: 'prompt',
       url: ''
     },
     {
       type: 'action',
-      label: CommonDict['header.form.exec'],
+      label: CommonDict['model.form.exec'],
       subType: 'exec',
       url: ''
     },
     {
       type: 'action',
-      label: CommonDict['header.form.excelIn'],
+      label: CommonDict['model.form.excelIn'],
       subType: 'excelIn',
       url: ''
     },
     {
       type: 'action',
-      label: CommonDict['header.form.excelOut'],
+      label: CommonDict['model.form.excelOut'],
       subType: 'excelOut',
       url: ''
     },
     {
       type: 'action',
-      label: CommonDict['header.form.popview'],
+      label: CommonDict['model.form.popview'],
       subType: 'popview',
       url: ''
     },
     {
       type: 'action',
-      label: CommonDict['header.form.tab'],
+      label: CommonDict['model.form.tab'],
       subType: 'tab',
       url: ''
     },
     {
       type: 'action',
-      label: CommonDict['header.form.blank'],
-      subType: 'blank',
-      url: ''
-    },
-    {
-      type: 'action',
-      label: CommonDict['header.form.newpage.inner'],
+      label: CommonDict['model.form.newpage'],
       subType: 'innerpage',
       url: ''
     },
     {
       type: 'action',
-      label: CommonDict['header.form.newpage.outer'],
-      subType: 'outerpage',
-      url: ''
-    },
-    {
-      type: 'action',
-      label: CommonDict['header.form.funcbutton'],
+      label: CommonDict['model.form.funcbutton'],
       subType: 'funcbutton',
       url: ''
     }
@@ -313,31 +320,37 @@
   columnItems = [
     {
       type: 'columns',
-      label: CommonDict['header.form.text'],
+      label: CommonDict['model.form.text'],
       subType: 'text',
       url: ''
     },
     {
       type: 'columns',
-      label: CommonDict['header.form.number'],
+      label: CommonDict['model.form.number'],
       subType: 'number',
       url: ''
     },
     {
       type: 'columns',
-      label: CommonDict['header.form.picture'],
+      label: CommonDict['model.form.picture'],
       subType: 'picture',
       url: ''
     },
     {
       type: 'columns',
-      label: CommonDict['header.form.textarea'],
+      label: CommonDict['model.form.href'],
+      subType: 'link',
+      url: ''
+    },
+    {
+      type: 'columns',
+      label: CommonDict['model.form.textarea'],
       subType: 'textarea',
       url: ''
     },
     {
       type: 'columns',
-      label: CommonDict['header.form.colspan'],
+      label: CommonDict['model.form.colspan'],
       subType: 'colspan',
       url: ''
     }
@@ -346,7 +359,7 @@
   tabItems = [
     {
       type: 'tabs',
-      label: CommonDict['header.menu.tab.subtable'],
+      label: CommonDict['model.menu.tab.subtable'],
       subType: 'SubTable',
     }
   ]

--
Gitblit v1.8.0