MES-WEB-LayUI.git

			@@ -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>
			@@ -121,17 +134,24 @@
			<input type="checkbox" name="IsHide" lay-filter="IsHide" id="IsHide{{d.LAY_TABLE_INDEX+1}}" lay-skin="primary">
			</div>
			</script>
			<!--å¤éæ¡ æ¯å¦ç»è®¡è¡-->
			<script type="text/html" id="IsTotalRow">
			<div class="layui-input-block" style="margin-left: 20px;">
			<input type="checkbox" name="IsTotalRow" lay-filter="IsTotalRow" id="IsTotalRow{{d.LAY_TABLE_INDEX+1}}" lay-skin="primary">
			</div>
			</script>
			<script>
			layui.config({
			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;
			//æ¥è¯¢æ¡ä»¶
			@@ -144,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);//å¯¹URI è¿è¡è§£ç
			colTitleName = decodeURI(colTitleName);
			//åå§åçé¢
			set_ClearBill();

			@@ -176,7 +201,17 @@
			}
			});
			});

			//æ¯å¦ç»è®¡
			form.on('checkbox(IsTotalRow)', function (data) {
			//è·åä¸ææ¡éä¸çå¼
			var elem = data.othis.parents('tr');
			var dataindex = elem.attr("data-index");
			$.each(option.data, function (index, value) {
			if (value.LAY_TABLE_INDEX == dataindex) {
			value.IsTotalRow = data.elem.checked;//æéä¸ä¸ææ¡idå¼èµå¼ç»è¡¨æ ¼ç¼å
			}
			});
			});
			//ä¿åæäº¤
			form.on('submit(btnSave)', function (data) {//æäº¤
			set_AddNew(data);
			@@ -223,6 +258,9 @@
			if (option.data[j - 1].IsHide == true) {
			$("#IsHide" + j).attr("checked", true);
			}
			if (option.data[j - 1].IsTotalRow == true) {
			$("#IsTotalRow" + j).attr("checked", true);
			}
			$('#Alignment' + j).find("option[value='" + option.data[j - 1].Alignment + "']").attr("selected", true);
			}
			form.render('select');
			@@ -254,6 +292,9 @@
			for (var j = 1; j <= option.data.length; j++) {
			if (option.data[j - 1].IsHide == true) {
			$("#IsHide" + j).attr("checked", true);
			}
			if (option.data[j - 1].IsTotalRow == true) {
			$("#IsTotalRow" + j).attr("checked", true);
			}
			$('#Alignment' + j).find("option[value='" + option.data[j - 1].Alignment + "']").attr("selected", true);
			}
			@@ -296,12 +337,11 @@
			var colNames = [];//ç¸å¯¹åæ®ä¼ è¿æ¥çåå
			var cols = [];//è¦ä¼ è¿è¡¨æ ¼çæ°æ®
			var dataCol = [];//è¡¨æ ¼æ°æ®


			if (data1.data.length != 0) {
			//æ°æ®åºæ¥è¯¢åºçåæ°æ®
			dataCol = data1.data[0].HGridString.split(',');
			}

			colNames = colName.split(',');

			if (data1.data.length != 0 && dataCol.length == colNames.length) {
			@@ -313,12 +353,14 @@
			$("#HColumnWidth").val(data1.data[0].HColumnWidth);
			//é»è®¤åé¡µ
			$("#HPageSize").val(data1.data[0].HPageSize);

			//æ¯å¦æåº
			$("#HSortFlag").val(data1.data[0].HSortFlag);

			//è¡¨æ ¼çæ°æ®å¡«å
			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] })
			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);
			@@ -329,15 +371,21 @@
			if (dataCols[1] == 1) {
			$("#IsHide" + (i + 1)).attr("checked", true);
			}
			if (dataCols[6] == 1) {
			$("#IsTotalRow" + (i + 1)).attr("checked", true);
			}
			$('#Alignment' + (i + 1)).find("option[value='" + dataCols[2] + "']").attr("selected", true);
			}
			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 })
			cols.push({ "ColumnName": colNames[i], "IsHide": false, "Alignment": "L", "ColumnWidth": 120, "ColumnName_Other": colTitleNames[i], "IsTotalRow": false })
			}
			option.data = cols;
			table.render(option);
			@@ -345,6 +393,7 @@
			//é»è®¤ä¸éä¸ æ¾ç¤ºåä½å±å·¦ é¡µé¢å¤éæ¡ ä¸ææ¡ éæ°æ¸²æ
			for (var i = 0; i < colNames.length; i++) {
			$('#IsHide' + (i + 1)).prop("checked", false);
			$('#IsTotalRow' + (i + 1)).prop("checked", false);
			$('#Alignment' + (i + 1)).find("option[value='L']").attr("selected", true);
			}
			form.render('checkbox');
			@@ -368,14 +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)
			}
			};
			}

			@@ -468,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>