From c519b4e51fe07bf13a2a7e44abd648b8dc0c083d Mon Sep 17 00:00:00 2001
From: king <18310653075@163.com>
Date: 星期二, 23 六月 2020 12:12:12 +0800
Subject: [PATCH] 2020-06-23

---
 src/templates/subtableconfig/source.jsx |   52 +++++++++++++++++++++++++++++-----------------------
 1 files changed, 29 insertions(+), 23 deletions(-)

diff --git a/src/templates/subtableconfig/source.jsx b/src/templates/subtableconfig/source.jsx
index 76866b1..d625409 100644
--- a/src/templates/subtableconfig/source.jsx
+++ b/src/templates/subtableconfig/source.jsx
@@ -2,7 +2,7 @@
 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 SubTableBaseData {
   baseConfig = {
@@ -164,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',
@@ -185,55 +185,55 @@
   searchItems = [
     {
       type: 'search',
-      label: CommonDict['header.form.text'],
+      label: CommonDict['model.form.text'],
       subType: 'text',
       url: ''
     },
     {
       type: 'search',
-      label: CommonDict['header.form.select'],
+      label: CommonDict['model.form.select'],
       subType: 'select',
       url: ''
     },
     {
       type: 'search',
-      label: CommonDict['header.form.multiselect'],
+      label: CommonDict['model.form.multiselect'],
       subType: 'multiselect',
       url: ''
     },
     {
       type: 'search',
-      label: CommonDict['header.form.link'],
+      label: CommonDict['model.form.link'],
       subType: 'link',
       url: ''
     },
     {
       type: 'search',
-      label: CommonDict['header.form.dateday'],
+      label: CommonDict['model.form.dateday'],
       subType: 'date',
       url: ''
     },
     {
       type: 'search',
-      label: CommonDict['header.form.dateweek'],
+      label: CommonDict['model.form.dateweek'],
       subType: 'dateweek',
       url: ''
     },
     {
       type: 'search',
-      label: CommonDict['header.form.datemonth'],
+      label: CommonDict['model.form.datemonth'],
       subType: 'datemonth',
       url: ''
     },
     {
       type: 'search',
-      label: CommonDict['header.form.daterange'],
+      label: CommonDict['model.form.daterange'],
       subType: 'daterange',
       url: ''
     },
     {
       type: 'search',
-      label: '鏃ユ湡锛堢粍鍚堬級',
+      label: CommonDict['model.form.dategroup'],
       subType: 'group',
       url: ''
     }
@@ -242,43 +242,43 @@
   actionItems = [
     {
       type: 'action',
-      label: CommonDict['header.form.popform'],
+      label: CommonDict['model.form.popform'],
       subType: 'pop',
       url: ''
     },
     {
       type: 'action',
-      label: CommonDict['header.form.popview'],
+      label: CommonDict['model.form.popview'],
       subType: 'popview',
       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.funcbutton'],
+      label: CommonDict['model.form.funcbutton'],
       subType: 'funcbutton',
       url: ''
     }
@@ -287,31 +287,37 @@
   columnItems = [
     {
       type: 'columns',
-      label: CommonDict['header.form.text'],
+      label: CommonDict['model.form.text'],
       subType: 'text',
       url: ''
     },
     {
       type: 'columns',
-      label: CommonDict['header.form.picture'],
+      label: CommonDict['model.form.picture'],
       subType: 'picture',
       url: ''
     },
     {
       type: 'columns',
-      label: CommonDict['header.form.number'],
+      label: CommonDict['model.form.number'],
       subType: 'number',
       url: ''
     },
     {
       type: 'columns',
-      label: CommonDict['header.form.textarea'],
+      label: CommonDict['model.form.textarea'],
       subType: 'textarea',
       url: ''
     },
     {
       type: 'columns',
-      label: CommonDict['header.form.colspan'],
+      label: CommonDict['model.form.href'],
+      subType: 'link',
+      url: ''
+    },
+    {
+      type: 'columns',
+      label: CommonDict['model.form.colspan'],
       subType: 'colspan',
       url: ''
     }

--
Gitblit v1.8.0