From 2c4e339508f78a215518a8a12af34ca0b1564d44 Mon Sep 17 00:00:00 2001
From: wtt <1985833171@qq.com>
Date: 星期五, 31 十月 2025 13:07:03 +0800
Subject: [PATCH] Merge branch 'master' of http://101.37.171.70:10101/r/MES-WEB-LayUI
---
WebTM/views/基础资料/隐藏列设置/Gy_GridView_Hide_New.html | 90 ++++++++++++++++++++++++++++++++++++++++-----
1 files changed, 80 insertions(+), 10 deletions(-)
diff --git "a/WebTM/views/\345\237\272\347\241\200\350\265\204\346\226\231/\351\232\220\350\227\217\345\210\227\350\256\276\347\275\256/Gy_GridView_Hide_New.html" "b/WebTM/views/\345\237\272\347\241\200\350\265\204\346\226\231/\351\232\220\350\227\217\345\210\227\350\256\276\347\275\256/Gy_GridView_Hide_New.html"
index 0c6e010..b488e9f 100644
--- "a/WebTM/views/\345\237\272\347\241\200\350\265\204\346\226\231/\351\232\220\350\227\217\345\210\227\350\256\276\347\275\256/Gy_GridView_Hide_New.html"
+++ "b/WebTM/views/\345\237\272\347\241\200\350\265\204\346\226\231/\351\232\220\350\227\217\345\210\227\350\256\276\347\275\256/Gy_GridView_Hide_New.html"
@@ -11,16 +11,29 @@
<script src="../../../layuiadmin/Scripts/jquery-1.4.1.js"></script>
<script src="../../../layuiadmin/Scripts/webConfig.js"></script>
<script src="../../../layuiadmin/PubCustom.js"></script>
+ <script src="../../../layuiadmin/soulTable.slim.js"></script>
+ <!-- <script src="../../../layuiadmin/zy_DragObserver.js"></script> -->
<style>
/* 闃叉涓嬫媺妗嗙殑涓嬫媺鍒楄〃琚殣钘�---蹇呴』璁剧疆--- */
- .layui-table-cell {
+ /*.layui-table-cell {
overflow: visible !important;
- }
+ }*/
/* 浣垮緱涓嬫媺妗嗕笌鍗曞厓鏍煎垰濂藉悎閫� */
- td .layui-form-select {
+ /*td .layui-form-select {
margin-top: -10px;
margin-left: -15px;
margin-right: -15px;
+ }*/
+ /* 闃叉涓嬫媺妗嗙殑涓嬫媺鍒楄〃琚殣钘�---蹇呴』璁剧疆--- */
+ td:has(select) .layui-table-cell {
+ overflow: visible !important;
+ padding: 0;
+ box-sizing: border-box;
+ }
+
+ /* 浣垮緱涓嬫媺妗嗕笌鍗曞厓鏍煎垰濂藉悎閫� */
+ td:has(select) .layui-form-select {
+ margin-top: -10px;
}
</style>
</head>
@@ -132,12 +145,13 @@
base: '../../../layuiadmin/' //闈欐�佽祫婧愭墍鍦ㄨ矾寰�
}).extend({
index: 'lib/index' //涓诲叆鍙ｆā鍧�
- }).use(['index', 'form', 'laydate', 'table', 'element'], function () {
+ }).use(['index', 'form', 'laydate', 'table', "soulTable", 'element'], function () {
//#region 鍏叡鍙橀噺
var $ = layui.$
, admin = layui.admin
, layer = layui.layer
, table = layui.table
+ , soulTable = layui.soulTable
, form = layui.form
, element = layui.element;
//鏌ヨ鏉′欢
@@ -150,7 +164,12 @@
var params = getUrlVars();
var HModName = params[params[0]]; //妯″潡鍚嶇О
var colName = params[params[1]]; //鍒楀悕
+ var colTitleName = params[params[2]]; //鍒楀埆鍚�
+ if (colTitleName == undefined) {
+ colTitleName = "";
+ }
colName = decodeURI(colName);//瀵筓RI 杩涜瑙ｇ爜
+ colTitleName = decodeURI(colTitleName);
//鍒濆鍖栫晫闈�
set_ClearBill();
@@ -341,7 +360,7 @@
for (var i = 0; i < colNames.length; i++) {
var dataCols = dataCol[i].split('|');
var ColumnName_Other = dataCols[4] == dataCols[5] ? "" : dataCols[4];
- cols.push({ "ColumnName": colNames[i], "IsHide": dataCols[1] == 1 ? true : false, "Alignment": dataCols[2], "ColumnWidth": dataCols[3], "ColumnName_Other": ColumnName_Other, "ColumnName_real": dataCols[5], "IsTotalRow": dataCols[6] == 1 ? true : false })
+ cols.push({ "ColumnName": colNames[i], "IsHide": dataCols[1] == 1 ? true : false, "Alignment": dataCols[2], "ColumnWidth": dataCols[3], "ColumnName_Other": ColumnName_Other, "IsTotalRow": dataCols[6] == 1 ? true : false })
}
option.data = cols;
table.render(option);
@@ -359,11 +378,14 @@
}
form.render('checkbox');
form.render('select');
+
+ // registerDragObserver()
layer.close(ajaxLoad);
} else {
+ var colTitleNames = colTitleName.split(',');
//榛樿涓嶉�変腑 鏄剧ず瀛椾綋灞呭乏 琛ㄦ牸鐨勬暟鎹～鍏�
for (var i = 0; i < colNames.length; i++) {
- cols.push({ "ColumnName": colNames[i], "IsHide": false, "Alignment": "L", "ColumnWidth": 120, "IsTotalRow": false })
+ cols.push({ "ColumnName": colNames[i], "IsHide": false, "Alignment": "L", "ColumnWidth": 120, "ColumnName_Other": colTitleNames[i], "IsTotalRow": false })
}
option.data = cols;
table.render(option);
@@ -395,15 +417,31 @@
, limit: 500
, cols: [[
{ type: 'checkbox', fixed: 'left', style: 'background-color:#efefef4d;' }
- , { type: 'numbers', title: '搴忓彿', width: 100, style: 'background-color:#efefef4d;' }
+ , { type: 'numbers', field:'搴忓彿', title: '搴忓彿', width: 100, style: 'background-color:#efefef4d;' }
, { field: 'ColumnName', title: '鍒楀悕', width: 100 }
, { file: 'IsHide', title: '鏄惁闅愯棌', width: 100, templet: '#IsHide' }
, { field: 'Alignment', title: '瀵归綈鏂瑰紡', width: 100, templet: '#Alignment' }
, { field: 'ColumnWidth', title: '鍒楀', width: 100, edit: 'text' }
, { field: 'ColumnName_Other', title: '鍒悕', width: 120, edit: 'text' }
- , { field: 'ColumnName_real', title: '鍒悕瀵瑰簲鍒楀悕', width: 120, edit: 'text', hide: "true" }
, { field: 'IsTotalRow', title: '鏄惁缁熻', width: 100, templet: '#IsTotalRow' }
]]
+ , even: true
+ , rowDrag: {/*trigger: 'row',*/
+ done: function (obj) {
+ // 瀹屾垚鏃讹紙鏉惧紑鏃讹級瑙﹀彂
+ // 濡傛灉鎷栧姩鍓嶅拰鎷栧姩鍚庢棤鍙樺寲锛屽垯涓嶄細瑙﹀彂姝ゆ柟娉�
+ //console.log(obj.row) // 褰撳墠琛屾暟鎹�
+ //console.log(obj.cache) // 鏀瑰姩鍚庡叏琛ㄦ暟鎹�
+ //console.log(obj.oldIndex) // 鍘熸潵鐨勬暟鎹储寮�
+ //console.log(obj.newIndex) // 鏀瑰姩鍚庢暟鎹储寮�
+
+ //console.log(table.cache["mainTable"]) // 鏀瑰姩鍚庢暟鎹储寮�
+ }
+ }
+ , done: function (res, curr, count) {
+
+ soulTable.render(this)
+ }
};
}
@@ -496,10 +534,42 @@
})
}
+ //// 娉ㄥ唽鎷栨嫿瑙傚療鑰咃紝鐩戝惉琛ㄦ牸鎷栨嫿鍙樺寲
+ // function registerDragObserver() {
+ // // 濡傛灉涓嶆敮鎸侊紝鍒欎粈涔堥兘涓嶆墽琛�
+ // if (typeof window.MutationObserver === 'undefined'
+ // && typeof window.WebKitMutationObserver === 'undefined') {
+ // console.warn('observer not supported')
+ // return
+ // }
+ // let targetEl = $(".layui-table-box")[0];
+ // let config = {
+ // attributes: true,
+ // attributesOldValue: true,
+ // attributeFilter: ['class'],
+ // childList: false,
+ // subtree: false,
+ // characterData: false,
+ // characterDataOldValue: false
+ // };
+ // let observer = new MutationObserver(mutations => {
+ // mutations.forEach(function (mutation) {
+ // if (mutation.attributeName === 'class') {
+ // // 鐩戝惉class涓唴瀹圭殑鍙樺寲
+ // if ($(targetEl).hasClass('noselect')) {
+ // document.documentElement.style.userSelect = 'none';
+ // document.documentElement.style.webkitUserSelect = 'none';
+ // } else {
+ // document.documentElement.style.userSelect = '';
+ // document.documentElement.style.webkitUserSelect = '';
+ // }
+ // }
+ // })
+ // })
+ // observer.observe(targetEl, config);
+ // }
//#endregion
});
-
-
</script>
\ No newline at end of file
--
Gitblit v1.9.1