From 8904592cf12f091aece5d6fc564fd8478fc8988b Mon Sep 17 00:00:00 2001
From: king <18310653075@163.com>
Date: 星期四, 13 二月 2020 20:04:56 +0800
Subject: [PATCH] 2020-02-13
---
src/templates/formtabconfig/index.jsx | 8 +++++---
1 files changed, 5 insertions(+), 3 deletions(-)
diff --git a/src/templates/formtabconfig/index.jsx b/src/templates/formtabconfig/index.jsx
index af05280..830ea64 100644
--- a/src/templates/formtabconfig/index.jsx
+++ b/src/templates/formtabconfig/index.jsx
@@ -13,9 +13,10 @@
import Utils from '@/utils/utils.js'
import { getModalForm, getActionForm } from '@/templates/tableshare/formconfig'
+import ModalForm from '@/templates/ushare/modalform'
import ActionForm from './actionform'
import SettingForm from './settingform'
-import ModalForm from './modalform'
+// import ModalForm from './modalform'
import DragElement from './dragelement'
import GroupForm from './groupform'
import TabForm from '@/templates/tableshare/tabform'
@@ -122,7 +123,8 @@
componentDidMount () {
let param = {
func: 'sPC_Get_SelectedList',
- LText: 'select TbName ,Remark from sDataDictionary where IsKey!=\'\' and Deleted =0',
+ // LText: 'select TbName ,Remark from sDataDictionary where IsKey!=\'\' and Deleted =0',
+ LText: 'select TbName,Remark from (select TbName,Remark from sDataDictb where appkey= @appkey@ and Deleted=0 union select a.TbName,Remark from (select TbName,Remark from sDataDictb where appkey= \'\' and Deleted=0 ) a left join (select TbName from sDataDictb where appkey= @appkey@ and Deleted=0 ) b on a.TbName=b.TbName where b.TbName is null ) t',
obj_name: 'data',
arr_field: 'TbName,Remark'
}
@@ -1210,7 +1212,7 @@
func: 'sPC_Button_AddUpt',
Type: 60, // 娣诲姞鎸夐挳琛ㄥ崟椤典笅鐨勬寜閽�
ParentID: menu.MenuID,
- MenuNo: res.menuNo,
+ MenuNo: menu.MenuNo,
Template: menu.PageParam.Template || '',
PageParam: '',
LongParam: '',
--
Gitblit v1.8.0