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 | 69 +++++++++++++++++++++++++++++-----
1 files changed, 58 insertions(+), 11 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 d8acdaa..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"
@@ -12,16 +12,28 @@
<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>
@@ -366,6 +378,8 @@
}
form.render('checkbox');
form.render('select');
+
+ // registerDragObserver()
layer.close(ajaxLoad);
} else {
var colTitleNames = colTitleName.split(',');
@@ -416,15 +430,16 @@
done: function (obj) {
// 瀹屾垚鏃讹紙鏉惧紑鏃讹級瑙﹀彂
// 濡傛灉鎷栧姩鍓嶅拰鎷栧姩鍚庢棤鍙樺寲锛屽垯涓嶄細瑙﹀彂姝ゆ柟娉�
- console.log(obj.row) // 褰撳墠琛屾暟鎹�
- console.log(obj.cache) // 鏀瑰姩鍚庡叏琛ㄦ暟鎹�
- console.log(obj.oldIndex) // 鍘熸潵鐨勬暟鎹储寮�
- console.log(obj.newIndex) // 鏀瑰姩鍚庢暟鎹储寮�
+ //console.log(obj.row) // 褰撳墠琛屾暟鎹�
+ //console.log(obj.cache) // 鏀瑰姩鍚庡叏琛ㄦ暟鎹�
+ //console.log(obj.oldIndex) // 鍘熸潵鐨勬暟鎹储寮�
+ //console.log(obj.newIndex) // 鏀瑰姩鍚庢暟鎹储寮�
- console.log(table.cache["mainTable"]) // 鏀瑰姩鍚庢暟鎹储寮�
+ //console.log(table.cache["mainTable"]) // 鏀瑰姩鍚庢暟鎹储寮�
}
}
- , done: function () {
+ , done: function (res, curr, count) {
+
soulTable.render(this)
}
};
@@ -519,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