From f3d4db769ba9b51b799d981511a710fd443d0e08 Mon Sep 17 00:00:00 2001 From: king <18310653075@163.com> Date: 星期一, 21 四月 2025 12:18:03 +0800 Subject: [PATCH] Merge branch 'master' into positec --- src/menu/modalconfig/tablecomponent/index.jsx | 12 ++++++------ 1 files changed, 6 insertions(+), 6 deletions(-) diff --git a/src/menu/modalconfig/tablecomponent/index.jsx b/src/menu/modalconfig/tablecomponent/index.jsx index 01fd0f2..4d1e307 100644 --- a/src/menu/modalconfig/tablecomponent/index.jsx +++ b/src/menu/modalconfig/tablecomponent/index.jsx @@ -5,7 +5,6 @@ import moment from 'moment' import Api from '@/api' -import options from '@/store/options.js' import Utils from '@/utils/utils.js' import MKEmitter from '@/utils/events.js' import { queryTableSql } from '@/utils/option.js' @@ -41,16 +40,17 @@ 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 (options.cloudServiceApi) { // 涓斿瓨鍦ㄤ簯绔湴鍧� - param.rduri = options.cloudServiceApi + if (window.GLOB.cloudServiceApi) { // 涓斿瓨鍦ㄤ簯绔湴鍧� + param.rduri = window.GLOB.cloudServiceApi param.userid = sessionStorage.getItem('CloudUserID') || '' param.LoginUID = sessionStorage.getItem('CloudLoginUID') || '' } -- Gitblit v1.8.0