From 83957eba1ad5bde31feced0bf07e28bd95389009 Mon Sep 17 00:00:00 2001
From: zhangyanpeng <bob.zhang@highdatas.com>
Date: 星期一, 26 八月 2024 19:58:23 +0800
Subject: [PATCH] 调整
---
module/config/page/sys_menu_edit.html | 102 +++++++++++++++++++++++++++++++++++++++++++++------
1 files changed, 90 insertions(+), 12 deletions(-)
diff --git a/module/config/page/sys_menu_edit.html b/module/config/page/sys_menu_edit.html
index 6d1abf3..2fcd2d7 100644
--- a/module/config/page/sys_menu_edit.html
+++ b/module/config/page/sys_menu_edit.html
@@ -43,7 +43,7 @@
{
name: "sys_menunotpage",
dataname: "sys_menu",
- filter: " page_id is null",
+ filter: " page_id is null ",
isnotoption: false, //true:涓嶆槸閫夐」
code:"id",//鏄笅鎷夐�夐」鏃惰缃�
label:"name",//鏄笅鎷夐�夐」鏃惰缃�
@@ -51,7 +51,7 @@
{
name: "modelByPage",
dataname: "sys_model",
- filter: "is_detail='F'",
+ filter: "open_type='page'",
isnotoption: false, //true:涓嶆槸閫夐」
code:"id",//鏄笅鎷夐�夐」鏃惰缃�
label:"name",//鏄笅鎷夐�夐」鏃惰缃�
@@ -59,7 +59,7 @@
{
name: "modelBydetail",
dataname: "sys_model",
- filter: "is_detail='T'",
+ filter: "open_type in ('popup','tab')",
isnotoption: false, //true:涓嶆槸閫夐」
code:"id",//鏄笅鎷夐�夐」鏃惰缃�
label:"name",//鏄笅鎷夐�夐」鏃惰缃�
@@ -92,7 +92,7 @@
{isshow: "T", field: "model_id", labelchinese: "妯″瀷閫夋嫨", inputtype: "select", optionsgroup: "", colspan: 1, group_name: "椤甸潰閰嶇疆", buttonarrayname: [{type: "", buttonname:"妯″瀷缁存姢", icon: "", code:"showfile", classname: "form_showfile"}]},
{isshow: "T", field: "dataname", labelchinese: "鏁版嵁瀵硅薄", inputtype: "", optionsgroup: "", group_name: "椤甸潰閰嶇疆", buttonarrayname: [{type: "", buttonname:"瀵硅薄缁存姢", icon: "", code:"showfile", classname: "form_showfile"}]},
{isshow: "T", field: "buttons", labelchinese: "鍔熻兘閫夋嫨", inputtype: "checkboxobj", optionsgroup: "", colspan: 2, group_name: "椤甸潰閰嶇疆"},
- {isshow: "T", field: "detail_model_id", labelchinese: "璇︽儏妯″瀷閫夋嫨", inputtype: "select", optionsgroup: "", colspan: 2, group_name: "椤甸潰閰嶇疆", labelwidth: "120", visiblefilterrule: "buttons锛欰dd銆丒dit銆丗ormDetail"},
+ {isshow: "T", field: "detail_model_id", labelchinese: "璇︽儏妯″瀷閫夋嫨", inputtype: "select", optionsgroup: "", colspan: 2, group_name: "椤甸潰閰嶇疆", labelwidth: "120", visiblefilterrule: "buttons锛欰dd銆丒dit銆丗ormDetail", buttonarrayname: [{type: "", buttonname:"璇︽儏妯″瀷缁存姢", icon: "", code:"detail_model", classname: "form_showfile"},{type: "", buttonname:"璇︽儏椤甸厤缃�", icon: "", code:"popup_detail_model", classname: ""}]},
],
tableFields_table: [
@@ -134,7 +134,7 @@
},
created() {
let clientHeight = document.documentElement.clientHeight;
- this.tableHeight = clientHeight - 250 - 32;
+ this.tableHeight = clientHeight - 250 - 32 - 10;
},
@@ -211,12 +211,14 @@
menuToPageTree(oldmenus) {
var me = this;
oldmenus.map(om=>{
- if (om.id && om.open_type && om.open_type == "arrange") {
+
+ if (om.id && om.open_type && om.open_type == "arrange" && om.page_id) {
om.isnot_nodeadd = true; // 鑺傜偣涓嶅彲鏂板
}
- else if (om.id && !om.page_id) {
+ else if (om.id && !om.page_id ) {
// om.isnot_nodeadd = true; // 鑺傜偣涓嶅彲鏂板
- om.isnot_nodeedit = true; // 鑺傜偣涓嶅彲鏀�
+ // om.isnot_nodeedit = true; // 鑺傜偣涓嶅彲鏀�
+ om.ishnodeadd = true;
om.isnot_nodedel = true; // 鑺傜偣涓嶅彲鍒�
}
else {
@@ -471,7 +473,7 @@
var parent_ids_ = [];
var parent_ids = this.getParents(data_.parent_id, this.options_menumap, parent_ids_);
- data_.parent_id = parent_ids
+ data_.parent_id = parent_ids_
}
data_.buttons = []
data_.detail_model_id = ""
@@ -514,6 +516,21 @@
delta: {},
sceneCode: "add",//"refuseedit",//"approval", //"add"//"browse",
callback: function(obj, callback) {
+ me.options_menutree = clone(obj.treeoptions)
+ var sys_menunotpage_ = clone(obj.listoptions);
+ me.options_menumap = {}
+ sys_menunotpage_.map(m=>{
+ me.options_menumap[m.id] = m;
+ })
+
+ var formFields_ = clone(me.formFields)
+ formFields_.map(f=>{
+ if(f.field == "parent_id") {
+ f.options = (me.options_menutree)
+ }
+ })
+ me.formFields = clone(formFields_)
+
me.getMenuAll();
if (callback) {
callback();
@@ -535,6 +552,19 @@
data: data,
sceneCode: "edit",
callback: function(options_obj, callback) {
+ me.options_menutree = clone(obj.treeoptions)
+ var sys_menunotpage_ = clone(obj.listoptions);
+ me.options_menumap = {}
+ sys_menunotpage_.map(m=>{
+ me.options_menumap[m.id] = m;
+ })
+ var formFields_ = clone(me.formFields)
+ formFields_.map(f=>{
+ if(f.field == "parent_id") {
+ f.options = (me.options_menutree)
+ }
+ })
+ me.formFields = clone(formFields_)
me.getMenuAll();
if (callback) {
callback();
@@ -615,6 +645,35 @@
},
},
+ detail_model_id: {
+ buttonarray: {
+ onclick: function(obj) {
+ if (obj.buttonobj.code == "popup_detail_model") {
+ let sceneCode = "add"
+ var config = {
+ totab: false, //true: 浠ab瀵艰埅鐨勬柟寮忔墦寮�
+ width: "900px",
+ height: "500px",
+ icon: "icon-product",
+ text: "缂栬緫椤甸厤缃�",
+ id: "popup_tablefield_edit" + sceneCode,//totab: true鏃堕渶璁剧疆锛岀敤浜庡垽鏂槸鍚﹀凡鎵撳紑姝ら〉闈�
+ url: "module/config/page/popup/popup_tablefield_edit.html",
+ dataname: me.dataname,
+ data: {},
+ delta: {dataname: me.dataname, tabledata: me.tableData, tablefields: me.tableFields_form},
+ sceneCode: sceneCode,//"refuseedit",//"approval", //"add"//"browse",
+ callback: function(obj, callback) {
+ me.tableData = clone(obj.tableData)
+ if (callback) {
+ callback();
+ }
+ }
+ };
+ me.doPopupByPublic(config);
+ }
+ },
+ },
+ },
model_id: {
buttonarray: {
onclick: function(obj) {
@@ -625,7 +684,7 @@
onchange: function(obj,row,callback) { //涓嬫媺灞曞紑浜嬩欢
let param_ = {
dataname: "sys_model",//鑾峰彇缁忛攢鍟嗗搴旀敹璐у湴鍧�
- filter:"is_detail='F'",
+ filter:"open_type='page'",
}
Server.call("root/data/getEntitySet", param_, function(result) {
if (result && result.data && result.data.entityset) {
@@ -756,6 +815,19 @@
delta: {},
sceneCode: "addmenu",//"refuseedit",//"approval", //"add"//"browse",
callback: function(obj, callback) {
+ me.options_menutree = clone(obj.treeoptions)
+ var sys_menunotpage_ = clone(obj.listoptions);
+ me.options_menumap = {}
+ sys_menunotpage_.map(m=>{
+ me.options_menumap[m.id] = m;
+ })
+ var formFields_ = clone(me.formFields)
+ formFields_.map(f=>{
+ if(f.field == "parent_id") {
+ f.options = (me.options_menutree)
+ }
+ })
+ me.formFields = clone(formFields_)
me.getMenuAll();
if (callback) {
callback();
@@ -770,7 +842,7 @@
var entity_ = clone(this.formData);
var entity_menu = {
id: entity_.id,
- parent_id: entity_.parent_id,
+ parent_id: entity_.parent_id[entity_.parent_id.length - 1],
icon: entity_.icon,
title: entity_.title
};
@@ -845,6 +917,7 @@
last_update_time: datetime_,
label_chinese: r.label_chinese,
is_list: r.is_list ? r.is_list : false,
+ is_form: r.is_form ? r.is_form : false,
is_filter: r.is_filter ? r.is_filter : false,
list_order_no: r.list_order_no ? r.list_order_no : 0,
form_order_no: r.form_order_no ? r.form_order_no : 0,
@@ -984,6 +1057,11 @@
position: relative;
padding-left: 20px;
}
+ .h_form_group {
+ height: 32px;
+ line-height: 32px;
+ margin-top: 5px !important;
+ }
</style>
</head>
@@ -1035,7 +1113,7 @@
</div>
</div>
- <div style="margin: 16px;">
+ <div style="margin: 0 10px;">
<h-form
ref="form1"
:form-attr="formAttr"
--
Gitblit v1.8.0