From 8d66ff34fae5b048a6b7923cc75d34f13a08be9d Mon Sep 17 00:00:00 2001
From: king <18310653075@163.com>
Date: 星期二, 02 八月 2022 11:42:43 +0800
Subject: [PATCH] Merge branch 'develop'

---
 src/templates/subtableconfig/source.jsx |   64 +++++++++++++++++++-------------
 1 files changed, 38 insertions(+), 26 deletions(-)

diff --git a/src/templates/subtableconfig/source.jsx b/src/templates/subtableconfig/source.jsx
index 3b0a0c8..bb48d97 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') !== 'en-US' ? zhCN : enUS
+const CommonDict = sessionStorage.getItem('lang') !== 'en-US' ? zhCN : enUS
 
 class SubTableBaseData {
   baseConfig = {
@@ -20,7 +20,7 @@
       primaryKey: '',
       order: '',
       dataresource: '',
-      interType: 'inner',
+      interType: 'system',
       innerFunc: '',
       interface: '',
       outerFunc: ''
@@ -35,11 +35,9 @@
         initval: '',
         type: 'text',
         resourceType: '0',
-        setAll: 'false',
         options: [],
         orderType: 'asc',
         match: 'like',
-        display: 'dropdown'
       }, {
         origin: true,
         uuid: Utils.getuuid(),
@@ -48,11 +46,9 @@
         initval: '',
         type: 'select',
         resourceType: '0',
-        setAll: 'false',
         options: [],
         orderType: 'asc',
         match: 'equal',
-        display: 'dropdown'
       }, {
         origin: true,
         uuid: Utils.getuuid(),
@@ -61,11 +57,9 @@
         initval: '',
         type: 'date',
         resourceType: '0',
-        setAll: 'false',
         options: [],
         orderType: 'asc',
         match: 'greater',
-        display: 'dropdown'
       }
     ],
     action: [
@@ -73,13 +67,11 @@
         origin: true,
         uuid: Utils.getuuid(),
         label: 'add',
-        intertype: 'inner',
-        method: 'POST',
+        intertype: 'system',
         Ot: 'notRequired',
         position: 'toolbar',
         execSuccess: 'grid',
         execError: 'never',
-        errorTime: 15,
         OpenType: 'pop',
         icon: 'plus',
         class: 'green',
@@ -88,13 +80,11 @@
         origin: true,
         uuid: Utils.getuuid(),
         label: 'update',
-        intertype: 'inner',
-        method: 'POST',
+        intertype: 'system',
         Ot: 'requiredSgl',
         position: 'grid',
         execSuccess: 'grid',
         execError: 'never',
-        errorTime: 15,
         OpenType: 'pop',
         icon: 'form',
         class: 'purple',
@@ -103,13 +93,11 @@
         origin: true,
         uuid: Utils.getuuid(),
         label: 'delete',
-        intertype: 'inner',
-        method: 'POST',
+        intertype: 'system',
         Ot: 'required',
         position: 'toolbar',
         execSuccess: 'grid',
         execError: 'never',
-        errorTime: 15,
         OpenType: 'prompt',
         icon: 'delete',
         class: 'red',
@@ -164,7 +152,7 @@
       Align: 'center',
       IsSort: 'false',
       uuid: Utils.getuuid(),
-      label: CommonDict['model.form.column.action'],
+      label: CommonDict['model.operation'],
       type: 'action',
       style: 'button',
       show: 'horizontal',
@@ -209,13 +197,19 @@
     },
     {
       type: 'search',
-      label: CommonDict['model.form.dateday'],
+      label: '閫夐」鍗�',
+      subType: 'checkcard',
+      url: ''
+    },
+    {
+      type: 'search',
+      label: '鏃ユ湡锛堝ぉ锛�',
       subType: 'date',
       url: ''
     },
     {
       type: 'search',
-      label: CommonDict['model.form.dateweek'],
+      label: '鏃ユ湡锛堝懆锛�',
       subType: 'dateweek',
       url: ''
     },
@@ -248,12 +242,6 @@
     },
     {
       type: 'action',
-      label: CommonDict['model.form.popview'],
-      subType: 'popview',
-      url: ''
-    },
-    {
-      type: 'action',
       label: CommonDict['model.form.prompt'],
       subType: 'prompt',
       url: ''
@@ -274,6 +262,24 @@
       type: 'action',
       label: CommonDict['model.form.excelOut'],
       subType: 'excelOut',
+      url: ''
+    },
+    {
+      type: 'action',
+      label: CommonDict['model.form.popview'],
+      subType: 'popview',
+      url: ''
+    },
+    {
+      type: 'action',
+      label: CommonDict['model.form.tab'],
+      subType: 'tab',
+      url: ''
+    },
+    {
+      type: 'action',
+      label: CommonDict['model.form.newpage'],
+      subType: 'innerpage',
       url: ''
     },
     {
@@ -320,6 +326,12 @@
       label: CommonDict['model.form.colspan'],
       subType: 'colspan',
       url: ''
+    },
+    {
+      type: 'columns',
+      label: '搴忓彿',
+      subType: 'index',
+      url: ''
     }
   ]
 }

--
Gitblit v1.8.0