From ba4d6e414fbb37121e80815d3f5ab1aca7a60b08 Mon Sep 17 00:00:00 2001
From: king <18310653075@163.com>
Date: 星期一, 28 十月 2024 13:59:34 +0800
Subject: [PATCH] Merge branch 'develop'
---
src/templates/sharecomponent/tablecomponent/index.jsx | 11 +++++++----
1 files changed, 7 insertions(+), 4 deletions(-)
diff --git a/src/templates/sharecomponent/tablecomponent/index.jsx b/src/templates/sharecomponent/tablecomponent/index.jsx
index 69e7a3b..f6088e5 100644
--- a/src/templates/sharecomponent/tablecomponent/index.jsx
+++ b/src/templates/sharecomponent/tablecomponent/index.jsx
@@ -51,6 +51,8 @@
this.onTableChange(table)
} else if (type === 'del') {
this.deleteTable(table)
+ } else if (type === 'init' && window.GLOB.publicTables.length === 0) {
+ this.onTableChange(table)
}
}
@@ -62,12 +64,13 @@
func: 'sPC_Get_SelectedList',
LText: queryTableSql,
obj_name: 'data',
- arr_field: 'TbName,Remark'
+ arr_field: 'TbName,Remark',
+ exec_type: 'x'
}
- param.LText = Utils.formatOptions(param.LText)
+ param.LText = Utils.formatOptions(param.LText, 'x')
param.timestamp = moment().format('YYYY-MM-DD HH:mm:ss')
- param.secretkey = Utils.encrypt(param.LText, param.timestamp)
+ param.secretkey = Utils.encrypt('', param.timestamp)
param.open_key = Utils.encryptOpenKey(param.secretkey, param.timestamp) // 浜戠鏁版嵁楠岃瘉
if (window.GLOB.cloudServiceApi) { // 涓斿瓨鍦ㄤ簯绔湴鍧�
@@ -102,7 +105,7 @@
let _table = tables.filter(item => item.TbName === value)[0]
- if (selectedTables.findIndex(cell => cell.TbName === value) > -1) return
+ if (!_table || selectedTables.findIndex(cell => cell.TbName === value) > -1) return
let _tables = [...selectedTables, _table]
--
Gitblit v1.8.0