From bbcb3f45ad0ef4c808bf5a68ec10c0464c094e2f Mon Sep 17 00:00:00 2001
From: king <18310653075@163.com>
Date: 星期三, 27 十月 2021 11:51:40 +0800
Subject: [PATCH] Merge branch 'master' into bms

---
 src/templates/comtableconfig/source.jsx |   28 +++++++++++++++++-----------
 1 files changed, 17 insertions(+), 11 deletions(-)

diff --git a/src/templates/comtableconfig/source.jsx b/src/templates/comtableconfig/source.jsx
index 0c0ee33..6743863 100644
--- a/src/templates/comtableconfig/source.jsx
+++ b/src/templates/comtableconfig/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 CommonTableBaseData {
   baseConfig = {
@@ -74,13 +74,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',
@@ -89,13 +87,11 @@
         origin: true,
         uuid: Utils.getuuid(),
         label: 'update',
-        intertype: 'inner',
-        method: 'POST',
+        intertype: 'system',
         Ot: 'requiredSgl',
-        position: 'grid',
+        position: 'toolbar',
         execSuccess: 'grid',
         execError: 'never',
-        errorTime: 15,
         OpenType: 'pop',
         icon: 'form',
         class: 'purple',
@@ -104,13 +100,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',
@@ -227,6 +221,12 @@
       type: 'search',
       label: CommonDict['model.form.link'],
       subType: 'link',
+      url: ''
+    },
+    {
+      type: 'search',
+      label: '閫夐」鍗�',
+      subType: 'checkcard',
       url: ''
     },
     {
@@ -354,6 +354,12 @@
       label: CommonDict['model.form.colspan'],
       subType: 'colspan',
       url: ''
+    },
+    {
+      type: 'columns',
+      label: '搴忓彿',
+      subType: 'index',
+      url: ''
     }
   ]
 

--
Gitblit v1.8.0