5.0.213

modules/kdayun-app/pom.xml

@@ -52,12 +52,12 @@
 		<dependency>
 			<groupId>com.kdayun</groupId>
 			<artifactId>kdayun-wechat</artifactId>
-			<version>1.0.1</version>
+			<version>1.0.2</version>
 		</dependency>
 		<dependency>
 			<groupId>com.kdayun</groupId>
 			<artifactId>kdayun-wecom</artifactId>
-			<version>1.0.1</version>
+			<version>1.0.2</version>
 		</dependency>
  		<dependency>
 			<groupId>com.kdayun</groupId>

modules/kdayun-app/src/main/resources/application-db.yml

@@ -3,16 +3,18 @@ spring:
     name: druidDataSource
     type: com.alibaba.druid.pool.DruidDataSource
     username: zl
-    password: zl123456zl     
+    password: zl123456zl
     driver-class-name: com.mysql.cj.jdbc.Driver
     url: jdbc:mysql://127.0.0.1:3706/dev?useSSL=true&autoReconnect=true&useUnicode=true&characterEncoding=UTF-8&serverTimezone=Asia/Shanghai
+
+
     # SqlServer (SqlServer DB)
     # driver-class-name: net.sourceforge.jtds.jdbc.Driver
     # url: jdbc:jtds:sqlserver://ZL_SERVER_D:1433/qjb
     # validationQuery: SELECT 1
     # 达梦¦(DM DB)
     # driver-class-name: dm.jdbc.driver.DmDriver
-    # url: jdbc:jdbc:dm://127.0.0.1:5236/DMSERVER
+    # url: jdbc:dm://127.0.0.1:5236/DMSERVER
     # validationQuery: SELECT 1
     # 金仓 (jc DB)
     # driver-class-name=com.kingbase8.Driver
@@ -22,4 +24,4 @@ spring:
     #username: ZL
     #password: zl123456zl  
     #driver-class-name: oracle.jdbc.OracleDriver
-    #url: jdbc:oracle:thin:@192.168.1.5:1521:XE
+    #url: jdbc:oracle:thin:@192.168.1.10:1521:XE

modules/kdayun-app/src/main/resources/application-logger.yml

@@ -3,5 +3,5 @@ logging:
   formatMsgNoLookups: true
   level: 
      org.springframework: info
-     root: info
+     root: debug
 

modules/kdayun-app/src/main/resources/application-xss.yml

@@ -7,8 +7,8 @@
 #
 security:
   xss:
-#    enabled: true
+    enabled: true
     includes: 
     excludes: img
     urlPatterns: /*
-    excludeUrl: /manager/coremodeldesign/modify,/manager/coredatasource/post,/manager/coredatasource/processModel
+    excludeUrl: /manager/coremodeldesign/modify,/manager/coredatasource/post,/manager/coredatasource/processModel,/manager/coredatasource/querySqlC

modules/kdayun-app/src/main/resources/static/framework/common.js

@@ -6,6 +6,30 @@ layui.define(function (exports) {
 		setter = layui.setter,
 		message = new Messenger('index', 'kdayunmanager');
 	var common = {
+
+		/**
+		 * 判断是否为空 
+		 * 字符串,null,undefined,[],{}
+		 * @param {*} obj 
+		 */
+		isEmpty(obj) {
+			if (obj === null) {
+				return true
+			}
+			if (obj === undefined) {
+				return true
+			}
+			if (obj === '') {
+				return true
+			}
+			if (obj['length'] === 0) {
+				return true
+			}
+			if (obj === {}) {
+				return true
+			}
+			return false
+		},
 		/**
 		 * 抛出一个异常错误信息
 		 * @param {String} msg
@@ -135,6 +159,9 @@ layui.define(function (exports) {
 			}
 
 			url = common.setUrlParamObj(url, param, /tokenId/)
+			if(!common.isEmpty(resid)){
+				url = common.setUrlParamObj(url, {resId:resid}, /tokenId/)
+			}
 
 			tabs.each(function (index) {
 				var li = $(this),
@@ -215,7 +242,8 @@ layui.define(function (exports) {
 			var p = $.extend(pageCoinfg, {
 				type: 2,
 				area: pageCoinfg.area || ['420px', '240px'],
-				success: () => {
+				success: ($elem) => {
+					$elem && $elem.focus();
 					successCallback && successCallback();
 				}
 				, yes: () => {
@@ -272,7 +300,7 @@ layui.define(function (exports) {
 		/**
 		 * 给具体的目标发送消息
 		 * @param {*} toHandle  目标句柄全局唯一
-		 * @param {*} msg  消息标识常量
+		 * @param {*} msg  消息标识常量is
 		 * @param {*} params 附带的消息信息
 		 */
 		sendTo: function (toHandle, msg, params) {

modules/kdayun-app/src/main/resources/static/framework/messenger.js

@@ -132,11 +132,23 @@ layui.define([], function (exports) {
          * @param {*} msg 
          */
          Messenger.prototype.broadcast = function (msg) {
-            let iframes = top.window.document.getElementsByTagName("iframe");
+            let getFrames=function(win){
+                if(!win){return []}
+                var ret=[]
+                if(win.frames && win.frames.length>0){
+                    for (let i = 0; i < win.frames.length; i++) {
+                        const fra = win.frames[i];
+                        ret.push(fra);
+                        ret=ret.concat(getFrames(fra));
+                    }
+                }
+                return ret;
+            }
+            let iframes = getFrames(top.window);
             this.targets = {};
             this.targets['top'] = new Target(top.window, 'top', this.prefix);
             for (let i = 0; i < iframes.length; i++) {
-                this.addTarget(iframes[i].contentWindow, iframes[i].name || this.generalGUID() );
+                this.addTarget(iframes[i], iframes[i].name || this.generalGUID() );
             }
             let targets = this.targets;
             for (let tar in targets) {

modules/kdayun-app/src/main/resources/static/framework/theme.js

@@ -45,16 +45,16 @@ layui.define(['laytpl', 'element', 'layer', 'zlPinYin', 'common'], function (exp
 				navBgInput: "#FFFFFF", // 导航栏背景
 				navFontColorInput: "#333333", // 导航栏 字体颜色
 				navIconColorInput: "#333333", // 导航栏 图标颜色
-				// 左侧菜单
+				// 菜单
 				searchBoxBgInput: '#374850', // 搜索框背景
 				searchBoxFontColorInput: '#FFFFFF', // 搜索框字体色
-				menuBgInput: "#20222A", // 左侧菜单背景
+				menuBgInput: "#20222A", // 菜单背景
 				childMenuBgInput: 'rgba(0, 0, 0, .3)',
-				menuFont: "Microsoft YaHei", // 左侧菜单字体
+				menuFont: "Microsoft YaHei", // 菜单字体
-				menuFontColorInput: "#FFFFFF", // 左侧菜单字体颜色
+				menuFontColorInput: "#FFFFFF", // 菜单字体颜色
-				menuSelectedBgInput: THEME.getLightColor(ColorBase, 0.5), // 左侧菜单 选中项背景颜色
+				menuSelectedBgInput: THEME.getLightColor(ColorBase, 0.5), // 菜单 选中项背景颜色
-				menuSelectedFontColorInput: '#FFFFFF', // 左侧菜单 选中项字体颜色
+				menuSelectedFontColorInput: '#FFFFFF', // 菜单 选中项字体颜色
-				menuItemBorderColorInput: '无', // 左侧菜单 选中项字体颜色
+				menuItemBorderColorInput: '无', // 菜单 选中项字体颜色
 				// 窗口
 				layerTitleBgInput: "#F8F8F8", // 窗口标题背景
 				layerCloseBtnColor: "1", // 窗口关闭按钮颜色
@@ -257,10 +257,11 @@ layui.define(['laytpl', 'element', 'layer', 'zlPinYin', 'common'], function (exp
 		/**
 		 * 设置主题, 设置保存当前页面的主题,并创建css 的样式节点
 		 * @param {*} theme 主题对象
+		 * @param {*} isBroadcast 是否广播消息 
 		 */
-		setTheme: function (themeObj) {
+		setTheme: function (themeObj, isBroadcast = true) {
 			sessionStorage.setItem('zltheme', JSON.stringify(themeObj))
-			common.broadcast('setTheme', JSON.stringify(themeObj));
+			!!isBroadcast && common.broadcast('setTheme', JSON.stringify(themeObj));
 		},
 		/**
 		 * 给当前的docoment增加主题的styleSheet
@@ -286,7 +287,10 @@ layui.define(['laytpl', 'element', 'layer', 'zlPinYin', 'common'], function (exp
 				styleText = laytpl(
 					`
 					:root{
-						--kd-color: {{d.kd_color_3}}
+						--kd-color: {{d.kd_color_3}} !important;
+					}
+					.layui-nav{
+						background-color:{{d.navBgInput}};
 					}
 					.layui-layer .layui-layer-title,
 						.layui-layer-iframe .layui-layer-title {
@@ -369,10 +373,24 @@ layui.define(['laytpl', 'element', 'layer', 'zlPinYin', 'common'], function (exp
 							background-color:var(--kd-color);							
 							color: {{d.kd_color_11}};
 						}
-						.layui-side-menu {
+						.kdayun-menu {
 							font-family:{{d.menuFont}} !important;
-							background-color:{{d.menuBgInput}};
+							background-color:{{d.menuBgInput}}!important;
 						}
+
+						.kdayun-menu-item {
+							font-family:{{d.menuFont}} !important;
+							background-color:{{d.menuBgInput}}!important;
+						}
+						.kdayun-app-layout-top .kdayun-menu-container .kdayun-menu-ul .kdayun-menu-child {
+							background-color:{{d.menuBgInput}}!important;
+					   }
+						.kdayun-app-layout-top .kdayun-menu-container .kdayun-menu-ul li:hover,
+						.kdayun-app-layout-top .kdayun-menu-container .kdayun-menu-ul li li:hover>a:first-child:nth-last-child(2),
+						.kdayun-app-layout-top .kdayun-menu-container .kdayun-menu-ul>li:hover>a:first-child:nth-last-child(2) {
+							background-color: {{d.menuBgInput}}!important;
+						}
+						
 						.navbar-side-search {
 							background-color:{{d.menuBgInput}}!important;
 						}
@@ -396,29 +414,37 @@ layui.define(['laytpl', 'element', 'layer', 'zlPinYin', 'common'], function (exp
 						.navbar-side-search input::-ms-input-placeholder {
 							color:{{d.searchBoxFontColorInput}}!important;
 						}
-						.layui-side-menu .layui-nav.layui-nav-tree a,
+						.kdayun-menu-ul a,
-						.layui-side-menu .layui-nav.layui-nav-tree i.layui-icon {
+						.kdayun-menu-ul i.layui-icon {
 							color:{{d.menuFontColorInput}} !important;
 						}
-						.layui-side-menu .layui-nav.layui-nav-tree {
+						.kdayun-menu-ul {
 							border-top:{{d.menuItemBorderColorInput}};
 						}
-						.layui-side-menu .layui-nav.layui-nav-tree li.layui-nav-item {
+						.kdayun-menu-ul li.kdayun-menu-item {
 							border-bottom:{{d.menuItemBorderColorInput}};
 						}
-						.layui-side-menu .layui-nav.layui-nav-tree span.layui-nav-more {
+						.kdayun-app-layout .kdayun-header .layui-nav-child dd.layui-this {
-							border-top-color:{{d.menuFontColorInput}} !important;
+							background-color: `+ (themeObj.menuSelectedBgInput || themeObj.kd_color_5)  + `!important;
-							border-bottom-color:{{d.menuBgInput}} !important;
+    						color: `+ (themeObj.menuSelectedFontColorInput || themeObj.kd_color_10)  + `!important;
 						}
-						.layui-side-menu .layui-nav.layui-nav-tree .layui-nav-itemed>a span.layui-nav-more {
+						.kdayun-app-layout .kdayun-header .layui-nav-child dd.layui-this a {
-							border-top-color:{{d.menuBgInput}} !important;
+							background-color: `+ (themeObj.menuSelectedBgInput || themeObj.kd_color_5)  + `!important;
+    						color: `+ (themeObj.menuSelectedFontColorInput || themeObj.kd_color_10)  + `!important;
+						}
+						.kdayun-menu-ul span.kdayun-menu-more {
+							border-top-color:{{d.menuFontColorInput}} !important;
+							border-bottom-color:{{d.menuBgInput}}00 !important;
+						}
+						.kdayun-menu-ul .kdayun-menu-item-expand>a span.kdayun-menu-more {
+							border-top-color:{{d.menuBgInput}}00 !important;
 							border-bottom-color:{{d.menuFontColorInput}} !important;
 						}
-						.layui-side-menu .layui-nav.layui-nav-tree .layui-nav-itemed>.layui-nav-child {
+						.kdayun-menu-item-expand>.kdayun-menu-child {
 							background-color:{{d.childMenuBgInput}} !important;
 						}
-						.layui-side-menu .layui-nav.layui-nav-tree .layui-this a,
+						.kdayun-menu-ul .layui-this a,
-						.layui-side-menu .layui-nav.layui-nav-tree .layui-nav-bar {
+						.kdayun-menu-ul .layui-nav-bar {
 							background-color:{{d.menuSelectedBgInput}} !important;
 							color:{{d.menuSelectedFontColorInput||'var(--kd-color)'}} !important;
 						}
@@ -429,7 +455,9 @@ layui.define(['laytpl', 'element', 'layer', 'zlPinYin', 'common'], function (exp
 							font-family:{{d.navFont}} !important;
 							background-color:{{d.navBgInput}};
 						}
-						.kdayun-app-layout .layui-header a:hover,
+						.kdayun-app-layout .layui-header a:hover {
+							color:{{d.navFontColorInput}};
+						}
 						.kdayun-app-layout .layui-header a cite {
 							color:{{d.navFontColorInput}};
 						}
@@ -440,9 +468,10 @@ layui.define(['laytpl', 'element', 'layer', 'zlPinYin', 'common'], function (exp
 						}
 						.kdayun-app-layout .layui-header a span.layui-nav-more {
 							border-top-color:{{d.navIconColorInput}} !important;
+							border-bottom-color:{{d.navBgInput}}00 !important;
 						}
-						.kdayun-app-layout .layui-header .layui-nav .layui-nav-mored {
+						.kdayun-app-layout .layui-header a span.layui-nav-mored { 
-							border-top-color:{{d.navBgInput}} !important;
+							border-top-color:{{d.navBgInput}}00 !important;
 							border-bottom-color:{{d.navIconColorInput}} !important;
 						}
 						.kdayun-app-layout .layui-logo {
@@ -461,11 +490,11 @@ layui.define(['laytpl', 'element', 'layer', 'zlPinYin', 'common'], function (exp
 							background-color:`+ (themeObj.kd_color_10 || '#f2f2f2') + `;
 						}
 						.layui-layer-tips.menuTips .layui-layer-content {
-							background-color:`+ (themeObj.childMenuTipsBgInput || THEME.colorReverse(themeObj.menuFontColorInput || "#000000")) + `;
+							background-color:`+ (themeObj.menuBgInput || THEME.colorReverse(themeObj.menuFontColorInput || "#000000")) + `;
 							color:`+ (themeObj.menuFontColorInput || "#FFFFFF") + `;
 						}
 						.layui-layer-tips.menuTips .layui-layer-content i {
-							border-bottom-color:`+  (themeObj.childMenuTipsBgInput || THEME.colorReverse(themeObj.menuFontColorInput || "#000000")) + `;
+							border-bottom-color:`+ (themeObj.menuBgInput || THEME.getDarkColor(themeObj.menuFontColorInput || "#000000")) + `;
 						}
 						.layui-input:hover,
 						.layui-textarea:hover,
@@ -708,7 +737,13 @@ layui.define(['laytpl', 'element', 'layer', 'zlPinYin', 'common'], function (exp
 			}
 		}
 	}
-
+	window['SVGInject'] && window['SVGInject'].setOptions({
+		afterLoad: function (svg, svgString) {
+			svgString = svgString.replace(/fill="#([0-9a-fA-F]{6}|[0-9a-fA-F]{3})"/g, '')
+			svg.classList.add('my-class');
+			return svgString
+		},
+	});
 	/**
 	 * 主题渲染类
 	 * @param {*} config 
@@ -718,7 +753,7 @@ layui.define(['laytpl', 'element', 'layer', 'zlPinYin', 'common'], function (exp
 			$elem: $('#kdayun-app'), //主容器
 			$headerElem: $('.layui-header'),
 			$tabElem: $('.layadmin-pagetabs'),
-			$menuElem: $('.layui-side-menu'),
+			$menuElem: $('.kdayun-menu'),
 			$logoElem: $('.layui-logo'),
 			theme: THEME.getTheme(), //主题
 		}
@@ -746,7 +781,7 @@ layui.define(['laytpl', 'element', 'layer', 'zlPinYin', 'common'], function (exp
 		that.config.$menuElem.append($('#tpl-search').html())
 		that.config.$menuElem.find('.navbar-side-search').before($('#tpl-logo').html())
 		that.config.$menuElem.find('.navbar-side-search').after($('#tpl-menu').html())
-		var menuRender = new MenuRender()
+		var menuRender = new LeftMenuRender()
 		menuRender.set({
 			spreadOne: true,
 			elem: '#admin-navbar-menu',
@@ -755,7 +790,6 @@ layui.define(['laytpl', 'element', 'layer', 'zlPinYin', 'common'], function (exp
 			type: 'post'
 		});
 		menuRender.render();
-
 	};
 	ThemeRenderBase.prototype.renderFoot = function () {
 		var that = this;
@@ -767,6 +801,8 @@ layui.define(['laytpl', 'element', 'layer', 'zlPinYin', 'common'], function (exp
 	};
 
 
+
+
 	/**
 	 * 菜单靠左的布局
 	 */
@@ -774,14 +810,17 @@ layui.define(['laytpl', 'element', 'layer', 'zlPinYin', 'common'], function (exp
 		ThemeRenderBase.call(this, config);
 	};
 	(function () {
-		// 创建一个没有实例方法的类
 		var Super = function () { };
 		Super.prototype = ThemeRenderBase.prototype;
-		//将实例作为子类的原型
 		LeftTheme.prototype = new Super();
 	})();
 	LeftTheme.prototype.constructor = LeftTheme;
+	LeftTheme.prototype.render = function () {
+		var that = this;
+		this.config.$elem.removeClass('kdayun-app-layout-top').addClass('kdayun-app-layout-left')
+		ThemeRenderBase.prototype.render.call(this)
 
+	}
 	/**
 	 * 菜单是在头部
 	 */
@@ -794,14 +833,21 @@ layui.define(['laytpl', 'element', 'layer', 'zlPinYin', 'common'], function (exp
 		TopTheme.prototype = new Super();
 	})();
 	TopTheme.prototype.constructor = TopTheme;
+	TopTheme.prototype.render = function () {
+		var that = this;
+		this.config.$elem.removeClass('kdayun-app-layout-left').addClass('kdayun-app-layout-top')
+		ThemeRenderBase.prototype.render.call(this)
+		this.config.$elem.find('a').removeAttr('lay-tips')
+
+	}
 	TopTheme.prototype.renderMenus = function () {
 		var that = this;
 		that.config.$headerElem.find('.layui-layout-left').remove();
 		that.config.$headerElem.append($('#tpl-logo').html());
 		that.config.$headerElem.append($('#tpl-menu').html());
 		that.config.$menuElem = $('#admin-navbar-menu')
-		that.config.$menuElem.after($('#tpl-search').html())
+		// that.config.$menuElem.after($('#tpl-search').html())
-		var menuRender = new MenuRender();
+		var menuRender = new TopMenuRender();
 		menuRender.set({
 			spreadOne: true,
 			elem: '#admin-navbar-menu',
@@ -812,10 +858,7 @@ layui.define(['laytpl', 'element', 'layer', 'zlPinYin', 'common'], function (exp
 		menuRender.render();
 	};
 
-	/**
+	var MenuRenderBase = function (config) {
-	 * 菜单的渲染器
-	 */
-	var MenuRender = function () {
 		/**
 		 *  默认配置 
 		 */
@@ -827,12 +870,11 @@ layui.define(['laytpl', 'element', 'layer', 'zlPinYin', 'common'], function (exp
 			cached: false, //是否使用缓存
 			spreadOne: false //设置是否只展开一个二级菜单
 		}
-
 	};
 	/**
 	 * 渲染菜单
 	 */
-	MenuRender.prototype.render = function () {
+	MenuRenderBase.prototype.render = function () {
 		var that = this;
 		var _config = that.config;
 		if (typeof (_config.elem) !== 'string' && typeof (_config.elem) !== 'object') {
@@ -854,6 +896,7 @@ layui.define(['laytpl', 'element', 'layer', 'zlPinYin', 'common'], function (exp
 		if (_config.data !== undefined && typeof (_config.data) === 'object') {
 			var html = that.getHtml(_config.data);
 			$container.html(html);
+			that.iniEvent();
 			element.init();
 			that.config.elem = $container;
 		} else {
@@ -879,17 +922,54 @@ layui.define(['laytpl', 'element', 'layer', 'zlPinYin', 'common'], function (exp
 		//只展开一个二级菜单
 		if (_config.spreadOne) {
 			var $ul = $container.children('ul');
-			$ul.find('li.layui-nav-item').each(function () {
+			$ul.find('li.kdayun-menu-item').each(function () {
-				// $(this).on('click', function () {
-				//     $(this).siblings().removeClass('layui-nav-itemed');
-				// });
 			});
 		}
 
 		this.iniEvent();
 		return that;
 	};
-	MenuRender.prototype.iniEvent = function () {
+	MenuRenderBase.prototype.iniEvent = function () {
+		this.iniMenuClickEvent();
+		this.iniSearchEvent();
+	};
+	MenuRenderBase.prototype.iniMenuClickEvent = function () {
+		var that = this;
+		that.config.elem.on('click', "a", function (e) {
+			var othis = $(this)
+				, parents = othis.parents('.kdayun-menu-ul')
+				, filter = parents.attr('lay-filter')
+				, parent = othis.parent()
+				, child = othis.siblings('.kdayun-menu-child');
+
+			var shrinkParents = othis.parents('.layadmin-side-shrink');
+			if (shrinkParents.length > 0) {
+				shrinkParents.removeClass('layadmin-side-shrink')
+			}
+
+			//如果是垂直菜单
+			if (child[0]) {
+				parent[child.css('display') === 'none' ? 'addClass' : 'removeClass']('kdayun-menu-item-expand');
+				if (parents.attr('lay-shrink') === 'all') {
+					parent.siblings().removeClass('kdayun-menu-item-expand');
+				}
+			}
+			href = othis.attr('yh-href'),
+				text = othis.attr('lay-text'),
+				resid = othis.attr('resid'),
+				searchBox = othis.parents('div#admin-navbar-menu').siblings('div.navbar-side-search');
+			searchBox.find('ul.navbarSearchResult ').removeClass('layui-show').addClass('layui-hide');
+			searchBox.find('input#navbarSearchValue').val('');
+			common.tabsPage.elem = othis;
+			if (!common.isEmpty(href)) {
+				common.openTabsPage(href, text || othis.text(), resid);
+				parent.addClass('layui-this');
+			}
+			common.sendTo(filter, 'MENU_CLICK', othis)
+			e.stopPropagation();
+		})
+	}
+	MenuRenderBase.prototype.iniSearchEvent = function () {
 		$('#navbarSearchValue').on('keyup', function (e) {
 			navbarSeacherHandle($(this).val(), this)
 		});
@@ -901,7 +981,7 @@ layui.define(['laytpl', 'element', 'layer', 'zlPinYin', 'common'], function (exp
 			var value = $(this).find('cite').html();
 			$('ul.navbarSearchResult').removeClass('layui-show').addClass('layui-hide');
 			$(this).parent().siblings('input').val('');
-			if (!$('#admin-navbar-menu').find('a[lay-tips="' + value + '"]').parent().hasClass('layui-nav-itemed')) {
+			if (!$('#admin-navbar-menu').find('a[lay-tips="' + value + '"]').parent().hasClass('kdayun-menu-item-expand')) {
 				$('#admin-navbar-menu').find('a[lay-tips="' + value + '"]').click();
 			}
 		})
@@ -916,7 +996,6 @@ layui.define(['laytpl', 'element', 'layer', 'zlPinYin', 'common'], function (exp
 				return;
 			}
 			for (var i = 0; i < targetData.length; i++) {
-				// if ($(targetData[i]).find('span.layui-nav-more').length == 0) {
 				var matchingTarget = $(targetData[i]).find('cite').html(),
 					imgHtml = $(targetData[i]).find('img').length > 0 ? $(targetData[i]).find('img')[0].outerHTML : '<i class="fa fa-file"></i>';
 
@@ -924,7 +1003,6 @@ layui.define(['laytpl', 'element', 'layer', 'zlPinYin', 'common'], function (exp
 					ulItem.append('<li class="search-result-item">' + imgHtml + '<cite>' + matchingTarget + '</cite></li>');
 					num++;
 				}
-				// }
 			}
 			ulItem.removeClass('layui-hide').addClass('layui-show');
 			if (num == 0) {
@@ -936,40 +1014,34 @@ layui.define(['laytpl', 'element', 'layer', 'zlPinYin', 'common'], function (exp
 	 * 获取html字符串
 	 * @param {Object} data 菜单的项数组
 	 */
-	MenuRender.prototype.getHtml = function (data) {
+	MenuRenderBase.prototype.getHtml = function (data) {
-		var ulHtml = '<ul class="layui-nav layui-nav-tree beg-navbar" lay-shrink="all" id="LAY-system-side-menu" lay-filter="layadmin-system-side-menu">';
+		var ulHtml = '<ul class="kdayun-menu-ul" lay-shrink="all" id="LAY-system-side-menu" lay-filter="layadmin-system-side-menu">';
 		for (var i = 0; i < data.length; i++) {
 			if (data[i].spread) {
-				ulHtml += '<li class="layui-nav-item layui-nav-itemed">';
+				ulHtml += '<li class="kdayun-menu-item kdayun-menu-item-expand">';
 			} else {
-				ulHtml += '<li class="layui-nav-item">';
+				ulHtml += '<li class="kdayun-menu-item">';
 			}
 			ulHtml += this.getItemHtml(data[i]);
+
 			ulHtml += '</li>';
 		}
 		ulHtml += '</ul>';
 
 		return ulHtml;
 	};
-	MenuRender.prototype.getTokenIdUrl = function (url, resid) {
+	MenuRenderBase.prototype.getTokenIdUrl = function (url, resid) {
 		if (url.indexOf("?") != -1) {
 			return '&tokenId=' + ($('#tokenId').val() ? $('#tokenId').val() : '') + '&resId=' + resid;
 		} else {
 			return '?tokenId=' + ($('#tokenId').val() ? $('#tokenId').val() : '') + '&resId=' + resid;
 		}
 	};
-	window['SVGInject'] && window['SVGInject'].setOptions({
-		afterLoad: function (svg, svgString) {
-			svgString = svgString.replace(/fill="#([0-9a-fA-F]{6}|[0-9a-fA-F]{3})"/g, '')
-			svg.classList.add('my-class');
-			return svgString
-		},
-	});
 	/**
 	 * 获取一个菜单的的html
 	 * @param {*} item 
 	 */
-	MenuRender.prototype.getItemHtml = function (item) {
+	MenuRenderBase.prototype.getItemHtml = function (item) {
 		var ulHtml = '';
 		var url = item.href;
 		if (url != null) {
@@ -981,22 +1053,23 @@ layui.define(['laytpl', 'element', 'layer', 'zlPinYin', 'common'], function (exp
 			svgOnLoad = 'onload = "SVGInject(this)" fill="currentColor"'
 		}
 
-		var layhref = (url !== undefined && url !== '' && url !== null) ? 'lay-href="' + url + '"' : '';
+		var layhref = (url !== undefined && url !== '' && url !== null) ? 'yh-href="' + url + '"' : '';
 		ulHtml += '<a href="javascript:;" ' + layhref + ' lay-text="' + item.title + '" lay-tips="' + item.title + '" lay-direction="2" resId=' + item.resid + ' >';
 		if (item.icon != undefined && item.icon != '') {
 			ulHtml += '<img src="' + layui.cache['contentPath'] + item.icon + '" ' + svgOnLoad + ' style="width:16px;height:16px;vertical-align: text-bottom;">';
 		}
 		if (item.children != undefined && item.children != undefined && item.children.length > 0) {
 			ulHtml += '<cite>' + item.title + '</cite>'
+			ulHtml += '<span class="kdayun-menu-more"></span>'
 			ulHtml += '</a>';
-			ulHtml += '<dl class="layui-nav-child">'
+			ulHtml += '<ul class="kdayun-menu-child">'
 			for (var j = 0; j < item.children.length; j++) {
-				ulHtml += '<dd>';
+				ulHtml += '<li>';
 				if (item.children !== undefined && item.children.length > 0)
 					ulHtml += this.getItemHtml(item.children[j]);
-				ulHtml += '</dd>';
+				ulHtml += '</li>';
 			}
-			ulHtml += '</dl>';
+			ulHtml += '</ul>';
 		} else {
 			ulHtml += '<cite>' + item.title + '</cite>'
 			ulHtml += '</a>';
@@ -1007,7 +1080,7 @@ layui.define(['laytpl', 'element', 'layer', 'zlPinYin', 'common'], function (exp
 	 * 配置MenuRender
 	 * @param {Object} options
 	 */
-	MenuRender.prototype.set = function (options) {
+	MenuRenderBase.prototype.set = function (options) {
 		var that = this;
 		that.config.data = undefined;
 		$.extend(true, that.config, options);
@@ -1018,7 +1091,7 @@ layui.define(['laytpl', 'element', 'layer', 'zlPinYin', 'common'], function (exp
 	 * @param {String} events
 	 * @param {Function} callback
 	 */
-	MenuRender.prototype.on = function (events, callback) {
+	MenuRenderBase.prototype.on = function (events, callback) {
 		var that = this;
 		var _con = that.config.elem;
 		if (typeof (events) !== 'string') {
@@ -1031,8 +1104,8 @@ layui.define(['laytpl', 'element', 'layer', 'zlPinYin', 'common'], function (exp
 			if (_con.attr('lay-filter') !== undefined) {
 				_con.children('ul').find('li').each(function () {
 					var $this = $(this);
-					if ($this.find('dl').length > 0) {
+					if ($this.find('ul').length > 0) {
-						var $dd = $this.find('dd').each(function () {
+						var $li = $this.find('li').each(function () {
 							$(this).on('click', function () {
 								var $a = $(this).children('a');
 								var href = $a.data('url');
@@ -1077,15 +1150,39 @@ layui.define(['laytpl', 'element', 'layer', 'zlPinYin', 'common'], function (exp
 	/**
 	 * 清除缓存
 	 */
-	MenuRender.prototype.cleanCached = function () {
+	MenuRenderBase.prototype.cleanCached = function () {
 	};
 
-	common.on('setTheme', function (event) {
+
-		var themeObj = JSON.parse(event.params);
+	var TopMenuRender = function () {
-		if (themeObj) {
+		MenuRenderBase.call(this);
-			THEME.renderCssStyle(themeObj);
+	};
-		}
+	(function () {
-	})
+		var Super = function () { };
+		Super.prototype = MenuRenderBase.prototype;
+		TopMenuRender.prototype = new Super();
+	})();
+	/**
+	 * 渲染菜单
+	 */
+	TopMenuRender.prototype.render = function () {
+		MenuRenderBase.prototype.render.call(this);
+		this.config.elem.find('.kdayun-menu-more').remove();
+	};
+
+	/**
+	 * 菜单的渲染器
+	 */
+	var LeftMenuRender = function () {
+		MenuRenderBase.call(this);
+
+	};
+	(function () {
+		var Super = function () { };
+		Super.prototype = MenuRenderBase.prototype;
+		LeftMenuRender.prototype = new Super();
+	})();
+
 
 	!function () {
 		common.on('setTheme', function (event) {
@@ -1093,13 +1190,15 @@ layui.define(['laytpl', 'element', 'layer', 'zlPinYin', 'common'], function (exp
 			if (themeObj) {
 				THEME.renderCssStyle(themeObj);
 			}
+			// $('.kdayun-layout-body').length > 0 && THEME.render(false, false)
 			element.render();
 		})
-		//当前设定主题设置
+		//当前设定主题设置 并排除掉平台主框架页面它在admin.js内加载
-		if (!window['--hasload-kd-Theme']) {
+		if (!window['--hasload-kd-Theme'] && $('.kdayun-layout-body').length == 0) {
 			let m = THEME.getTheme(false);
 			if (m) {
-				THEME.setTheme(m);
+				THEME.setTheme(m, false);
+				THEME.renderCssStyle(m);
 				common.broadcast('TabPageFinished', {});
 			}
 		}

modules/kdayun-app/src/main/resources/static/framework/zlTheme.js

@@ -26,13 +26,13 @@ layui.define(['zlContext', 'layer', 'laytpl', 'colorpicker', 'zlPinYin', 'theme'
                 navIconColorInput: themeData.navIconColorInput, // 导航栏 图标颜色
                 searchBoxBgInput: themeData.searchBoxBgInput, // 搜索框背景
                 searchBoxFontColorInput: themeData.searchBoxFontColorInput, // 搜索框字体色
-                menuBgInput: themeData.menuBgInput, // 左侧菜单背景
+                menuBgInput: themeData.menuBgInput, // 菜单背景
                 childMenuBgInput: themeData.childMenuBgInput, // 左侧子级菜单背景
-                menuFont: themeData.menuFont, // 左侧菜单字体
+                menuFont: themeData.menuFont, // 菜单字体
-                menuFontColorInput: themeData.menuFontColorInput, // 左侧菜单字体颜色
+                menuFontColorInput: themeData.menuFontColorInput, // 菜单字体颜色
-                menuSelectedBgInput: themeData.menuSelectedBgInput, // 左侧菜单 选中项背景颜色
+                menuSelectedBgInput: themeData.menuSelectedBgInput, // 菜单 选中项背景颜色
-                menuSelectedFontColorInput: themeData.menuSelectedFontColorInput, // 左侧菜单 选中项字体颜色
+                menuSelectedFontColorInput: themeData.menuSelectedFontColorInput, // 菜单 选中项字体颜色
-                menuItemBorderColorInput: themeData.menuItemBorderColorInput, // 左侧菜单 菜单项边框
+                menuItemBorderColorInput: themeData.menuItemBorderColorInput, // 菜单 菜单项边框
                 
                 btnBgInput: themeData.btnBgInput, // 标准按钮背景
                 btnFont: themeData.btnFont, // 标准按钮字体

modules/kdayun-app/src/main/resources/static/libs/formdesign/css/markdown/github-markdown-dark.css

@@ -0,0 +1,941 @@
+.markdown-body {
+  color-scheme: dark;
+  -ms-text-size-adjust: 100%;
+  -webkit-text-size-adjust: 100%;
+  margin: 0;
+  color: #c9d1d9;
+  background-color: #0d1117;
+  font-family: -apple-system,BlinkMacSystemFont,"Segoe UI",Helvetica,Arial,sans-serif,"Apple Color Emoji","Segoe UI Emoji";
+  font-size: 16px;
+  line-height: 1.5;
+  word-wrap: break-word;
+}
+
+.markdown-body .octicon {
+  display: inline-block;
+  fill: currentColor;
+  vertical-align: text-bottom;
+}
+
+.markdown-body h1:hover .anchor .octicon-link:before,
+.markdown-body h2:hover .anchor .octicon-link:before,
+.markdown-body h3:hover .anchor .octicon-link:before,
+.markdown-body h4:hover .anchor .octicon-link:before,
+.markdown-body h5:hover .anchor .octicon-link:before,
+.markdown-body h6:hover .anchor .octicon-link:before {
+  width: 16px;
+  height: 16px;
+  content: ' ';
+  display: inline-block;
+  background-color: currentColor;
+  -webkit-mask-image: url("data:image/svg+xml,<svg xmlns='http://www.w3.org/2000/svg' viewBox='0 0 16 16' version='1.1' aria-hidden='true'><path fill-rule='evenodd' d='M7.775 3.275a.75.75 0 001.06 1.06l1.25-1.25a2 2 0 112.83 2.83l-2.5 2.5a2 2 0 01-2.83 0 .75.75 0 00-1.06 1.06 3.5 3.5 0 004.95 0l2.5-2.5a3.5 3.5 0 00-4.95-4.95l-1.25 1.25zm-4.69 9.64a2 2 0 010-2.83l2.5-2.5a2 2 0 012.83 0 .75.75 0 001.06-1.06 3.5 3.5 0 00-4.95 0l-2.5 2.5a3.5 3.5 0 004.95 4.95l1.25-1.25a.75.75 0 00-1.06-1.06l-1.25 1.25a2 2 0 01-2.83 0z'></path></svg>");
+  mask-image: url("data:image/svg+xml,<svg xmlns='http://www.w3.org/2000/svg' viewBox='0 0 16 16' version='1.1' aria-hidden='true'><path fill-rule='evenodd' d='M7.775 3.275a.75.75 0 001.06 1.06l1.25-1.25a2 2 0 112.83 2.83l-2.5 2.5a2 2 0 01-2.83 0 .75.75 0 00-1.06 1.06 3.5 3.5 0 004.95 0l2.5-2.5a3.5 3.5 0 00-4.95-4.95l-1.25 1.25zm-4.69 9.64a2 2 0 010-2.83l2.5-2.5a2 2 0 012.83 0 .75.75 0 001.06-1.06 3.5 3.5 0 00-4.95 0l-2.5 2.5a3.5 3.5 0 004.95 4.95l1.25-1.25a.75.75 0 00-1.06-1.06l-1.25 1.25a2 2 0 01-2.83 0z'></path></svg>");
+}
+
+.markdown-body details,
+.markdown-body figcaption,
+.markdown-body figure {
+  display: block;
+}
+
+.markdown-body summary {
+  display: list-item;
+}
+
+.markdown-body [hidden] {
+  display: none !important;
+}
+
+.markdown-body a {
+  background-color: transparent;
+  color: #58a6ff;
+  text-decoration: none;
+}
+
+.markdown-body a:active,
+.markdown-body a:hover {
+  outline-width: 0;
+}
+
+.markdown-body abbr[title] {
+  border-bottom: none;
+  text-decoration: underline dotted;
+}
+
+.markdown-body b,
+.markdown-body strong {
+  font-weight: 600;
+}
+
+.markdown-body dfn {
+  font-style: italic;
+}
+
+.markdown-body h1 {
+  margin: .67em 0;
+  font-weight: 600;
+  padding-bottom: .3em;
+  font-size: 2em;
+  border-bottom: 1px solid #21262d;
+}
+
+.markdown-body mark {
+  background-color: rgba(187,128,9,0.15);
+  color: #c9d1d9;
+}
+
+.markdown-body small {
+  font-size: 90%;
+}
+
+.markdown-body sub,
+.markdown-body sup {
+  font-size: 75%;
+  line-height: 0;
+  position: relative;
+  vertical-align: baseline;
+}
+
+.markdown-body sub {
+  bottom: -0.25em;
+}
+
+.markdown-body sup {
+  top: -0.5em;
+}
+
+.markdown-body img {
+  border-style: none;
+  max-width: 100%;
+  box-sizing: content-box;
+  background-color: #0d1117;
+}
+
+.markdown-body code,
+.markdown-body kbd,
+.markdown-body pre,
+.markdown-body samp {
+  font-family: monospace,monospace;
+  font-size: 1em;
+}
+
+.markdown-body figure {
+  margin: 1em 40px;
+}
+
+.markdown-body hr {
+  box-sizing: content-box;
+  overflow: hidden;
+  background: transparent;
+  border-bottom: 1px solid #21262d;
+  height: .25em;
+  padding: 0;
+  margin: 24px 0;
+  background-color: #30363d;
+  border: 0;
+}
+
+.markdown-body input {
+  font: inherit;
+  margin: 0;
+  overflow: visible;
+  font-family: inherit;
+  font-size: inherit;
+  line-height: inherit;
+}
+
+.markdown-body [type=button],
+.markdown-body [type=reset],
+.markdown-body [type=submit] {
+  -webkit-appearance: button;
+}
+
+.markdown-body [type=button]::-moz-focus-inner,
+.markdown-body [type=reset]::-moz-focus-inner,
+.markdown-body [type=submit]::-moz-focus-inner {
+  border-style: none;
+  padding: 0;
+}
+
+.markdown-body [type=button]:-moz-focusring,
+.markdown-body [type=reset]:-moz-focusring,
+.markdown-body [type=submit]:-moz-focusring {
+  outline: 1px dotted ButtonText;
+}
+
+.markdown-body [type=checkbox],
+.markdown-body [type=radio] {
+  box-sizing: border-box;
+  padding: 0;
+}
+
+.markdown-body [type=number]::-webkit-inner-spin-button,
+.markdown-body [type=number]::-webkit-outer-spin-button {
+  height: auto;
+}
+
+.markdown-body [type=search] {
+  -webkit-appearance: textfield;
+  outline-offset: -2px;
+}
+
+.markdown-body [type=search]::-webkit-search-cancel-button,
+.markdown-body [type=search]::-webkit-search-decoration {
+  -webkit-appearance: none;
+}
+
+.markdown-body ::-webkit-input-placeholder {
+  color: inherit;
+  opacity: .54;
+}
+
+.markdown-body ::-webkit-file-upload-button {
+  -webkit-appearance: button;
+  font: inherit;
+}
+
+.markdown-body a:hover {
+  text-decoration: underline;
+}
+
+.markdown-body hr::before {
+  display: table;
+  content: "";
+}
+
+.markdown-body hr::after {
+  display: table;
+  clear: both;
+  content: "";
+}
+
+.markdown-body table {
+  border-spacing: 0;
+  border-collapse: collapse;
+  display: block;
+  width: max-content;
+  max-width: 100%;
+  overflow: auto;
+}
+
+.markdown-body td,
+.markdown-body th {
+  padding: 0;
+}
+
+.markdown-body details summary {
+  cursor: pointer;
+}
+
+.markdown-body details:not([open])>*:not(summary) {
+  display: none !important;
+}
+
+.markdown-body kbd {
+  display: inline-block;
+  padding: 3px 5px;
+  font: 11px ui-monospace,SFMono-Regular,SF Mono,Menlo,Consolas,Liberation Mono,monospace;
+  line-height: 10px;
+  color: #c9d1d9;
+  vertical-align: middle;
+  background-color: #161b22;
+  border: solid 1px rgba(110,118,129,0.4);
+  border-bottom-color: rgba(110,118,129,0.4);
+  border-radius: 6px;
+  box-shadow: inset 0 -1px 0 rgba(110,118,129,0.4);
+}
+
+.markdown-body h1,
+.markdown-body h2,
+.markdown-body h3,
+.markdown-body h4,
+.markdown-body h5,
+.markdown-body h6 {
+  margin-top: 24px;
+  margin-bottom: 16px;
+  font-weight: 600;
+  line-height: 1.25;
+}
+
+.markdown-body h2 {
+  font-weight: 600;
+  padding-bottom: .3em;
+  font-size: 1.5em;
+  border-bottom: 1px solid #21262d;
+}
+
+.markdown-body h3 {
+  font-weight: 600;
+  font-size: 1.25em;
+}
+
+.markdown-body h4 {
+  font-weight: 600;
+  font-size: 1em;
+}
+
+.markdown-body h5 {
+  font-weight: 600;
+  font-size: .875em;
+}
+
+.markdown-body h6 {
+  font-weight: 600;
+  font-size: .85em;
+  color: #8b949e;
+}
+
+.markdown-body p {
+  margin-top: 0;
+  margin-bottom: 10px;
+}
+
+.markdown-body blockquote {
+  margin: 0;
+  padding: 0 1em;
+  color: #8b949e;
+  border-left: .25em solid #30363d;
+}
+
+.markdown-body ul,
+.markdown-body ol {
+  margin-top: 0;
+  margin-bottom: 0;
+  padding-left: 2em;
+}
+
+.markdown-body ol ol,
+.markdown-body ul ol {
+  list-style-type: lower-roman;
+}
+
+.markdown-body ul ul ol,
+.markdown-body ul ol ol,
+.markdown-body ol ul ol,
+.markdown-body ol ol ol {
+  list-style-type: lower-alpha;
+}
+
+.markdown-body dd {
+  margin-left: 0;
+}
+
+.markdown-body tt,
+.markdown-body code {
+  font-family: ui-monospace,SFMono-Regular,SF Mono,Menlo,Consolas,Liberation Mono,monospace;
+  font-size: 12px;
+}
+
+.markdown-body pre {
+  margin-top: 0;
+  margin-bottom: 0;
+  font-family: ui-monospace,SFMono-Regular,SF Mono,Menlo,Consolas,Liberation Mono,monospace;
+  font-size: 12px;
+  word-wrap: normal;
+}
+
+.markdown-body .octicon {
+  display: inline-block;
+  overflow: visible !important;
+  vertical-align: text-bottom;
+  fill: currentColor;
+}
+
+.markdown-body ::placeholder {
+  color: #484f58;
+  opacity: 1;
+}
+
+.markdown-body input::-webkit-outer-spin-button,
+.markdown-body input::-webkit-inner-spin-button {
+  margin: 0;
+  -webkit-appearance: none;
+  appearance: none;
+}
+
+.markdown-body .pl-c {
+  color: #8b949e;
+}
+
+.markdown-body .pl-c1,
+.markdown-body .pl-s .pl-v {
+  color: #79c0ff;
+}
+
+.markdown-body .pl-e,
+.markdown-body .pl-en {
+  color: #d2a8ff;
+}
+
+.markdown-body .pl-smi,
+.markdown-body .pl-s .pl-s1 {
+  color: #c9d1d9;
+}
+
+.markdown-body .pl-ent {
+  color: #7ee787;
+}
+
+.markdown-body .pl-k {
+  color: #ff7b72;
+}
+
+.markdown-body .pl-s,
+.markdown-body .pl-pds,
+.markdown-body .pl-s .pl-pse .pl-s1,
+.markdown-body .pl-sr,
+.markdown-body .pl-sr .pl-cce,
+.markdown-body .pl-sr .pl-sre,
+.markdown-body .pl-sr .pl-sra {
+  color: #a5d6ff;
+}
+
+.markdown-body .pl-v,
+.markdown-body .pl-smw {
+  color: #ffa657;
+}
+
+.markdown-body .pl-bu {
+  color: #f85149;
+}
+
+.markdown-body .pl-ii {
+  color: #f0f6fc;
+  background-color: #8e1519;
+}
+
+.markdown-body .pl-c2 {
+  color: #f0f6fc;
+  background-color: #b62324;
+}
+
+.markdown-body .pl-sr .pl-cce {
+  font-weight: bold;
+  color: #7ee787;
+}
+
+.markdown-body .pl-ml {
+  color: #f2cc60;
+}
+
+.markdown-body .pl-mh,
+.markdown-body .pl-mh .pl-en,
+.markdown-body .pl-ms {
+  font-weight: bold;
+  color: #1f6feb;
+}
+
+.markdown-body .pl-mi {
+  font-style: italic;
+  color: #c9d1d9;
+}
+
+.markdown-body .pl-mb {
+  font-weight: bold;
+  color: #c9d1d9;
+}
+
+.markdown-body .pl-md {
+  color: #ffdcd7;
+  background-color: #67060c;
+}
+
+.markdown-body .pl-mi1 {
+  color: #aff5b4;
+  background-color: #033a16;
+}
+
+.markdown-body .pl-mc {
+  color: #ffdfb6;
+  background-color: #5a1e02;
+}
+
+.markdown-body .pl-mi2 {
+  color: #c9d1d9;
+  background-color: #1158c7;
+}
+
+.markdown-body .pl-mdr {
+  font-weight: bold;
+  color: #d2a8ff;
+}
+
+.markdown-body .pl-ba {
+  color: #8b949e;
+}
+
+.markdown-body .pl-sg {
+  color: #484f58;
+}
+
+.markdown-body .pl-corl {
+  text-decoration: underline;
+  color: #a5d6ff;
+}
+
+.markdown-body [data-catalyst] {
+  display: block;
+}
+
+.markdown-body g-emoji {
+  font-family: "Apple Color Emoji","Segoe UI Emoji","Segoe UI Symbol";
+  font-size: 1em;
+  font-style: normal !important;
+  font-weight: 400;
+  line-height: 1;
+  vertical-align: -0.075em;
+}
+
+.markdown-body g-emoji img {
+  width: 1em;
+  height: 1em;
+}
+
+.markdown-body::before {
+  display: table;
+  content: "";
+}
+
+.markdown-body::after {
+  display: table;
+  clear: both;
+  content: "";
+}
+
+.markdown-body>*:first-child {
+  margin-top: 0 !important;
+}
+
+.markdown-body>*:last-child {
+  margin-bottom: 0 !important;
+}
+
+.markdown-body a:not([href]) {
+  color: inherit;
+  text-decoration: none;
+}
+
+.markdown-body .absent {
+  color: #f85149;
+}
+
+.markdown-body .anchor {
+  float: left;
+  padding-right: 4px;
+  margin-left: -20px;
+  line-height: 1;
+}
+
+.markdown-body .anchor:focus {
+  outline: none;
+}
+
+.markdown-body p,
+.markdown-body blockquote,
+.markdown-body ul,
+.markdown-body ol,
+.markdown-body dl,
+.markdown-body table,
+.markdown-body pre,
+.markdown-body details {
+  margin-top: 0;
+  margin-bottom: 16px;
+}
+
+.markdown-body blockquote>:first-child {
+  margin-top: 0;
+}
+
+.markdown-body blockquote>:last-child {
+  margin-bottom: 0;
+}
+
+.markdown-body sup>a::before {
+  content: "[";
+}
+
+.markdown-body sup>a::after {
+  content: "]";
+}
+
+.markdown-body h1 .octicon-link,
+.markdown-body h2 .octicon-link,
+.markdown-body h3 .octicon-link,
+.markdown-body h4 .octicon-link,
+.markdown-body h5 .octicon-link,
+.markdown-body h6 .octicon-link {
+  color: #c9d1d9;
+  vertical-align: middle;
+  visibility: hidden;
+}
+
+.markdown-body h1:hover .anchor,
+.markdown-body h2:hover .anchor,
+.markdown-body h3:hover .anchor,
+.markdown-body h4:hover .anchor,
+.markdown-body h5:hover .anchor,
+.markdown-body h6:hover .anchor {
+  text-decoration: none;
+}
+
+.markdown-body h1:hover .anchor .octicon-link,
+.markdown-body h2:hover .anchor .octicon-link,
+.markdown-body h3:hover .anchor .octicon-link,
+.markdown-body h4:hover .anchor .octicon-link,
+.markdown-body h5:hover .anchor .octicon-link,
+.markdown-body h6:hover .anchor .octicon-link {
+  visibility: visible;
+}
+
+.markdown-body h1 tt,
+.markdown-body h1 code,
+.markdown-body h2 tt,
+.markdown-body h2 code,
+.markdown-body h3 tt,
+.markdown-body h3 code,
+.markdown-body h4 tt,
+.markdown-body h4 code,
+.markdown-body h5 tt,
+.markdown-body h5 code,
+.markdown-body h6 tt,
+.markdown-body h6 code {
+  padding: 0 .2em;
+  font-size: inherit;
+}
+
+.markdown-body ul.no-list,
+.markdown-body ol.no-list {
+  padding: 0;
+  list-style-type: none;
+}
+
+.markdown-body ol[type="1"] {
+  list-style-type: decimal;
+}
+
+.markdown-body ol[type=a] {
+  list-style-type: lower-alpha;
+}
+
+.markdown-body ol[type=i] {
+  list-style-type: lower-roman;
+}
+
+.markdown-body div>ol:not([type]) {
+  list-style-type: decimal;
+}
+
+.markdown-body ul ul,
+.markdown-body ul ol,
+.markdown-body ol ol,
+.markdown-body ol ul {
+  margin-top: 0;
+  margin-bottom: 0;
+}
+
+.markdown-body li>p {
+  margin-top: 16px;
+}
+
+.markdown-body li+li {
+  margin-top: .25em;
+}
+
+.markdown-body dl {
+  padding: 0;
+}
+
+.markdown-body dl dt {
+  padding: 0;
+  margin-top: 16px;
+  font-size: 1em;
+  font-style: italic;
+  font-weight: 600;
+}
+
+.markdown-body dl dd {
+  padding: 0 16px;
+  margin-bottom: 16px;
+}
+
+.markdown-body table th {
+  font-weight: 600;
+}
+
+.markdown-body table th,
+.markdown-body table td {
+  padding: 6px 13px;
+  border: 1px solid #30363d;
+}
+
+.markdown-body table tr {
+  background-color: #0d1117;
+  border-top: 1px solid #21262d;
+}
+
+.markdown-body table tr:nth-child(2n) {
+  background-color: #161b22;
+}
+
+.markdown-body table img {
+  background-color: transparent;
+}
+
+.markdown-body img[align=right] {
+  padding-left: 20px;
+}
+
+.markdown-body img[align=left] {
+  padding-right: 20px;
+}
+
+.markdown-body .emoji {
+  max-width: none;
+  vertical-align: text-top;
+  background-color: transparent;
+}
+
+.markdown-body span.frame {
+  display: block;
+  overflow: hidden;
+}
+
+.markdown-body span.frame>span {
+  display: block;
+  float: left;
+  width: auto;
+  padding: 7px;
+  margin: 13px 0 0;
+  overflow: hidden;
+  border: 1px solid #30363d;
+}
+
+.markdown-body span.frame span img {
+  display: block;
+  float: left;
+}
+
+.markdown-body span.frame span span {
+  display: block;
+  padding: 5px 0 0;
+  clear: both;
+  color: #c9d1d9;
+}
+
+.markdown-body span.align-center {
+  display: block;
+  overflow: hidden;
+  clear: both;
+}
+
+.markdown-body span.align-center>span {
+  display: block;
+  margin: 13px auto 0;
+  overflow: hidden;
+  text-align: center;
+}
+
+.markdown-body span.align-center span img {
+  margin: 0 auto;
+  text-align: center;
+}
+
+.markdown-body span.align-right {
+  display: block;
+  overflow: hidden;
+  clear: both;
+}
+
+.markdown-body span.align-right>span {
+  display: block;
+  margin: 13px 0 0;
+  overflow: hidden;
+  text-align: right;
+}
+
+.markdown-body span.align-right span img {
+  margin: 0;
+  text-align: right;
+}
+
+.markdown-body span.float-left {
+  display: block;
+  float: left;
+  margin-right: 13px;
+  overflow: hidden;
+}
+
+.markdown-body span.float-left span {
+  margin: 13px 0 0;
+}
+
+.markdown-body span.float-right {
+  display: block;
+  float: right;
+  margin-left: 13px;
+  overflow: hidden;
+}
+
+.markdown-body span.float-right>span {
+  display: block;
+  margin: 13px auto 0;
+  overflow: hidden;
+  text-align: right;
+}
+
+.markdown-body code,
+.markdown-body tt {
+  padding: .2em .4em;
+  margin: 0;
+  font-size: 85%;
+  background-color: rgba(110,118,129,0.4);
+  border-radius: 6px;
+}
+
+.markdown-body code br,
+.markdown-body tt br {
+  display: none;
+}
+
+.markdown-body del code {
+  text-decoration: inherit;
+}
+
+.markdown-body pre code {
+  font-size: 100%;
+}
+
+.markdown-body pre>code {
+  padding: 0;
+  margin: 0;
+  word-break: normal;
+  white-space: pre;
+  background: transparent;
+  border: 0;
+}
+
+.markdown-body .highlight {
+  margin-bottom: 16px;
+}
+
+.markdown-body .highlight pre {
+  margin-bottom: 0;
+  word-break: normal;
+}
+
+.markdown-body .highlight pre,
+.markdown-body pre {
+  padding: 16px;
+  overflow: auto;
+  font-size: 85%;
+  line-height: 1.45;
+  background-color: #161b22;
+  border-radius: 6px;
+}
+
+.markdown-body pre code,
+.markdown-body pre tt {
+  display: inline;
+  max-width: auto;
+  padding: 0;
+  margin: 0;
+  overflow: visible;
+  line-height: inherit;
+  word-wrap: normal;
+  background-color: transparent;
+  border: 0;
+}
+
+.markdown-body .csv-data td,
+.markdown-body .csv-data th {
+  padding: 5px;
+  overflow: hidden;
+  font-size: 12px;
+  line-height: 1;
+  text-align: left;
+  white-space: nowrap;
+}
+
+.markdown-body .csv-data .blob-num {
+  padding: 10px 8px 9px;
+  text-align: right;
+  background: #0d1117;
+  border: 0;
+}
+
+.markdown-body .csv-data tr {
+  border-top: 0;
+}
+
+.markdown-body .csv-data th {
+  font-weight: 600;
+  background: #161b22;
+  border-top: 0;
+}
+
+.markdown-body .footnotes {
+  font-size: 12px;
+  color: #8b949e;
+  border-top: 1px solid #30363d;
+}
+
+.markdown-body .footnotes ol {
+  padding-left: 16px;
+}
+
+.markdown-body .footnotes li {
+  position: relative;
+}
+
+.markdown-body .footnotes li:target::before {
+  position: absolute;
+  top: -8px;
+  right: -8px;
+  bottom: -8px;
+  left: -24px;
+  pointer-events: none;
+  content: "";
+  border: 2px solid #1f6feb;
+  border-radius: 6px;
+}
+
+.markdown-body .footnotes li:target {
+  color: #c9d1d9;
+}
+
+.markdown-body .footnotes .data-footnote-backref g-emoji {
+  font-family: monospace;
+}
+
+.markdown-body .task-list-item {
+  list-style-type: none;
+}
+
+.markdown-body .task-list-item label {
+  font-weight: 400;
+}
+
+.markdown-body .task-list-item.enabled label {
+  cursor: pointer;
+}
+
+.markdown-body .task-list-item+.task-list-item {
+  margin-top: 3px;
+}
+
+.markdown-body .task-list-item .handle {
+  display: none;
+}
+
+.markdown-body .task-list-item-checkbox {
+  margin: 0 .2em .25em -1.6em;
+  vertical-align: middle;
+}
+
+.markdown-body .contains-task-list:dir(rtl) .task-list-item-checkbox {
+  margin: 0 -1.6em .25em .2em;
+}
+
+.markdown-body ::-webkit-calendar-picker-indicator {
+  filter: invert(50%);
+}

modules/kdayun-app/src/main/resources/static/libs/formdesign/libs/layui/css/layui.css

@@ -3593,6 +3593,9 @@ hr,
 }
 
 .layui-table-sort {
+  position: absolute;
+  right: 10px;
+  top: 4px;
   width: 15px;
   height: 20px;
   margin-left: 5px;

modules/kdayun-app/src/main/resources/static/libs/formdesign/libs/markdown/github-markdown-dark.css

@@ -0,0 +1,941 @@
+.markdown-body {
+  color-scheme: dark;
+  -ms-text-size-adjust: 100%;
+  -webkit-text-size-adjust: 100%;
+  margin: 0;
+  color: #c9d1d9;
+  background-color: #0d1117;
+  font-family: -apple-system,BlinkMacSystemFont,"Segoe UI",Helvetica,Arial,sans-serif,"Apple Color Emoji","Segoe UI Emoji";
+  font-size: 16px;
+  line-height: 1.5;
+  word-wrap: break-word;
+}
+
+.markdown-body .octicon {
+  display: inline-block;
+  fill: currentColor;
+  vertical-align: text-bottom;
+}
+
+.markdown-body h1:hover .anchor .octicon-link:before,
+.markdown-body h2:hover .anchor .octicon-link:before,
+.markdown-body h3:hover .anchor .octicon-link:before,
+.markdown-body h4:hover .anchor .octicon-link:before,
+.markdown-body h5:hover .anchor .octicon-link:before,
+.markdown-body h6:hover .anchor .octicon-link:before {
+  width: 16px;
+  height: 16px;
+  content: ' ';
+  display: inline-block;
+  background-color: currentColor;
+  -webkit-mask-image: url("data:image/svg+xml,<svg xmlns='http://www.w3.org/2000/svg' viewBox='0 0 16 16' version='1.1' aria-hidden='true'><path fill-rule='evenodd' d='M7.775 3.275a.75.75 0 001.06 1.06l1.25-1.25a2 2 0 112.83 2.83l-2.5 2.5a2 2 0 01-2.83 0 .75.75 0 00-1.06 1.06 3.5 3.5 0 004.95 0l2.5-2.5a3.5 3.5 0 00-4.95-4.95l-1.25 1.25zm-4.69 9.64a2 2 0 010-2.83l2.5-2.5a2 2 0 012.83 0 .75.75 0 001.06-1.06 3.5 3.5 0 00-4.95 0l-2.5 2.5a3.5 3.5 0 004.95 4.95l1.25-1.25a.75.75 0 00-1.06-1.06l-1.25 1.25a2 2 0 01-2.83 0z'></path></svg>");
+  mask-image: url("data:image/svg+xml,<svg xmlns='http://www.w3.org/2000/svg' viewBox='0 0 16 16' version='1.1' aria-hidden='true'><path fill-rule='evenodd' d='M7.775 3.275a.75.75 0 001.06 1.06l1.25-1.25a2 2 0 112.83 2.83l-2.5 2.5a2 2 0 01-2.83 0 .75.75 0 00-1.06 1.06 3.5 3.5 0 004.95 0l2.5-2.5a3.5 3.5 0 00-4.95-4.95l-1.25 1.25zm-4.69 9.64a2 2 0 010-2.83l2.5-2.5a2 2 0 012.83 0 .75.75 0 001.06-1.06 3.5 3.5 0 00-4.95 0l-2.5 2.5a3.5 3.5 0 004.95 4.95l1.25-1.25a.75.75 0 00-1.06-1.06l-1.25 1.25a2 2 0 01-2.83 0z'></path></svg>");
+}
+
+.markdown-body details,
+.markdown-body figcaption,
+.markdown-body figure {
+  display: block;
+}
+
+.markdown-body summary {
+  display: list-item;
+}
+
+.markdown-body [hidden] {
+  display: none !important;
+}
+
+.markdown-body a {
+  background-color: transparent;
+  color: #58a6ff;
+  text-decoration: none;
+}
+
+.markdown-body a:active,
+.markdown-body a:hover {
+  outline-width: 0;
+}
+
+.markdown-body abbr[title] {
+  border-bottom: none;
+  text-decoration: underline dotted;
+}
+
+.markdown-body b,
+.markdown-body strong {
+  font-weight: 600;
+}
+
+.markdown-body dfn {
+  font-style: italic;
+}
+
+.markdown-body h1 {
+  margin: .67em 0;
+  font-weight: 600;
+  padding-bottom: .3em;
+  font-size: 2em;
+  border-bottom: 1px solid #21262d;
+}
+
+.markdown-body mark {
+  background-color: rgba(187,128,9,0.15);
+  color: #c9d1d9;
+}
+
+.markdown-body small {
+  font-size: 90%;
+}
+
+.markdown-body sub,
+.markdown-body sup {
+  font-size: 75%;
+  line-height: 0;
+  position: relative;
+  vertical-align: baseline;
+}
+
+.markdown-body sub {
+  bottom: -0.25em;
+}
+
+.markdown-body sup {
+  top: -0.5em;
+}
+
+.markdown-body img {
+  border-style: none;
+  max-width: 100%;
+  box-sizing: content-box;
+  background-color: #0d1117;
+}
+
+.markdown-body code,
+.markdown-body kbd,
+.markdown-body pre,
+.markdown-body samp {
+  font-family: monospace,monospace;
+  font-size: 1em;
+}
+
+.markdown-body figure {
+  margin: 1em 40px;
+}
+
+.markdown-body hr {
+  box-sizing: content-box;
+  overflow: hidden;
+  background: transparent;
+  border-bottom: 1px solid #21262d;
+  height: .25em;
+  padding: 0;
+  margin: 24px 0;
+  background-color: #30363d;
+  border: 0;
+}
+
+.markdown-body input {
+  font: inherit;
+  margin: 0;
+  overflow: visible;
+  font-family: inherit;
+  font-size: inherit;
+  line-height: inherit;
+}
+
+.markdown-body [type=button],
+.markdown-body [type=reset],
+.markdown-body [type=submit] {
+  -webkit-appearance: button;
+}
+
+.markdown-body [type=button]::-moz-focus-inner,
+.markdown-body [type=reset]::-moz-focus-inner,
+.markdown-body [type=submit]::-moz-focus-inner {
+  border-style: none;
+  padding: 0;
+}
+
+.markdown-body [type=button]:-moz-focusring,
+.markdown-body [type=reset]:-moz-focusring,
+.markdown-body [type=submit]:-moz-focusring {
+  outline: 1px dotted ButtonText;
+}
+
+.markdown-body [type=checkbox],
+.markdown-body [type=radio] {
+  box-sizing: border-box;
+  padding: 0;
+}
+
+.markdown-body [type=number]::-webkit-inner-spin-button,
+.markdown-body [type=number]::-webkit-outer-spin-button {
+  height: auto;
+}
+
+.markdown-body [type=search] {
+  -webkit-appearance: textfield;
+  outline-offset: -2px;
+}
+
+.markdown-body [type=search]::-webkit-search-cancel-button,
+.markdown-body [type=search]::-webkit-search-decoration {
+  -webkit-appearance: none;
+}
+
+.markdown-body ::-webkit-input-placeholder {
+  color: inherit;
+  opacity: .54;
+}
+
+.markdown-body ::-webkit-file-upload-button {
+  -webkit-appearance: button;
+  font: inherit;
+}
+
+.markdown-body a:hover {
+  text-decoration: underline;
+}
+
+.markdown-body hr::before {
+  display: table;
+  content: "";
+}
+
+.markdown-body hr::after {
+  display: table;
+  clear: both;
+  content: "";
+}
+
+.markdown-body table {
+  border-spacing: 0;
+  border-collapse: collapse;
+  display: block;
+  width: max-content;
+  max-width: 100%;
+  overflow: auto;
+}
+
+.markdown-body td,
+.markdown-body th {
+  padding: 0;
+}
+
+.markdown-body details summary {
+  cursor: pointer;
+}
+
+.markdown-body details:not([open])>*:not(summary) {
+  display: none !important;
+}
+
+.markdown-body kbd {
+  display: inline-block;
+  padding: 3px 5px;
+  font: 11px ui-monospace,SFMono-Regular,SF Mono,Menlo,Consolas,Liberation Mono,monospace;
+  line-height: 10px;
+  color: #c9d1d9;
+  vertical-align: middle;
+  background-color: #161b22;
+  border: solid 1px rgba(110,118,129,0.4);
+  border-bottom-color: rgba(110,118,129,0.4);
+  border-radius: 6px;
+  box-shadow: inset 0 -1px 0 rgba(110,118,129,0.4);
+}
+
+.markdown-body h1,
+.markdown-body h2,
+.markdown-body h3,
+.markdown-body h4,
+.markdown-body h5,
+.markdown-body h6 {
+  margin-top: 24px;
+  margin-bottom: 16px;
+  font-weight: 600;
+  line-height: 1.25;
+}
+
+.markdown-body h2 {
+  font-weight: 600;
+  padding-bottom: .3em;
+  font-size: 1.5em;
+  border-bottom: 1px solid #21262d;
+}
+
+.markdown-body h3 {
+  font-weight: 600;
+  font-size: 1.25em;
+}
+
+.markdown-body h4 {
+  font-weight: 600;
+  font-size: 1em;
+}
+
+.markdown-body h5 {
+  font-weight: 600;
+  font-size: .875em;
+}
+
+.markdown-body h6 {
+  font-weight: 600;
+  font-size: .85em;
+  color: #8b949e;
+}
+
+.markdown-body p {
+  margin-top: 0;
+  margin-bottom: 10px;
+}
+
+.markdown-body blockquote {
+  margin: 0;
+  padding: 0 1em;
+  color: #8b949e;
+  border-left: .25em solid #30363d;
+}
+
+.markdown-body ul,
+.markdown-body ol {
+  margin-top: 0;
+  margin-bottom: 0;
+  padding-left: 2em;
+}
+
+.markdown-body ol ol,
+.markdown-body ul ol {
+  list-style-type: lower-roman;
+}
+
+.markdown-body ul ul ol,
+.markdown-body ul ol ol,
+.markdown-body ol ul ol,
+.markdown-body ol ol ol {
+  list-style-type: lower-alpha;
+}
+
+.markdown-body dd {
+  margin-left: 0;
+}
+
+.markdown-body tt,
+.markdown-body code {
+  font-family: ui-monospace,SFMono-Regular,SF Mono,Menlo,Consolas,Liberation Mono,monospace;
+  font-size: 12px;
+}
+
+.markdown-body pre {
+  margin-top: 0;
+  margin-bottom: 0;
+  font-family: ui-monospace,SFMono-Regular,SF Mono,Menlo,Consolas,Liberation Mono,monospace;
+  font-size: 12px;
+  word-wrap: normal;
+}
+
+.markdown-body .octicon {
+  display: inline-block;
+  overflow: visible !important;
+  vertical-align: text-bottom;
+  fill: currentColor;
+}
+
+.markdown-body ::placeholder {
+  color: #484f58;
+  opacity: 1;
+}
+
+.markdown-body input::-webkit-outer-spin-button,
+.markdown-body input::-webkit-inner-spin-button {
+  margin: 0;
+  -webkit-appearance: none;
+  appearance: none;
+}
+
+.markdown-body .pl-c {
+  color: #8b949e;
+}
+
+.markdown-body .pl-c1,
+.markdown-body .pl-s .pl-v {
+  color: #79c0ff;
+}
+
+.markdown-body .pl-e,
+.markdown-body .pl-en {
+  color: #d2a8ff;
+}
+
+.markdown-body .pl-smi,
+.markdown-body .pl-s .pl-s1 {
+  color: #c9d1d9;
+}
+
+.markdown-body .pl-ent {
+  color: #7ee787;
+}
+
+.markdown-body .pl-k {
+  color: #ff7b72;
+}
+
+.markdown-body .pl-s,
+.markdown-body .pl-pds,
+.markdown-body .pl-s .pl-pse .pl-s1,
+.markdown-body .pl-sr,
+.markdown-body .pl-sr .pl-cce,
+.markdown-body .pl-sr .pl-sre,
+.markdown-body .pl-sr .pl-sra {
+  color: #a5d6ff;
+}
+
+.markdown-body .pl-v,
+.markdown-body .pl-smw {
+  color: #ffa657;
+}
+
+.markdown-body .pl-bu {
+  color: #f85149;
+}
+
+.markdown-body .pl-ii {
+  color: #f0f6fc;
+  background-color: #8e1519;
+}
+
+.markdown-body .pl-c2 {
+  color: #f0f6fc;
+  background-color: #b62324;
+}
+
+.markdown-body .pl-sr .pl-cce {
+  font-weight: bold;
+  color: #7ee787;
+}
+
+.markdown-body .pl-ml {
+  color: #f2cc60;
+}
+
+.markdown-body .pl-mh,
+.markdown-body .pl-mh .pl-en,
+.markdown-body .pl-ms {
+  font-weight: bold;
+  color: #1f6feb;
+}
+
+.markdown-body .pl-mi {
+  font-style: italic;
+  color: #c9d1d9;
+}
+
+.markdown-body .pl-mb {
+  font-weight: bold;
+  color: #c9d1d9;
+}
+
+.markdown-body .pl-md {
+  color: #ffdcd7;
+  background-color: #67060c;
+}
+
+.markdown-body .pl-mi1 {
+  color: #aff5b4;
+  background-color: #033a16;
+}
+
+.markdown-body .pl-mc {
+  color: #ffdfb6;
+  background-color: #5a1e02;
+}
+
+.markdown-body .pl-mi2 {
+  color: #c9d1d9;
+  background-color: #1158c7;
+}
+
+.markdown-body .pl-mdr {
+  font-weight: bold;
+  color: #d2a8ff;
+}
+
+.markdown-body .pl-ba {
+  color: #8b949e;
+}
+
+.markdown-body .pl-sg {
+  color: #484f58;
+}
+
+.markdown-body .pl-corl {
+  text-decoration: underline;
+  color: #a5d6ff;
+}
+
+.markdown-body [data-catalyst] {
+  display: block;
+}
+
+.markdown-body g-emoji {
+  font-family: "Apple Color Emoji","Segoe UI Emoji","Segoe UI Symbol";
+  font-size: 1em;
+  font-style: normal !important;
+  font-weight: 400;
+  line-height: 1;
+  vertical-align: -0.075em;
+}
+
+.markdown-body g-emoji img {
+  width: 1em;
+  height: 1em;
+}
+
+.markdown-body::before {
+  display: table;
+  content: "";
+}
+
+.markdown-body::after {
+  display: table;
+  clear: both;
+  content: "";
+}
+
+.markdown-body>*:first-child {
+  margin-top: 0 !important;
+}
+
+.markdown-body>*:last-child {
+  margin-bottom: 0 !important;
+}
+
+.markdown-body a:not([href]) {
+  color: inherit;
+  text-decoration: none;
+}
+
+.markdown-body .absent {
+  color: #f85149;
+}
+
+.markdown-body .anchor {
+  float: left;
+  padding-right: 4px;
+  margin-left: -20px;
+  line-height: 1;
+}
+
+.markdown-body .anchor:focus {
+  outline: none;
+}
+
+.markdown-body p,
+.markdown-body blockquote,
+.markdown-body ul,
+.markdown-body ol,
+.markdown-body dl,
+.markdown-body table,
+.markdown-body pre,
+.markdown-body details {
+  margin-top: 0;
+  margin-bottom: 16px;
+}
+
+.markdown-body blockquote>:first-child {
+  margin-top: 0;
+}
+
+.markdown-body blockquote>:last-child {
+  margin-bottom: 0;
+}
+
+.markdown-body sup>a::before {
+  content: "[";
+}
+
+.markdown-body sup>a::after {
+  content: "]";
+}
+
+.markdown-body h1 .octicon-link,
+.markdown-body h2 .octicon-link,
+.markdown-body h3 .octicon-link,
+.markdown-body h4 .octicon-link,
+.markdown-body h5 .octicon-link,
+.markdown-body h6 .octicon-link {
+  color: #c9d1d9;
+  vertical-align: middle;
+  visibility: hidden;
+}
+
+.markdown-body h1:hover .anchor,
+.markdown-body h2:hover .anchor,
+.markdown-body h3:hover .anchor,
+.markdown-body h4:hover .anchor,
+.markdown-body h5:hover .anchor,
+.markdown-body h6:hover .anchor {
+  text-decoration: none;
+}
+
+.markdown-body h1:hover .anchor .octicon-link,
+.markdown-body h2:hover .anchor .octicon-link,
+.markdown-body h3:hover .anchor .octicon-link,
+.markdown-body h4:hover .anchor .octicon-link,
+.markdown-body h5:hover .anchor .octicon-link,
+.markdown-body h6:hover .anchor .octicon-link {
+  visibility: visible;
+}
+
+.markdown-body h1 tt,
+.markdown-body h1 code,
+.markdown-body h2 tt,
+.markdown-body h2 code,
+.markdown-body h3 tt,
+.markdown-body h3 code,
+.markdown-body h4 tt,
+.markdown-body h4 code,
+.markdown-body h5 tt,
+.markdown-body h5 code,
+.markdown-body h6 tt,
+.markdown-body h6 code {
+  padding: 0 .2em;
+  font-size: inherit;
+}
+
+.markdown-body ul.no-list,
+.markdown-body ol.no-list {
+  padding: 0;
+  list-style-type: none;
+}
+
+.markdown-body ol[type="1"] {
+  list-style-type: decimal;
+}
+
+.markdown-body ol[type=a] {
+  list-style-type: lower-alpha;
+}
+
+.markdown-body ol[type=i] {
+  list-style-type: lower-roman;
+}
+
+.markdown-body div>ol:not([type]) {
+  list-style-type: decimal;
+}
+
+.markdown-body ul ul,
+.markdown-body ul ol,
+.markdown-body ol ol,
+.markdown-body ol ul {
+  margin-top: 0;
+  margin-bottom: 0;
+}
+
+.markdown-body li>p {
+  margin-top: 16px;
+}
+
+.markdown-body li+li {
+  margin-top: .25em;
+}
+
+.markdown-body dl {
+  padding: 0;
+}
+
+.markdown-body dl dt {
+  padding: 0;
+  margin-top: 16px;
+  font-size: 1em;
+  font-style: italic;
+  font-weight: 600;
+}
+
+.markdown-body dl dd {
+  padding: 0 16px;
+  margin-bottom: 16px;
+}
+
+.markdown-body table th {
+  font-weight: 600;
+}
+
+.markdown-body table th,
+.markdown-body table td {
+  padding: 6px 13px;
+  border: 1px solid #30363d;
+}
+
+.markdown-body table tr {
+  background-color: #0d1117;
+  border-top: 1px solid #21262d;
+}
+
+.markdown-body table tr:nth-child(2n) {
+  background-color: #161b22;
+}
+
+.markdown-body table img {
+  background-color: transparent;
+}
+
+.markdown-body img[align=right] {
+  padding-left: 20px;
+}
+
+.markdown-body img[align=left] {
+  padding-right: 20px;
+}
+
+.markdown-body .emoji {
+  max-width: none;
+  vertical-align: text-top;
+  background-color: transparent;
+}
+
+.markdown-body span.frame {
+  display: block;
+  overflow: hidden;
+}
+
+.markdown-body span.frame>span {
+  display: block;
+  float: left;
+  width: auto;
+  padding: 7px;
+  margin: 13px 0 0;
+  overflow: hidden;
+  border: 1px solid #30363d;
+}
+
+.markdown-body span.frame span img {
+  display: block;
+  float: left;
+}
+
+.markdown-body span.frame span span {
+  display: block;
+  padding: 5px 0 0;
+  clear: both;
+  color: #c9d1d9;
+}
+
+.markdown-body span.align-center {
+  display: block;
+  overflow: hidden;
+  clear: both;
+}
+
+.markdown-body span.align-center>span {
+  display: block;
+  margin: 13px auto 0;
+  overflow: hidden;
+  text-align: center;
+}
+
+.markdown-body span.align-center span img {
+  margin: 0 auto;
+  text-align: center;
+}
+
+.markdown-body span.align-right {
+  display: block;
+  overflow: hidden;
+  clear: both;
+}
+
+.markdown-body span.align-right>span {
+  display: block;
+  margin: 13px 0 0;
+  overflow: hidden;
+  text-align: right;
+}
+
+.markdown-body span.align-right span img {
+  margin: 0;
+  text-align: right;
+}
+
+.markdown-body span.float-left {
+  display: block;
+  float: left;
+  margin-right: 13px;
+  overflow: hidden;
+}
+
+.markdown-body span.float-left span {
+  margin: 13px 0 0;
+}
+
+.markdown-body span.float-right {
+  display: block;
+  float: right;
+  margin-left: 13px;
+  overflow: hidden;
+}
+
+.markdown-body span.float-right>span {
+  display: block;
+  margin: 13px auto 0;
+  overflow: hidden;
+  text-align: right;
+}
+
+.markdown-body code,
+.markdown-body tt {
+  padding: .2em .4em;
+  margin: 0;
+  font-size: 85%;
+  background-color: rgba(110,118,129,0.4);
+  border-radius: 6px;
+}
+
+.markdown-body code br,
+.markdown-body tt br {
+  display: none;
+}
+
+.markdown-body del code {
+  text-decoration: inherit;
+}
+
+.markdown-body pre code {
+  font-size: 100%;
+}
+
+.markdown-body pre>code {
+  padding: 0;
+  margin: 0;
+  word-break: normal;
+  white-space: pre;
+  background: transparent;
+  border: 0;
+}
+
+.markdown-body .highlight {
+  margin-bottom: 16px;
+}
+
+.markdown-body .highlight pre {
+  margin-bottom: 0;
+  word-break: normal;
+}
+
+.markdown-body .highlight pre,
+.markdown-body pre {
+  padding: 16px;
+  overflow: auto;
+  font-size: 85%;
+  line-height: 1.45;
+  background-color: #161b22;
+  border-radius: 6px;
+}
+
+.markdown-body pre code,
+.markdown-body pre tt {
+  display: inline;
+  max-width: auto;
+  padding: 0;
+  margin: 0;
+  overflow: visible;
+  line-height: inherit;
+  word-wrap: normal;
+  background-color: transparent;
+  border: 0;
+}
+
+.markdown-body .csv-data td,
+.markdown-body .csv-data th {
+  padding: 5px;
+  overflow: hidden;
+  font-size: 12px;
+  line-height: 1;
+  text-align: left;
+  white-space: nowrap;
+}
+
+.markdown-body .csv-data .blob-num {
+  padding: 10px 8px 9px;
+  text-align: right;
+  background: #0d1117;
+  border: 0;
+}
+
+.markdown-body .csv-data tr {
+  border-top: 0;
+}
+
+.markdown-body .csv-data th {
+  font-weight: 600;
+  background: #161b22;
+  border-top: 0;
+}
+
+.markdown-body .footnotes {
+  font-size: 12px;
+  color: #8b949e;
+  border-top: 1px solid #30363d;
+}
+
+.markdown-body .footnotes ol {
+  padding-left: 16px;
+}
+
+.markdown-body .footnotes li {
+  position: relative;
+}
+
+.markdown-body .footnotes li:target::before {
+  position: absolute;
+  top: -8px;
+  right: -8px;
+  bottom: -8px;
+  left: -24px;
+  pointer-events: none;
+  content: "";
+  border: 2px solid #1f6feb;
+  border-radius: 6px;
+}
+
+.markdown-body .footnotes li:target {
+  color: #c9d1d9;
+}
+
+.markdown-body .footnotes .data-footnote-backref g-emoji {
+  font-family: monospace;
+}
+
+.markdown-body .task-list-item {
+  list-style-type: none;
+}
+
+.markdown-body .task-list-item label {
+  font-weight: 400;
+}
+
+.markdown-body .task-list-item.enabled label {
+  cursor: pointer;
+}
+
+.markdown-body .task-list-item+.task-list-item {
+  margin-top: 3px;
+}
+
+.markdown-body .task-list-item .handle {
+  display: none;
+}
+
+.markdown-body .task-list-item-checkbox {
+  margin: 0 .2em .25em -1.6em;
+  vertical-align: middle;
+}
+
+.markdown-body .contains-task-list:dir(rtl) .task-list-item-checkbox {
+  margin: 0 -1.6em .25em .2em;
+}
+
+.markdown-body ::-webkit-calendar-picker-indicator {
+  filter: invert(50%);
+}

modules/kdayun-app/src/main/resources/static/libs/formdesign/libs/markdown/highlight.min.css

@@ -0,0 +1,113 @@
+pre code.hljs {
+  display: block;
+  overflow-x: auto;
+  padding: 1em
+}
+
+code.hljs {
+  padding: 3px 5px
+}
+
+.hljs {
+  background: #1e1e1e !important;
+  color: #dcdcdc
+}
+
+.hljs-keyword,
+.hljs-literal,
+.hljs-name,
+.hljs-symbol {
+  color: #569cd6
+}
+
+.hljs-link {
+  color: #569cd6;
+  text-decoration: underline
+}
+
+.hljs-built_in,
+.hljs-type {
+  color: #4ec9b0
+}
+
+.hljs-class,
+.hljs-number {
+  color: #b8d7a3
+}
+
+.hljs-meta .hljs-string,
+.hljs-string {
+  color: #d69d85
+}
+
+.hljs-regexp,
+.hljs-template-tag {
+  color: #9a5334
+}
+
+.hljs-formula,
+.hljs-function,
+.hljs-params,
+.hljs-subst,
+.hljs-title {
+  color: #dcdcdc
+}
+
+.hljs-comment,
+.hljs-quote {
+  color: #57a64a;
+  font-style: italic
+}
+
+.hljs-doctag {
+  color: #608b4e
+}
+
+.hljs-meta,
+.hljs-meta .hljs-keyword,
+.hljs-tag {
+  color: #9b9b9b
+}
+
+.hljs-template-variable,
+.hljs-variable {
+  color: #bd63c5
+}
+
+.hljs-attr,
+.hljs-attribute {
+  color: #9cdcfe
+}
+
+.hljs-section {
+  color: gold
+}
+
+.hljs-emphasis {
+  font-style: italic
+}
+
+.hljs-strong {
+  font-weight: 700
+}
+
+.hljs-bullet,
+.hljs-selector-attr,
+.hljs-selector-class,
+.hljs-selector-id,
+.hljs-selector-pseudo,
+.hljs-selector-tag {
+  color: #d7ba7d
+}
+
+.hljs-addition {
+  background-color: #144212;
+  display: inline-block;
+  width: 100%
+}
+
+.hljs-deletion {
+  background-color: #600;
+  display: inline-block;
+  width: 100%
+}

modules/kdayun-app/src/main/resources/static/libs/formdesign/types.txt

@@ -2593,6 +2593,10 @@ iframe = "iframe",
 */ 
 loading = "loading",
 /**
+*消息
+*/ 
+message = "message",
+/**
 *页面层
 */ 
 page = "page",
@@ -5910,6 +5914,12 @@ appendBlankRow(rowId: any): Row
 */ 
 applySort(): void
 
+/**
+* 清除所有的数据
+
+*/ 
+clear(): void
+
 /**
 * 清空数据源字段列表
 
@@ -6419,6 +6429,7 @@ sum(field: string,start: number,end: number): number
 /**
 * 合并数据源提交
 这样做的好处是多个数据源的提交是在一个数据库的事务内.可以用于保证数据的完整性
+注意:数据源的更新顺序就是数据源数组的位置顺序
 * @param dss  数据源的数组
 * @param callback  提交完成回调
 
@@ -9778,6 +9789,13 @@ version: any
 */ 
 render(elemtId: string,json: Object): void
 
+/**
+* 保存
+* @param auto  自动保存 无须填写版本备注
+
+*/ 
+save(auto: boolean): void
+
 } 
 /**
 *界面设计器历史记录类
@@ -9803,6 +9821,12 @@ class Preview  {
 */ 
 render(previewElemtId: string): void
 
+} 
+/**
+* 组件树
+*/ 
+class VersionManger  { 
+
 } 
 /**
 *按钮属性编辑器
@@ -11484,7 +11508,7 @@ type: string
 *代码编辑器的高亮的语言
 */ 
 enum CodeEditorLang {
-   groovy = "groovy",html = "html",java = "java",javascript = "javascript",json = "json",sql = "sql"
+   groovy = "groovy",html = "html",java = "java",javascript = "javascript",json = "json",markdown = "markdown",sql = "sql"
 } 
  /**
 *代码编辑器的主题
@@ -13559,6 +13583,7 @@ static off(cmpId: string,msgFilter: string,callback: Function): void
 
 /**
 * 注册消息处理
+注意:如果是全局消息的监听 cmpid= 'GLOBAL' 才能生效
 * @param cmpId  目标组件ID或者组件实例
 * @param msgName  消息常量值
 * @param callback  消息处理函数
@@ -14913,6 +14938,19 @@ onClick(handle: onLabelClick): void
         */ 
 declare type onLabelClick = (cxt: ScriptContext,sender: ComponentBase) => void
 /**
+*自定义的MarkerDown组件
+可以是任何MarkerDown组件
+*/ 
+class MarkDown  extends ContainerBase { 
+
+} 
+/**
+        *脚本加载回调
+        *@param cmp 组件实例
+    
+        */ 
+declare type onMarkDownHandle = (cmp: MarkDown) => void
+/**
 *表模板组件的弹出页面的工具栏
 */ 
 class Panel  extends ContainerBase { 
@@ -16744,9 +16782,10 @@ declare type OnCellChangedHandle = (sender: TableViewBase,row: Row,column: Table
 *@param row 行实例
 *@param column 列实例
 *@param value 改变的值
+*@param cellElem cell的td的jquery对象
     
         */ 
-declare type OnCellClickHandle = (sender: TableViewBase,row: Row,column: TableColumn,value: any) => void
+declare type OnCellClickHandle = (sender: TableViewBase,row: Row,column: TableColumn,value: any,cellElem: JQuery<any>) => void
 /**
         *单元格双击事件回调
         *@param sender 事件发起者
@@ -16789,9 +16828,10 @@ declare type OnRenderViewHandle = (view: TableViewBase) => void
         *行点击事件回调
         *@param sender 事件发起者
 *@param row 行实例
+*@param rowElem 行的Jquery对象
     
         */ 
-declare type OnRowClickHandle = (sender: TableViewBase,row: Row) => void
+declare type OnRowClickHandle = (sender: TableViewBase,row: Row,rowElem: JQuery<any>) => void
 /**
         *行双击事件回调
         *@param sender 事件发起者
@@ -19383,7 +19423,7 @@ showCalendarId: string
 getFormatDate(date: Date): string
 
 /**
-* 得到日期，格式化为字符串
+* 得到日期，根据选择的日期格式化转为字符串赋值给input框
 * @param str  日期时间* @returns 返回字符串日期
 
 */ 

modules/kdayun-app/src/main/resources/static/libs/layui/css/layui.css

@@ -3591,6 +3591,9 @@ hr,
 }
 
 .layui-table-sort {
+  position: absolute;
+  right: 10px;
+  top: 4px;
   width: 15px;
   height: 20px;
   margin-left: 5px;

modules/kdayun-app/src/main/resources/static/libs/layui/lay/modules/element.js

@@ -197,26 +197,6 @@ layui.define('jquery', function(exports){
       }
     }
     
-    //点击一级菜单
-    /*
-    ,clickThis: function(){
-      var othis = $(this), parents = othis.parents(NAV_ELEM)
-      ,filter = parents.attr('lay-filter')
-      ,elemA = othis.find('a')
-      ,unselect = typeof othis.attr('lay-unselect') === 'string';
-
-      if(othis.find('.'+NAV_CHILD)[0]) return;
-      
-      if(!(elemA.attr('href') !== 'javascript:;' && elemA.attr('target') === '_blank') && !unselect){
-        parents.find('.'+THIS).removeClass(THIS);
-        othis.addClass(THIS);
-      }
-      
-      layui.event.call(this, MOD_NAME, 'nav('+ filter +')', othis);
-    }
-    )
-    */
-    
     //点击菜单 - a标签触发
     ,clickThis: function(){
       var othis = $(this)
@@ -249,16 +229,6 @@ layui.define('jquery', function(exports){
       layui.event.call(this, MOD_NAME, 'nav('+ filter +')', othis);
     }
     
-    //点击子菜单选中
-    /*
-    ,clickChild: function(){
-      var othis = $(this), parents = othis.parents(NAV_ELEM)
-      ,filter = parents.attr('lay-filter');
-      parents.find('.'+THIS).removeClass(THIS);
-      othis.addClass(THIS);
-      layui.event.call(this, MOD_NAME, 'nav('+ filter +')', othis);
-    }
-    */
     
     //折叠面板
     ,collapse: function(){

modules/kdayun-app/src/main/resources/static/libs/token.js

@@ -53,10 +53,10 @@ $(document).ready(function () {
         if (link.href && link.href !== '' && link.href !== 'javascript:;' && link.href !== "") {
             link.href = getTokenIdUrl(link.href)
         }
-        var layhref = $(this).attr("lay-href");
+        var layhref = $(this).attr("yh-href");
         if (layhref && layhref !== '' && layhref !== 'javascript:;' && layhref !== "") {
             layhref = getTokenIdUrl(layhref);
-            $(this).attr("lay-href", layhref);
+            $(this).attr("yh-href", layhref);
         }
     })
 });

modules/kdayun-app/src/main/resources/static/modules/manager/corefunction/corefunction.js

@@ -305,12 +305,12 @@ layui.use(['element', 'table', 'tree', 'treeGrid', 'zlpoptree', 'zlPopSourceForm
             //删除对应行（tr）的DOM结构
             //向服务端发送删除指令
             zlContext.deletePost(layui.cache['contentPath'] + '/manager/corefunction/del', rows, function (result) {
-                var row =rows[0]
+                var row = rows[0]
                 var parents = treeGrid.treeFindUpDatas(tableId, row);
                 if (parents.length > 0) {
                     row = parents[0];
                 }
-                treeGrid.savePos(tableId, row.RWID);
+                row && treeGrid.savePos(tableId, row.RWID);
 
                 if (result[statusName] == OK) {
                     treeGrid.reload(tableId, {
@@ -484,13 +484,13 @@ layui.use(['element', 'table', 'tree', 'treeGrid', 'zlpoptree', 'zlPopSourceForm
                 if (data[statusName] == OK) {
                     layer.close(formindex);
                     var row = getCheckRow()[0];
-                    treeGrid.savePos(tableId, row.RWID);
+                    row && treeGrid.savePos(tableId, row.RWID);
                     treeGrid.reload(tableId, {
                         url: layui.cache['contentPath'] + '/manager/corefunction/query',
                         method: 'POST',
                         done: function (res, curr, count) {
                             treeGrid.gotoPos(tableId);
-                            treeGrid.setCheckStatus(tableId, 'RWID', row.RWID)
+                            row && treeGrid.setCheckStatus(tableId, 'RWID', row.RWID)
                         }
                     });
                     zlContext.successMsg('保存成功');

modules/kdayun-app/src/main/resources/static/modules/manager/coremenu/coremenu.js

@@ -366,11 +366,11 @@ layui.use(['element', 'table', 'tree', 'zlpoptree', 'zltreemenu', 'zlContext', '
                 function (data) {
                     if (data[statusName] == OK) {
                         var row = rows[0];
-                       var parents= treeGrid.treeFindUpDatas(tableId, row);
+                        var parents = treeGrid.treeFindUpDatas(tableId, row);
-                       if(parents.length>0){
+                        if (parents.length > 0) {
-                            row=parents[0];
+                            row = parents[0];
-                       }
+                        }
-                        treeGrid.savePos(tableId, row.RWID);
+                        row && treeGrid.savePos(tableId, row.RWID);
                         treeGrid.reload(tableId, {
                             url: layui.cache['contentPath'] + '/manager/coremenu/query?orgid=' + $('input[name="ORGIDTEMP"]').val(),
                             method: 'POST',
@@ -523,14 +523,14 @@ layui.use(['element', 'table', 'tree', 'zlpoptree', 'zltreemenu', 'zlContext', '
                 if (data[statusName] == OK) {
                     layer.close(formindex);
                     var row = getCheckRow()[0];
-                    treeGrid.savePos(tableId, row.RWID);
+                    row && treeGrid.savePos(tableId, row.RWID);
                     treeGrid.reload(tableId, {
                         url: layui.cache['contentPath'] + '/manager/coremenu/query?orgid=' + $('input[name="ORGIDTEMP"]').val(),
                         method: 'POST',
                         height: fullheight,
                         done: function (res, curr, count) {
                             treeGrid.gotoPos(tableId);
-                            treeGrid.setCheckStatus(tableId, 'RWID', row.RWID)
+                            row && treeGrid.setCheckStatus(tableId, 'RWID', row.RWID)
                         }
                     });
                     zlContext.successMsg('保存成功');

modules/kdayun-app/src/main/resources/static/modules/manager/coremodeldesign/coremodeldesign.js

@@ -5,11 +5,12 @@
  * @Last Modified time: 2020-07-31 16:38:54
  */
 
-layui.use(['tree', 'treeGrid', 'zlpoptree', 'zlPinYin', 'zlContext', 'upload', 'theme'], function (exports) {
+layui.use(['tree', 'treeGrid', 'zlpoptree', 'zlPinYin', 'zlContext', 'upload', 'theme','common'], function (exports) {
     var $ = layui.$
         , zlContext = layui.zlContext
         , zlPinYin = layui.zlPinYin
         , theme = layui.theme
+        , common = layui.common
         , layer = layui.layer
         , upload = layui.upload
         , treeGrid = layui.treeGrid
@@ -194,7 +195,7 @@ layui.use(['tree', 'treeGrid', 'zlpoptree', 'zlPinYin', 'zlContext', 'upload', '
                     if (parents.length > 0) {
                         row = parents[0];
                     }
-                    treeGrid.savePos(tableId, row.RWID);
+                    row && treeGrid.savePos(tableId, row.RWID);
                     if (result[statusName] == OK) {
                         treeGrid.reload(tableId, {
                             url: layui.cache['contentPath'] + '/manager/coremodeldesign/query',
@@ -225,12 +226,12 @@ layui.use(['tree', 'treeGrid', 'zlpoptree', 'zlPinYin', 'zlContext', 'upload', '
                 zlContext.put(layui.cache['contentPath'] + '/manager/coremodeldesign/add', fields, function (result) {
                     if (result[statusName] == OK) {
                         var row = formTreeAction.getCheckRow()[0];
-                        treeGrid.savePos(tableId, row.RWID);
+                        row && treeGrid.savePos(tableId, row.RWID);
                         treeGrid.reload(tableId, {
                             url: layui.cache['contentPath'] + '/manager/coremodeldesign/query',
                             done: function (res, curr, count) {
                                 treeGrid.gotoPos(tableId);
-                                treeGrid.setCheckStatus(tableId, 'RWID', row.RWID)
+                                row && treeGrid.setCheckStatus(tableId, 'RWID', row.RWID)
                                 formTreeAction.import();
                             }
                         });
@@ -246,12 +247,12 @@ layui.use(['tree', 'treeGrid', 'zlpoptree', 'zlPinYin', 'zlContext', 'upload', '
                 zlContext.post(layui.cache['contentPath'] + '/manager/coremodeldesign/modify', fields, function (result) {
                     if (result[statusName] == OK) {
                         var row = fields;
-                        treeGrid.savePos(tableId, row.RWID);
+                        row && treeGrid.savePos(tableId, row.RWID);
                         treeGrid.reload(tableId, {
                             url: layui.cache['contentPath'] + '/manager/coremodeldesign/query',
                             done: function (res, curr, count) {
                                 treeGrid.gotoPos(tableId);
-                                treeGrid.setCheckStatus(tableId, 'RWID', row.RWID)
+                                row && treeGrid.setCheckStatus(tableId, 'RWID', row.RWID)
                                 formTreeAction.import();
                             }
                         });
@@ -308,7 +309,7 @@ layui.use(['tree', 'treeGrid', 'zlpoptree', 'zlPinYin', 'zlContext', 'upload', '
                         },
                             function (confirmIndex) {
                                 top.layer.close(confirmIndex);
-                                body.find('#savejson').trigger('click');
+                                common.broadcast('WM_TOOL_SAVE', true);
                                 layer.close(index)
                                 return false;
                             },

modules/kdayun-app/src/main/resources/static/modules/manager/corereport/corereportex.js

@@ -310,7 +310,7 @@ layui.config({
                         if (parents.length > 0) {
                             row = parents[0];
                         }
-                        treeGrid.savePos(tableId, row.RWID);
+                        row && treeGrid.savePos(tableId, row.RWID);
                         gridAction.refreshGrid('del')
                         zlContext.successMsg('删除成功');
                     }
@@ -367,7 +367,7 @@ layui.config({
                 zlContext.put(layui.cache['contentPath'] + '/manager/corereport/add', fields, function (result) {
                     if (result[statusName] == OK) {
                         var row =  gridAction.getCheckRow()[0];
-                        treeGrid.savePos(tableId, row.RWID);
+                        row && treeGrid.savePos(tableId, row.RWID);
                         gridAction.refreshGrid(editType, result[dataName]);
                         layer.close(fromlayerIndex);
                         zlContext.successMsg('保存成功');
@@ -385,7 +385,7 @@ layui.config({
                 zlContext.post(layui.cache['contentPath'] + '/manager/corereport/modify', fields, function (result) {
                     if (result[statusName] == OK) {
                         var row = fields;
-                        treeGrid.savePos(tableId, row.RWID);
+                        row && treeGrid.savePos(tableId, row.RWID);
                         gridAction.refreshGrid(editType, fields);
                         layer.close(fromlayerIndex);
                         zlContext.successMsg('保存成功');

modules/kdayun-app/src/main/resources/static/modules/web/kdayunadmin/lib/admin.js

@@ -234,7 +234,7 @@ layui.define(['view', 'theme', 'common'], function (exports) {
 		refresh: function () {
 			var iframe = admin.tabsBody(common.tabsPage.index).find('.layadmin-iframe');
 			$('.layadmin-tabsbody-shade').show();
-			iframe.attr('src',iframe.attr('src'));
+			iframe.attr('src', iframe.attr('src'));
 			// iframe[0].contentWindow.location.reload(true);
 		},
 
@@ -297,9 +297,15 @@ layui.define(['view', 'theme', 'common'], function (exports) {
 							themeStr += '<li layadmin-event="setTheme" data-tid="' + item.id + '" data-alias="' + item['theme_title-py'] + '" class="' + flag + '" title="' + item.theme_title + '">' +
 								'  <div class="layadmin-setTheme-title">' + item.theme_title + '</div>' +
 								'  <div class="layadmin-setTheme-header" style="background-color: ' + item.navBgInput + ';"></div>' +
-								'  <div class="layadmin-setTheme-side" style="background-color: ' + item.menuBgInput + ';">' +
+								function getLayoutHtml() {
-								'    <div class="layadmin-setTheme-logo" style="background-color: ' + item.logoBgInput + ';"></div>' +
+									if (item.layout == 'top') {
-								'  </div>' +
+										return ''
+									} else {
+										return '  <div class="layadmin-setTheme-side" style="background-color: ' + item.menuBgInput + ';">' +
+											'    <div class="layadmin-setTheme-logo" style="background-color: ' + item.logoBgInput + ';"></div>' +
+											'  </div>'
+									}
+								}() +
 								'</li>'
 						}
 						$('#LAY_adminPopupTheme').find('ul.layadmin-setTheme-color').html(themeStr);
@@ -554,8 +560,8 @@ layui.define(['view', 'theme', 'common'], function (exports) {
 		var pathURL = router.url,
 			getData = function (item) {
 				return {
-					list: item.children('.layui-nav-child'),
+					list: item.children('.yh-menu-child'),
-					a: item.children('*[lay-href]')
+					a: item.children('*[yh-href]')
 				}
 			},
 			sideMenu = $('#' + SIDE_MENU),
@@ -616,7 +622,7 @@ layui.define(['view', 'theme', 'common'], function (exports) {
 
 	//监听侧边导航点击事件
 	element.on('nav(layadmin-system-side-menu)', function (elem) {
-		if (!window.navigator.onLine && elem.attr('lay-href')) {
+		if (!window.navigator.onLine && elem.attr('yh-href')) {
 			// '网络未连接， 请检查网络后刷新页面'
 			layer.open({
 				type: 1,
@@ -688,18 +694,14 @@ layui.define(['view', 'theme', 'common'], function (exports) {
 	});
 
 	//页面跳转
-	$body.on('click', '*[lay-href]', function () {
+	$body.on('click', '*[yh-href]', function () {
 		if (!window.navigator.onLine) return;
 		var othis = $(this),
-			href = othis.attr('lay-href'),
+			href = othis.attr('yh-href'),
 			text = othis.attr('lay-text'),
-			resid = othis.attr('resid'),
+			resid = othis.attr('resid');
-			searchBox = othis.parents('div#admin-navbar-menu').siblings('div.navbar-side-search');
 
-		searchBox.find('ul.navbarSearchResult ').removeClass('layui-show').addClass('layui-hide');
-		searchBox.find('input#navbarSearchValue').val('');
 		common.tabsPage.elem = othis;
-
 		//执行跳转
 		common.openTabsPage(href, text || othis.text(), resid);
 	});
@@ -749,6 +751,168 @@ layui.define(['view', 'theme', 'common'], function (exports) {
 		resizeSystem.lock = true;
 	}
 	$win.on('resize', layui.data.resizeSystem);
+
+    /**
+     * 渲染角色下拉
+     * @param {*} loginInfo 登录的返回信息 
+     */
+	function renderRoles(loginInfo) {
+		var html = '',
+			rolelist = loginInfo.roleCursor,
+			$rolecourse = $('#rolecourse');
+
+		if (loginInfo.currentDeptName == '') {
+			$('#ROLENAME').html(loginInfo.currentRoleName);
+		} else {
+			$('#ROLENAME').html(loginInfo.currentDeptName + '-' + loginInfo.currentRoleName);
+		}
+
+		$('#ROLENAME').attr('roleid', loginInfo.currentRoleId);
+		$('#ROLENAME').attr('deptid', loginInfo.currentDeptId);
+		for (var i = 0; i < rolelist.length; i++) {
+			html += '<dd>';
+			if (rolelist[i].DEPTNAME != "") {
+				html += '  <a style="cursor:pointer" name="roleswitch" deptid="' + rolelist[i].DEPTID + '" roleid="' + rolelist[i].ROLEID + '">';
+				html += rolelist[i].DEPTNAME + '-' + rolelist[i].ROLENAME;
+			} else {
+				html += '  <a name="roleswitch" roleid="' + rolelist[i].ROLEID + '">';
+				html += rolelist[i].ROLENAME;
+			}
+			html += '   </a>';
+			html += '</dd>';
+		}
+		$rolecourse.append(html);
+		initRoleClickEvent();
+	}
+    /**
+     * 初始化角色点击事件
+     */
+	function initRoleClickEvent() {
+		$('#rolecourse a').on('click', function () {
+			var curroleid = $('#ROLENAME').attr('roleid'),
+				currdeptid = $('#ROLENAME').attr('deptid'),
+				switchroleid = $(this).attr('roleid'),
+				deptid = $(this).attr('deptid') == undefined ? '' : $(this).attr('deptid'),
+				param = {
+					roleid: switchroleid,
+					deptid: deptid
+				}
+			if (curroleid == switchroleid && currdeptid == deptid) {
+				return;
+			} else {
+				var index = layer.load();
+				$.ajax({
+					url: layui.cache['contentPath'] + '/switchRole?t=' + Math.floor(Math.random() * 100),
+					data: param,
+					type: 'get',
+					async: false,
+					dataType: 'json',
+					contentType: "application/json",
+					success: function (result) {
+						if (result.state == 'OK') {
+							layer.close(index);
+							top.location.href = layui.cache['contentPath'] + '/index?tokenId=' + $('#tokenId').val();
+						}
+					},
+					error: function (xhr, textStatus, errorThrown) {
+						layer.msg('请求异常!' + xhr.responseText);
+					},
+				});
+			}
+		});
+	}
+    /**
+     * 渲染头像
+     * @param {*} userInfo 用户信息
+     */
+	function renderTouX(userInfo) {
+		if (userInfo.TOUX != undefined && userInfo.TOUX != null && userInfo.TOUX != '') {
+			$('#TOUX').prop('src', layui.cache['contentPath'] + userInfo.TOUX);
+		} else {
+			$('#TOUX').prop('src', layui.cache['contentPath'] + '/static/image/userImg.png');
+		}
+	}
+    /**
+     * 渲染点击用户名的下拉系统的菜单
+     * @param {*} loginInfo 登录的返回信息 
+     */
+	function renderSysMenu(loginInfo) {
+		$.ajax({
+			url: layui.cache['contentPath'] + '/manager/coresysopt/querybyid',
+			type: 'post',
+			async: true,
+			data: { 'optid': '2F6E174513EE460A971CCD641EC77198' },
+			dataType: 'json',
+			success: function (setdata) {
+				setdata = setdata.obj;
+				if (setdata != '') {
+					var dataArray = setdata.split(',');
+					if (dataArray.length == 1 && dataArray[0] == 'zx') {
+						$('#zx').children('hr').hide();
+						$('#zx').show();
+					} else {
+						$.each(dataArray, function (item, v) {
+							$('#' + v).show();
+						});
+					}
+				} else {
+					$('.setli').hide();
+					$('.layui-nav-more').hide();
+				}
+			},
+			error: function (xhr, textStatus, errorThrown) {
+				layer.msg('请求异常!' + xhr.responseText);
+			},
+		});
+	}
+    /**
+     * 渲染其他,用户名,机构名等
+     * @param {*} userInfo 登录的返回信息
+     */
+	 function renderOthers(userInfo) {
+		$('#OBJNAME').html(userInfo.userCursor.OBJNAME);
+		$('#ORGNAME').html(userInfo.currentOrgName);
+	}
+
+    /**
+     * 渲染消息
+     */
+	function renderMessageBox() {
+		// 获取待办信息
+		$.ajax({
+			url: layui.cache['contentPath'] + '/manager/coremessage/query',
+			type: 'get',
+			async: false,
+			dataType: 'json',
+			contentType: "application/json",
+			success: function (result) {
+				var state = result.state;
+				if (state == 'OK') {
+					var data = result.obj;
+					if (data.length == 0) {
+						$('.layui-badge-dot').remove();
+					}
+				}
+			}
+		});
+	}
+    /**
+     * 主题渲染
+     */
+	function renderTheme() {
+		window['kdtheme'].render(true);
+	}
+
+	function renderMenu(userInfo) {
+		renderTheme();
+		renderTouX(userInfo.userCursor)
+		renderRoles(userInfo)
+		renderSysMenu(userInfo);
+		renderMessageBox();
+		renderSysMenu();
+		renderOthers(userInfo);
+	}
+
 	//初始
 	! function () {
 		//注册页签改变事件
@@ -762,6 +926,22 @@ layui.define(['view', 'theme', 'common'], function (exports) {
 		//当前设定主题设置
 		let m = theme.getTheme(true);
 		if (m) {
+			var g_loginInfo = null
+			common.on('setTheme', function (event) {
+				renderTheme();
+				if (g_loginInfo === null) {
+					admin.getUserInfo(function (userInfo, error) {
+						if (error) {
+							layer.msg('获取用户信息异常：' + error);
+						} else {
+							g_loginInfo = userInfo;
+							renderMenu(g_loginInfo)
+						}
+					})
+				} else {
+					renderMenu(g_loginInfo)
+				}
+			})
 			theme.setTheme(m);
 		}
 		/**

modules/kdayun-app/src/main/resources/static/modules/web/kdayunadmin/lib/index.js

@@ -12,171 +12,6 @@ layui.extend({
         }
     });
 
-    /**
-     * 渲染角色下拉
-     * @param {*} loginInfo 登录的返回信息 
-     */
-    function renderRoles(loginInfo) {
-        var html = '',
-            rolelist = loginInfo.roleCursor,
-            $rolecourse = $('#rolecourse');
-
-        if (loginInfo.currentDeptName == '') {
-            $('#ROLENAME').html(loginInfo.currentRoleName);
-        } else {
-            $('#ROLENAME').html(loginInfo.currentDeptName + '-' + loginInfo.currentRoleName);
-        }
-
-        $('#ROLENAME').attr('roleid', loginInfo.currentRoleId);
-        $('#ROLENAME').attr('deptid', loginInfo.currentDeptId);
-        for (var i = 0; i < rolelist.length; i++) {
-            html += '<dd>';
-            if (rolelist[i].DEPTNAME != "") {
-                html += '  <a style="cursor:pointer" name="roleswitch" deptid="' + rolelist[i].DEPTID + '" roleid="' + rolelist[i].ROLEID + '">';
-                html += rolelist[i].DEPTNAME + '-' + rolelist[i].ROLENAME;
-            } else {
-                html += '  <a name="roleswitch" roleid="' + rolelist[i].ROLEID + '">';
-                html += rolelist[i].ROLENAME;
-            }
-            html += '   </a>';
-            html += '</dd>';
-        }
-        $rolecourse.append(html);
-        initRoleClickEvent();
-    }
-    /**
-     * 初始化角色点击事件
-     */
-    function initRoleClickEvent() {
-        $('#rolecourse a').on('click', function () {
-            var curroleid = $('#ROLENAME').attr('roleid'),
-                currdeptid = $('#ROLENAME').attr('deptid'),
-                switchroleid = $(this).attr('roleid'),
-                deptid = $(this).attr('deptid') == undefined ? '' : $(this).attr('deptid'),
-                param = {
-                    roleid: switchroleid,
-                    deptid: deptid
-                }
-            if (curroleid == switchroleid && currdeptid == deptid) {
-                return;
-            } else {
-                var index = layer.load();
-                $.ajax({
-                    url: layui.cache['contentPath'] + '/switchRole?t=' + Math.floor(Math.random() * 100),
-                    data: param,
-                    type: 'get',
-                    async: false,
-                    dataType: 'json',
-                    contentType: "application/json",
-                    success: function (result) {
-                        if (result.state == 'OK') {
-                            layer.close(index);
-                            top.location.href = layui.cache['contentPath'] + '/index?tokenId=' + $('#tokenId').val();
-                        }
-                    },
-                    error: function (xhr, textStatus, errorThrown) {
-                        layer.msg('请求异常!' + xhr.responseText);
-                    },
-                });
-            }
-        });
-    }
-    /**
-     * 渲染头像
-     * @param {*} userInfo 用户信息
-     */
-    function renderTouX(userInfo) {
-        if (userInfo.TOUX != undefined && userInfo.TOUX != null && userInfo.TOUX != '') {
-            $('#TOUX').prop('src', layui.cache['contentPath'] + userInfo.TOUX);
-        } else {
-            $('#TOUX').prop('src', layui.cache['contentPath'] + '/static/image/userImg.png');
-        }
-    }
-    /**
-     * 渲染点击用户名的下拉系统的菜单
-     * @param {*} loginInfo 登录的返回信息 
-     */
-    function renderSysMenu(loginInfo) {
-        $.ajax({
-            url: layui.cache['contentPath'] + '/manager/coresysopt/querybyid',
-            type: 'post',
-            async: true,
-            data: { 'optid': '2F6E174513EE460A971CCD641EC77198' },
-            dataType: 'json',
-            success: function (setdata) {
-                setdata = setdata.obj;
-                if (setdata != '') {
-                    var dataArray = setdata.split(',');
-                    if (dataArray.length == 1 && dataArray[0] == 'zx') {
-                        $('#zx').children('hr').hide();
-                        $('#zx').show();
-                    } else {
-                        $.each(dataArray, function (item, v) {
-                            $('#' + v).show();
-                        });
-                    }
-                } else {
-                    $('.setli').hide();
-                    $('.layui-nav-more').hide();
-                }
-            },
-            error: function (xhr, textStatus, errorThrown) {
-                layer.msg('请求异常!' + xhr.responseText);
-            },
-        });
-    }
-    /**
-     * 渲染其他,用户名,机构名等
-     * @param {*} loginInfo 登录的返回信息
-     */
-    function renderOthers(loginInfo) {
-        $('#OBJNAME').html(loginInfo.userCursor.OBJNAME);
-        $('#ORGNAME').html(loginInfo.currentOrgName);
-    }
-
-    /**
-     * 渲染消息
-     */
-    function renderMessageBox(){
-        // 获取待办信息
-        $.ajax({
-            url: layui.cache['contentPath'] + '/manager/coremessage/query',
-            type: 'get',
-            async: false,
-            dataType: 'json',
-            contentType: "application/json",
-            success: function (result) {
-                var state = result.state;
-                if (state == 'OK') {
-                    var data = result.obj;
-                    if (data.length == 0) {
-                        $('.layui-badge-dot').remove();
-                    }
-                }
-            }
-        });
-    }
-    /**
-     * 主题渲染
-     */
-    function renderTheme(){
-        window['kdtheme'].render(true);
-    }
-    
-    renderTheme();
-    admin.getUserInfo(function (loginInfo, error) {
-        if (error) {
-            layer.msg('获取用户信息异常：' + error);
-        } else {
-            renderOthers(loginInfo)
-            renderTouX(loginInfo.userCursor)
-            renderRoles(loginInfo)
-            renderSysMenu(loginInfo);
-            renderMessageBox();
-            renderSysMenu();
-        }
-    })
-
     layui.event('WM_USERWFG', 'WM_OPENPAGE', null, function (WParam) {
         if (WParam && WParam.url != '' && WParam.text != '') {
             common.openTabsPage(WParam.url, WParam.text);

modules/kdayun-app/src/main/resources/static/modules/web/kdayunadmin/style/admin.css

@@ -43,6 +43,8 @@ html {
     display: none;
 }
 
+*[yh-href],
+*[yh-tips],
 *[lay-href],
 *[lay-tips],
 *[layadmin-event] {
@@ -68,6 +70,14 @@ html {
     top: 0;
     z-index: 1001;
 }
+.kdayun-app-layout .layui-nav .layui-nav-item{
+    position: relative;
+    display: inline-block;
+    *display: inline;
+    *zoom: 1;
+    vertical-align: middle;
+    line-height: 59px;
+}
 
 .layui-layout-admin .layui-logo,
 .layui-layout-admin .layui-header .layui-nav .layui-nav-item {
@@ -482,7 +492,6 @@ ul.navbarSearchResult::-webkit-scrollbar-track {
     padding-right: 30px;
 }
 
-.layui-side-menu .layui-nav .layui-nav-item>a {}
 
 .layui-side-menu .layui-nav .layui-nav-item a:hover {
     background: none;
@@ -711,11 +720,12 @@ ul.navbarSearchResult::-webkit-scrollbar-track {
 .layadmin-pagetabs .layui-tab-title {
     border: none;
     height: 100%;
+    margin-top: 4px;
 }
 
 .layadmin-pagetabs .layui-tab-title li {
     min-width: 0;
-    line-height: 35px;
+    line-height: 31px;
     max-width: 160px;
     text-overflow: ellipsis;
     padding-right: 40px;
@@ -1508,17 +1518,17 @@ ul.navbarSearchResult::-webkit-scrollbar-track {
 }
 
 
-.kdayun-app-layout-left .layui-header {
+.kdayun-app-layout-left .kdayun-header {
     height: 50px;
     position: relative;
     z-index: 1000;
 }
 
-.kdayun-app-layout-left .layui-header .layui-nav {
+.kdayun-app-layout-left .kdayun-header .layui-nav {
     background: none;
 }
 
-.kdayun-app-layout-left .layui-header .layui-nav .layui-nav-child a {
+.kdayun-app-layout-left .kdayun-header .layui-nav .layui-nav-child a {
     color: #333;
 }
 
@@ -1596,7 +1606,7 @@ ul.navbarSearchResult::-webkit-scrollbar-track {
 }
 
 .kdayun-app-layout-left .layui-layout-left,
-.layadmin-pagetabs,
+.kdayun-app-layout-left .layadmin-pagetabs,
 .kdayun-app-layout-left .kdayun-pagetab-body,
 .kdayun-app-layout-left .layui-footer {
     left: 220px;
@@ -1609,7 +1619,7 @@ ul.navbarSearchResult::-webkit-scrollbar-track {
     z-index: 999;
 }
 
-.kdayun-app-layout-left .layadmin-pagetabs .layui-breadcrumb {
+.kdayun-app-layout-left .lay.kdayun-app-layout-left .kdayun-pagetab-body .layadmin-taadmin-pagetabs .layui-breadcrumb {
     padding: 0 15px;
 }
 
@@ -1618,33 +1628,6 @@ ul.navbarSearchResult::-webkit-scrollbar-track {
     bottom: 0;
 }
 
-.kdayun-app-layout-left .kdayun-pagetab-body .layadmin-tabsbody-shade {
-    position: absolute;
-    top: 0;
-    bottom: 0;
-    left: 0;
-    right: 0;
-    overflow: hidden;
-    background-color: #fff;
-    z-index: 2019;
-    display: none;
-    text-align: center;
-}
-
-.kdayun-app-layout-left .kdayun-pagetab-body .layadmin-tabsbody-shade div {
-    font-weight: bold;
-    margin: 150px 0 25px 0;
-    font-family: Microsoft YaHei;
-    font-size: 36px;
-    color: rgb(179, 179, 179);
-}
-
-.kdayun-app-layout-left .kdayun-pagetab-body .layadmin-tabsbody-shade div:last-child {
-    font-size: 30px;
-    margin: 0;
-    font-weight: normal;
-}
-
 .kdayun-app-layout-left .kdayun-pagetab-body .layadmin-tabsbody-item {
     position: absolute;
     top: 0;
@@ -1678,8 +1661,8 @@ ul.navbarSearchResult::-webkit-scrollbar-track {
     right: 0;
 }
 
-.kdayun-app-layout-left .layui-header .layui-nav .layui-nav-child dd.layui-this a,
+.kdayun-app-layout-left .layui-header .layui-nav .layui-nav-child li.layui-this a,
-.kdayun-app-layout-left .layui-header .layui-nav .layui-nav-child dd.layui-this {
+.kdayun-app-layout-left .layui-header .layui-nav .layui-nav-child li.layui-this {
     background: none
 }
 
@@ -1766,7 +1749,6 @@ ul.navbarSearchResult::-webkit-scrollbar-track {
     background-color: var(--kd-color);
 }
 
-
 /* 统一动画 */
 .kdayun-app-layout-left .layui-header .layui-nav .layui-nav-item,
 .kdayun-app-layout-left .layui-layout-left,
@@ -1778,4 +1760,750 @@ ul.navbarSearchResult::-webkit-scrollbar-track {
 .kdayun-app-layout-left .layui-header .layui-layout-right {
     transition: all .3s;
     -webkit-transition: all .3s;
+}
+
+
+/*布局*/
+
+.kdayun-menu-child {
+    display: none;
+}
+
+.kdayun-pagetab-body .layadmin-tabsbody-shade {
+    position: absolute;
+    top: 0;
+    bottom: 0;
+    left: 0;
+    right: 0;
+    overflow: hidden;
+    background-color: #fff;
+    z-index: 2019;
+    display: none;
+    text-align: center;
+}
+
+.kdayun-pagetab-body .layadmin-tabsbody-shade div {
+    font-weight: bold;
+    margin: 150px 0 25px 0;
+    font-family: Microsoft YaHei;
+    font-size: 36px;
+    color: rgb(179, 179, 179);
+}
+
+.kdayun-pagetab-body .layadmin-tabsbody-shade div:last-child {
+    font-size: 30px;
+    margin: 0;
+    font-weight: normal;
+}
+
+
+/*顶部布局*/
+.kdayun-app-layout-top .layui-layout-left,
+.kdayun-app-layout-top .layadmin-pagetabs,
+.kdayun-app-layout-top .kdayun-pagetab-body,
+.kdayun-app-layout-top .layui-footer {
+    left: 0;
+}
+
+.kdayun-app-layout-top .kdayun-pagetab-body {
+    top: 90px;
+    bottom: 0;
+}
+
+.kdayun-app-layout-top .kdayun-pagetab-body {
+    position: absolute;
+    /* left: 200px; */
+    right: 0;
+    top: 90px;
+    bottom: 0;
+    z-index: 998;
+    width: auto;
+    overflow: hidden;
+    overflow-y: auto;
+    box-sizing: border-box;
+}
+
+.kdayun-app-layout-top .kdayun-pagetab-body .layadmin-tabsbody-item {
+    position: absolute;
+    top: 0;
+    bottom: 0;
+    left: 0;
+    right: 0;
+    overflow: hidden;
+    -webkit-overflow-scrolling: touch;
+    /*overflow-y: scroll;*/
+}
+
+ 
+
+.kdayun-app-layout-top .layadmin-pagetabs {
+    position: fixed;
+    /* top: 50px; */
+    right: 0;
+    z-index: 999;
+}
+
+.kdayun-app-layout-top .kdayun-logo {
+    display: block;
+    position: absolute;
+    padding: 8px;
+}
+
+.kdayun-app-layout-top .kdayun-menu-container {
+    position: relative;
+    display: inline-block;
+    margin-left: 200px;
+    margin-top: 25px;
+}
+
+/* .kdayun-app-layout-top .kdayun-menu-ul {
+    position: relative;
+    padding: 0 20px;
+    background-color: #393D49;
+    color: #fff;
+    border-radius: 2px;
+    font-size: 0;
+    box-sizing: border-box;
+    border-top: none;
+} */
+
+.kdayun-menu-container .layui-this,
+.kdayun-menu-container .layui-this>a,
+.kdayun-menu-container .layui-this>a:hover,
+.kdayun-menu-container .kdayun-menu-child li.layui-this,
+.kdayun-menu-container .kdayun-menu-child li.layui-this a {
+    background-color: var(--kd-color);
+    color: #fff;
+}
+
+
+.kdayun-app-layout-top .kdayun-menu-item {
+    position: relative;
+    display: inline-block;
+    *display: inline;
+    *zoom: 1;
+    vertical-align: middle;
+    border-bottom: none;
+    padding: 4px;
+}
+
+/* .kdayun-app-layout-top .kdayun-menu-container .kdayun-menu-ul li a {
+    color: #555;
+} */
+
+.kdayun-app-layout-top .kdayun-menu-container .kdayun-menu-ul>li {
+    margin-right: 2px !important;
+    box-shadow: 0 3px 1px -2px rgb(0 0 0 / 20%), 0 2px 2px 0 rgb(0 0 0 / 14%), 0 1px 5px 0 rgb(0 0 0 / 12%);
+}
+
+/* Level 1 */
+.kdayun-app-layout-top .kdayun-menu-container .kdayun-menu-ul li {
+    background-color: rgba(0, 0, 0, 0.05);
+}
+
+.kdayun-app-layout-top .kdayun-menu-container .kdayun-menu-ul li a {
+    font-size: 1rem;
+    /*line-height:50px;*/
+    padding: 0px 10px;
+}
+.kdayun-app-layout-top .kdayun-menu-container .kdayun-menu-ul a cite {
+    margin-left: 8px;
+    margin-right: 6px;
+}
+
+/* Level 2 and beyond */
+.kdayun-app-layout-top .kdayun-menu-container .kdayun-menu-ul .kdayun-menu-child {
+     background-color: var(--kd-color);
+     box-shadow: 0 3px 1px -2px rgb(0 0 0 / 20%), 0 2px 2px 0 rgb(0 0 0 / 14%), 0 1px 5px 0 rgb(0 0 0 / 12%);
+}
+.kdayun-app-layout-top .kdayun-menu-container .kdayun-menu-ul .kdayun-menu-item>.kdayun-menu-child {
+    margin-top: 4px;
+}
+
+
+.kdayun-app-layout-top .kdayun-menu-container .kdayun-menu-ul .kdayun-menu-child li a {
+    font-size: 0.8rem;
+    /*line-height:35px;*/
+    padding: 8px 15px 8px 6px;
+}
+
+/* Hover colors */
+.kdayun-app-layout-top .kdayun-menu-container .kdayun-menu-ul li:hover,
+.kdayun-app-layout-top .kdayun-menu-container .kdayun-menu-ul li li:hover>a:first-child:nth-last-child(2),
+.kdayun-app-layout-top .kdayun-menu-container .kdayun-menu-ul>li:hover>a:first-child:nth-last-child(2) {
+    background-color: var(--kd-color);
+    color: #fff;
+}
+
+/* Mobile Navigation overlay */
+.kdayun-app-layout-top.mobile-nav input:checked+label+nav {
+    background-color: rgba(255, 255, 255, 0.9);
+}
+
+/* //////////////////////////
+CORE STYLES BELOW - NO TOUCHY
+////////////////////////// */
+.kdayun-app-layout-top .kdayun-menu-container .kdayun-menu-ul {
+    width: 100%;
+}
+
+.kdayun-app-layout-top .kdayun-menu-container .kdayun-menu-ul,
+.kdayun-app-layout-top .kdayun-menu-container .kdayun-menu-ul li {
+    margin: 0;
+    list-style: none;
+    padding: 4px 4px 4px 0px;
+    border-radius: 4px;
+}
+
+.kdayun-app-layout-top .kdayun-menu-container .kdayun-menu-ul li:hover {
+    cursor: pointer;
+}
+
+.kdayun-app-layout-top .kdayun-menu-container .kdayun-menu-ul a {
+    text-decoration: none;
+}
+
+/* Level 1 */
+.kdayun-app-layout-top .kdayun-menu-container .kdayun-menu-ul {
+    display: flex;
+    flex-wrap: wrap;
+    border-radius: 4px;
+}
+.kdayun-app-layout-top .kdayun-menu-container .kdayun-menu-ul ul {
+    border-radius: 4px;
+}
+
+.kdayun-app-layout-top .kdayun-menu-container .kdayun-menu-ul li {
+    overflow: hidden;
+    white-space: nowrap;
+    text-align: left;
+    
+}
+
+.kdayun-app-layout-top .kdayun-menu-container .kdayun-menu-ul li:hover {
+    overflow: visible;
+}
+
+.kdayun-app-layout-top .kdayun-menu-container .kdayun-menu-ul ul>li {
+    position: relative;
+}
+
+.kdayun-app-layout-top .kdayun-menu-container .kdayun-menu-ul li a {
+    display: block;
+    height: 100%;
+}
+
+/* Level 2 */
+.kdayun-app-layout-top .kdayun-menu-container .kdayun-menu-ul .kdayun-menu-child {
+    visibility: hidden;
+    opacity: 0;
+    position: absolute;
+    z-index: 1;
+    display: block;
+}
+
+.kdayun-app-layout-top .kdayun-menu-container .kdayun-menu-ul li:hover>ul {
+    visibility: visible;
+    opacity: 1;
+}
+
+/* Level 3 */
+.kdayun-app-layout-top .kdayun-menu-container .kdayun-menu-ul .kdayun-menu-child .kdayun-menu-child {
+    top: 0;
+    left: 100%;
+}
+
+.kdayun-app-layout-top .kdayun-menu-container .kdayun-menu-ul .kdayun-menu-child .kdayun-menu-child {
+    margin-top: 5px;
+}
+
+/* ---------- */
+/* Transitions */
+.kdayun-app-layout-top .kdayun-menu-container .kdayun-menu-ul,
+.kdayun-app-layout-top .kdayun-menu-container .kdayun-menu-ul li,
+.kdayun-app-layout-top .kdayun-menu-container .kdayun-menu-ul li a,
+.kdayun-app-layout-top .kdayun-menu-container .kdayun-menu-ul li a:first-child:nth-last-child(2):after {
+    transition: all 200ms linear;
+}
+
+.kdayun-app-layout-top.mobile-nav {
+    transition: all 0.5s linear;
+}
+
+
+/* ---------- */
+/* Arrow styles */
+.kdayun-app-layout-top .kdayun-menu-container .kdayun-menu-ul li a {
+    display: flex;
+    align-items: center;
+}
+
+.kdayun-app-layout-top .kdayun-menu-container .kdayun-menu-ul li a:first-child:nth-last-child(2):after {
+    display: inline-block;
+    width: 10px;
+    height: 5px;
+    margin-left: 10px;
+    opacity: 0.50;
+    font-family: 'FontAwesome';
+    position: absolute;
+    content: "\f0d7";
+    right: 4px;
+    padding-left: 4px;
+    top: 30%;
+}
+
+/* .kdayun-app-layout-top .kdayun-menu-container .kdayun-menu-ul .kdayun-menu-child li a:first-child:nth-last-child(2):before,
+.kdayun-app-layout-top .kdayun-menu-container .kdayun-menu-ul .kdayun-menu-child li a:first-child:nth-last-child(2):after {
+    content: '';
+} */
+
+.kdayun-app-layout-top .kdayun-menu-container .kdayun-menu-ul .kdayun-menu-child li a:first-child:nth-last-child(2):before {
+    order: 1;
+    margin-left: 10px;
+}
+
+.kdayun-app-layout-top .kdayun-menu-container .kdayun-menu-ul .kdayun-menu-child li a:first-child:nth-last-child(2):after {
+    order: 2;
+    margin-left: auto;
+}
+
+/* ---------- */
+/* FontAwesome Icon arrow support */
+.kdayun-app-layout-top.nav-font-icons ul li a:first-child:nth-last-child(2):after {
+    font-family: 'FontAwesome';
+    opacity: 1;
+    width: auto;
+    height: auto;
+    background: none;
+    content: "\f0d7";
+    position: absolute;
+    right: 0;
+    padding-left: 4px;
+    top: 4px;
+}
+
+.kdayun-app-layout-top.nav-font-icons ul ul li>a:first-child:nth-last-child(2):after {
+    content: '\f0d7';
+}
+
+/* arrow: right */
+/* ---------- */
+/* Justify Navigation (first level equal widths) */
+.kdayun-app-layout-top.nav-justified>nav>ul {
+    width: 100%;
+}
+
+.kdayun-app-layout-top.nav-justified>nav>ul>li {
+    flex: 1 1 auto;
+}
+
+.kdayun-app-layout-top.nav-justified>nav>ul>li>a {
+    justify-content: center;
+}
+
+/* ---------- */
+
+/* Vertical Navigation */
+.kdayun-app-layout-top.nav-vertical nav>ul {
+    display: block;
+    width: 200px;
+}
+
+.kdayun-app-layout-top.nav-vertical nav>ul li a:first-child:nth-last-child(2):after {
+    margin-left: auto;
+}
+
+.kdayun-app-layout-top.nav-vertical nav>ul ul {
+    left: 100%;
+    top: 0;
+    margin-top: 5px;
+}
+
+.kdayun-app-layout-top.nav-vertical nav>ul>li {
+    margin-bottom: 1px;
+}
+
+/* ---------- */
+
+/* Mobile Navigation */
+.kdayun-app-layout-top.mobile-nav input {
+    display: none;
+}
+
+.kdayun-app-layout-top.mobile-nav input+label {
+    margin-bottom: 0;
+    z-index: 999;
+}
+
+.kdayun-app-layout-top.mobile-nav input+label+nav>ul>li {
+    margin-right: 1px;
+}
+
+.kdayun-app-layout-top.mobile-nav input:checked+label {
+    position: absolute;
+    top: 8px;
+    right: 10px;
+}
+
+.kdayun-app-layout-top.mobile-nav input:checked+label i:before {
+    content: '\f00d';
+}
+
+/* ---------- */
+
+/* Responsive Breakpoints - down */
+
+/* Extra Small (xs) and down */
+@media (max-width:575px) {}
+
+/* Small (sm) and down */
+@media (max-width:767px) {}
+
+/* Medium (md) and down */
+@media (max-width:991px) {
+    .kdayun-app-layout-top.mobile-nav>nav {
+        display: none;
+    }
+
+    .kdayun-app-layout-top.mobile-nav input:checked+label+nav {
+        display: block;
+    }
+
+    /* Mobile Navigation > Animations */
+    .kdayun-app-layout-top.mobile-nav input:checked+label+nav {
+        animation: mobile-nav-slide-in 0.5s;
+    }
+
+    .kdayun-app-layout-top.mobile-nav.kdayun-app-layout-top-animation-ready input:not(:checked)+label+nav {
+        animation: mobile-nav-slide-out 5s;
+        animation-play-state: paused !important;
+    }
+
+    .kdayun-app-layout-top.mobile-nav input:checked+label i:before {
+        animation: fade-icon-close 0.5s;
+    }
+
+    @keyframes mobile-nav-slide-in {
+        0% {
+            left: -100%;
+            opacity: 0;
+            visibility: visible;
+            /*transition-timing-function: linear;*/
+        }
+
+        100% {
+            left: 0;
+            opacity: 1;
+        }
+    }
+
+    @keyframes mobile-nav-slide-out {
+        0% {
+            left: 0;
+            opacity: 1;
+            visibility: visible;
+        }
+
+        100% {
+            left: -100%;
+            opacity: 0;
+            visibility: hidden;
+        }
+    }
+
+    @keyframes fade-icon-close {
+        0% {
+            opacity: 0;
+        }
+
+        100% {
+            opacity: 1;
+        }
+    }
+
+    /* Mobile Navigation > Vertical Navigation */
+    .kdayun-app-layout-top.mobile-nav input:checked+label+nav>ul {
+        display: block;
+        width: 300px;
+        max-width: 100%;
+        height: 100%;
+    }
+
+    .kdayun-app-layout-top.mobile-nav input:checked+label+nav>ul li a:first-child:nth-last-child(2):after {
+        margin-left: auto;
+    }
+
+    .kdayun-app-layout-top.mobile-nav input:checked+label+nav>ul ul {
+        left: 0;
+        top: 100%;
+        width: 100%;
+    }
+
+    .kdayun-app-layout-top.mobile-nav input:checked+label+nav>ul>li {
+        margin-bottom: 1px;
+    }
+
+    .kdayun-app-layout-top.mobile-nav input:checked+label+nav>ul li:hover>ul {
+        position: relative;
+        margin-left: 10px;
+        border-left: 3px solid #999;
+    }
+
+    .kdayun-app-layout-top.mobile-nav input:checked+label+nav ul ul ul {
+        margin-top: 0;
+    }
+
+    .kdayun-app-layout-top.mobile-nav input:checked+label i:before {
+        animation: anim1 2s;
+    }
+
+    @keyframes anim1 {
+        from {
+            color: red;
+            background: green;
+        }
+    }
+
+    .kdayun-app-layout-top.mobile-nav input+label+nav {
+        background-color: rgba(255, 0, 255, 0.9) !important;
+    }
+
+    /* temp */
+    .kdayun-app-layout-top.mobile-nav input+label+nav {
+        display: block;
+        margin: 0 -100%;
+        margin: 0 calc(50% - 50vw);
+        position: fixed;
+        top: 0;
+        left: 0;
+        right: 0;
+        bottom: 0;
+        z-index: 99;
+        width: 100%;
+        height: 100%;
+    }
+
+    .kdayun-app-layout-top.mobile-nav input:checked+label+nav {
+
+        top: 0;
+        left: 0;
+        right: 0;
+        bottom: 0;
+        z-index: 99;
+        width: 100%;
+        height: 100%;
+    }
+
+    .kdayun-app-layout-top.mobile-nav input:checked+label+nav {
+        visibility: visible;
+        opacity: 1;
+    }
+
+    .kdayun-app-layout-top.mobile-nav input:not(:checked)+label+nav {
+        visibility: hidden;
+        opacity: 0;
+    }
+
+    .kdayun-app-layout-top.mobile-nav:not(:hover) * {
+        -webkit-transition: none !important;
+        -moz-transition: none !important;
+        -ms-transition: none !important;
+        -o-transition: none !important;
+        border: 2px solid red;
+    }
+
+}
+
+/* Large (lg) and down */
+@media (max-width:1199px) {}
+
+/* ---------- */
+/* Responsive Breakpoints - up */
+/* Small (sm) and up */
+@media (min-width:576px) {}
+
+/* Medium (md) and up */
+@media (min-width:768px) {}
+
+/* Large (lg) and up */
+@media (min-width:992px) {
+
+    .kdayun-app-layout-top.mobile-nav input:not(:checked),
+    .kdayun-app-layout-top.mobile-nav input:not(:checked)+label {
+        display: none;
+    }
+}
+
+/* Extra Large (xl) and up */
+@media (min-width:1200px) {}
+
+.kdayun-app-layout-top .kdayun-menu-container a:not([href]),
+.kdayun-app-layout-top .kdayun-menu-container a[href='']:hover,
+.kdayun-app-layout-top .kdayun-menu-container a[href='#']:hover,
+.kdayun-app-layout-top .kdayun-menu-container a[href='']:active,
+.kdayun-app-layout-top .kdayun-menu-container a[href='#']:active {
+    pointer-events: none;
+}
+
+
+.kdayun-app-layout-left .kdayun-menu {
+    transition: all .3s;
+    -webkit-transition: all .3s;
+    width: 220px;
+    top: 0;
+    z-index: 1001;
+    font-family: Microsoft YaHei !important;
+    background-color: #FFFFFF;
+    color: #fff;
+    box-shadow: 1px 0 2px 0 rgb(0 0 0 / 5%);
+    background: #393D49;
+    position: fixed;
+    left: 0;
+    bottom: 0;
+    overflow-x: hidden;
+    -ms-overflow-style: none;
+    overflow: -moz-scrollbars-none;
+}
+
+.kdayun-app-layout-left .kdayun-menu ::-webkit-scrollbar {
+    width: 0 !important
+}
+
+
+
+.kdayun-app-layout-left .kdayun-menu-container {
+    width: 100%;
+    position: relative;
+    height: 100%;
+    overflow-x: hidden;
+}
+
+.kdayun-app-layout-left .kdayun-menu-ul {
+    border-top: none;
+    margin-top: 90px;
+    background: none;
+    padding: 0;
+    position: relative;
+    color: #fff;
+    border-radius: 2px;
+    font-size: 0;
+    box-sizing: border-box;
+}
+
+.kdayun-app-layout-left .kdayun-menu-item {
+    border-bottom: none;
+    display: block;
+    width: 100%;
+    line-height: 45px;
+    position: relative;
+    vertical-align: middle;
+}
+
+.kdayun-app-layout-left .kdayun-menu-item a {
+    display: block;
+    padding: 0 20px;
+    height: 45px;
+    line-height: 45px;
+    padding-left: 30px;
+    padding-right: 30px;
+    position: relative;
+    text-overflow: ellipsis;
+    overflow: hidden;
+    white-space: nowrap;
+    -webkit-transition: all .3s;
+}
+
+
+.kdayun-app-layout-left .kdayun-menu-item .kdayun-menu-child {
+    padding: 5px 0;
+    background: none;
+    color: #fff;
+    position: relative;
+    z-index: 0;
+    top: 0;
+    border: none;
+    box-shadow: none;
+    left: 0;
+    min-width: 100%;
+    line-height: 36px;
+    border-radius: 2px;
+    white-space: nowrap;
+}
+
+.kdayun-app-layout-left .kdayun-menu-child {
+    position: relative;
+}
+
+.kdayun-app-layout-left .kdayun-menu-more {
+    right: 15px;
+    margin-top: -9px;
+    border-style: dashed;
+    border-color: transparent;
+    border-bottom-style: solid;
+    position: absolute;
+    top: 50%;
+    border-width: 6px;
+    content: '';
+    width: 0;
+    height: 0;
+    overflow: hidden;
+    cursor: pointer;
+    transition: all .2s;
+    -webkit-transition: all .2s;
+}
+
+.kdayun-app-layout-left .kdayun-menu-item-expand {
+    border-bottom: none;
+}
+
+.kdayun-app-layout-left .kdayun-menu-item-expand>.kdayun-menu-child {
+    display: block;
+    padding: 0;
+    background-color: rgba(0, 0, 0, .06) !important;
+}
+
+.kdayun-app-layout-left .kdayun-menu-item .kdayun-menu-child a {
+    padding-left: 45px
+}
+
+.kdayun-app-layout-left .kdayun-menu-item .kdayun-menu-child .kdayun-menu-child a {
+    padding-left: 60px;
+}
+
+
+.kdayun-app-layout-left .kdayun-menu-item a cite {
+    padding: 0 10px;
+}
+
+.kdayun-app-layout-left.layadmin-side-shrink .kdayun-menu {
+    width: 60px;
+}
+
+.kdayun-app-layout-left.kdayun-menu .kdayun-menu-ul .kdayun-app-layout-left.kdayun-logo,
+.kdayun-app-layout-left.kdayun-search,
+.kdayun-app-layout-left.kdayun-menu-container {
+    width: 100%;
+}
+
+
+.kdayun-app-layout-left.layadmin-side-shrink .kdayun-menu .kdayun-menu-item cite,
+.kdayun-app-layout-left.layadmin-side-shrink .kdayun-menu .kdayun-menu-ul>.kdayun-menu-item>a .kdayun-menu-more,
+.kdayun-app-layout-left.layadmin-side-shrink .kdayun-menu .kdayun-menu-ul>.kdayun-menu-item>.kdayun-menu-child {
+    display: none;
+    padding: 8px 0;
+    width: 200px;
+}
+
+.kdayun-app-layout-left .layui-layout-left,
+.kdayun-app-layout-left .layadmin-pagetabs,
+.kdayun-app-layout-left .kdayun-pagetab-body,
+.kdayun-app-layout-left .layui-footer {
+    left: 220px;
+}
+
+
+.kdayun-app-layout-left.layadmin-side-shrink .layadmin-pagetabs,
+.kdayun-app-layout-left.layadmin-side-shrink .kdayun-header .kdayun-header-left-tools,
+.kdayun-app-layout-left.layadmin-side-shrink .kdayun-pagetab-body {
+    left: 60px;
 }

modules/kdayun-app/src/main/resources/update/5.0.213/CORE_MODEL_VERSION.json

@@ -0,0 +1,350 @@
+{
+    "FUNCTIONID_ZLFW": "",
+    "MAINTABLENAME_ZLFW": "CORE_TABLE",
+    "MX_BIANH": "CORE_MODEL_VERSION",
+    "MX_BIAOLX": 0,
+    "MX_MIAOS": "表单模型的版本管理",
+    "MX_MINGC": "表单模型版本",
+    "MX_SHIFCJ": 1,
+    "MX_ZHUJZD": "RWID",
+    "RWID": "6CF7918291CE46ECB1B905F2B9BF098C",
+    "SYS_CREATETIME": "",
+    "SYS_CREATOR": "33CE0962586841F9A477020CA6FCFFED",
+    "SYS_ISLEAF": "",
+    "SYS_MODIFYBY": "",
+    "SYS_MODIFYTIME": "",
+    "SYS_PARENTID": "DC744F9E9E31437EA77602C1A5F3B6AA",
+    "SYS_PARENTS": "2FEF611CE3A140D7B9C8235BB1C14D22_394E6660894F4F9F9E39A701CD615C61_DC744F9E9E31437EA77602C1A5F3B6AA_6CF7918291CE46ECB1B905F2B9BF098C",
+    "SYS_SORT": 0,
+    "SYS_STATUS": "",
+    "bigFilePaths": [    ],
+    "columns": [
+        {
+            "FUNCTIONID_ZLFW": "",
+            "MAINTABLENAME_ZLFW": "CORE_TABLECOLUMN",
+            "MXZD_BIANH": "IP",
+            "MXZD_MIAOS": "",
+            "MXZD_MINGC": "IP地址",
+            "MXZD_MORZ": "",
+            "MXZD_SHIFCJ": 1,
+            "MXZD_SHIFWY": 0,
+            "MXZD_TABLEID": "6CF7918291CE46ECB1B905F2B9BF098C",
+            "MXZD_XIAOSJD": "",
+            "MXZD_YINGWM": "",
+            "MXZD_YUNXWK": 1,
+            "MXZD_ZIDCD": 50,
+            "MXZD_ZIDLX": "STRING(50)",
+            "RWID": "624C79C83E2E4B3C963B1663DD5D86BD",
+            "SYS_CREATETIME": "2022-07-25 20:07:10",
+            "SYS_CREATOR": "33CE0962586841F9A477020CA6FCFFED",
+            "SYS_MODIFYBY": "",
+            "SYS_MODIFYTIME": "",
+            "SYS_SORT": 0.0,
+            "SYS_STATUS": ""
+        },
+        {
+            "FUNCTIONID_ZLFW": "",
+            "MAINTABLENAME_ZLFW": "CORE_TABLECOLUMN",
+            "MXZD_BIANH": "MOXNR",
+            "MXZD_MIAOS": "",
+            "MXZD_MINGC": "模型内容",
+            "MXZD_MORZ": "",
+            "MXZD_SHIFCJ": 1,
+            "MXZD_SHIFWY": 0,
+            "MXZD_TABLEID": "6CF7918291CE46ECB1B905F2B9BF098C",
+            "MXZD_XIAOSJD": "",
+            "MXZD_YINGWM": "",
+            "MXZD_YUNXWK": 1,
+            "MXZD_ZIDCD": "",
+            "MXZD_ZIDLX": "TEXT",
+            "RWID": "AC89E00B28CF45D7B7EF5D68491FF0A1",
+            "SYS_CREATETIME": "2022-07-25 10:55:19",
+            "SYS_CREATOR": "33CE0962586841F9A477020CA6FCFFED",
+            "SYS_MODIFYBY": "",
+            "SYS_MODIFYTIME": "",
+            "SYS_SORT": 0.0,
+            "SYS_STATUS": ""
+        },
+        {
+            "FUNCTIONID_ZLFW": "",
+            "MAINTABLENAME_ZLFW": "CORE_TABLECOLUMN",
+            "MXZD_BIANH": "BANBXW",
+            "MXZD_MIAOS": "1 :普通修改保存; 2: 回滚修改 ; 3:删除,4 :新增",
+            "MXZD_MINGC": "版本行为",
+            "MXZD_MORZ": "",
+            "MXZD_SHIFCJ": 1,
+            "MXZD_SHIFWY": 0,
+            "MXZD_TABLEID": "6CF7918291CE46ECB1B905F2B9BF098C",
+            "MXZD_XIAOSJD": "",
+            "MXZD_YINGWM": "",
+            "MXZD_YUNXWK": 1,
+            "MXZD_ZIDCD": "",
+            "MXZD_ZIDLX": "INTEGER",
+            "RWID": "9742DAB18EFC4929AD0D4525C5D36BC3",
+            "SYS_CREATETIME": "2022-07-25 10:08:37",
+            "SYS_CREATOR": "33CE0962586841F9A477020CA6FCFFED",
+            "SYS_MODIFYBY": "33CE0962586841F9A477020CA6FCFFED",
+            "SYS_MODIFYTIME": "2022-07-25 17:29:33",
+            "SYS_SORT": 0.0,
+            "SYS_STATUS": ""
+        },
+        {
+            "FUNCTIONID_ZLFW": "",
+            "MAINTABLENAME_ZLFW": "CORE_TABLECOLUMN",
+            "MXZD_BIANH": "BANBMS",
+            "MXZD_MIAOS": "",
+            "MXZD_MINGC": "版本描述",
+            "MXZD_MORZ": "",
+            "MXZD_SHIFCJ": 1,
+            "MXZD_SHIFWY": 0,
+            "MXZD_TABLEID": "6CF7918291CE46ECB1B905F2B9BF098C",
+            "MXZD_XIAOSJD": "",
+            "MXZD_YINGWM": "",
+            "MXZD_YUNXWK": 1,
+            "MXZD_ZIDCD": 1000,
+            "MXZD_ZIDLX": "STRING(1000)",
+            "RWID": "3DB211332B234538AA3EF4ACC400431A",
+            "SYS_CREATETIME": "2022-07-25 10:06:13",
+            "SYS_CREATOR": "33CE0962586841F9A477020CA6FCFFED",
+            "SYS_MODIFYBY": "",
+            "SYS_MODIFYTIME": "",
+            "SYS_SORT": 0.0,
+            "SYS_STATUS": ""
+        },
+        {
+            "FUNCTIONID_ZLFW": "",
+            "MAINTABLENAME_ZLFW": "CORE_TABLECOLUMN",
+            "MXZD_BIANH": "BIAODMXID",
+            "MXZD_MIAOS": "",
+            "MXZD_MINGC": "表单模型ID",
+            "MXZD_MORZ": "",
+            "MXZD_SHIFCJ": 1,
+            "MXZD_SHIFWY": 0,
+            "MXZD_TABLEID": "6CF7918291CE46ECB1B905F2B9BF098C",
+            "MXZD_XIAOSJD": "",
+            "MXZD_YINGWM": "",
+            "MXZD_YUNXWK": 0,
+            "MXZD_ZIDCD": 32,
+            "MXZD_ZIDLX": "STRING(32)",
+            "RWID": "BC958702E63349C0A38EEC34B14722FC",
+            "SYS_CREATETIME": "2022-07-25 10:03:40",
+            "SYS_CREATOR": "33CE0962586841F9A477020CA6FCFFED",
+            "SYS_MODIFYBY": "",
+            "SYS_MODIFYTIME": "",
+            "SYS_SORT": 0.0,
+            "SYS_STATUS": ""
+        },
+        {
+            "FUNCTIONID_ZLFW": "",
+            "MAINTABLENAME_ZLFW": "CORE_TABLECOLUMN",
+            "MXZD_BIANH": "RWID",
+            "MXZD_MIAOS": "",
+            "MXZD_MINGC": "主键",
+            "MXZD_MORZ": "",
+            "MXZD_SHIFCJ": 1,
+            "MXZD_SHIFWY": 1,
+            "MXZD_TABLEID": "6CF7918291CE46ECB1B905F2B9BF098C",
+            "MXZD_XIAOSJD": "",
+            "MXZD_YINGWM": "",
+            "MXZD_YUNXWK": 0,
+            "MXZD_ZIDCD": 32,
+            "MXZD_ZIDLX": "PK",
+            "RWID": "9C6B72C380754F23A04534992068AE47",
+            "SYS_CREATETIME": "2022-07-25 10:02:45",
+            "SYS_CREATOR": "33CE0962586841F9A477020CA6FCFFED",
+            "SYS_MODIFYBY": "",
+            "SYS_MODIFYTIME": "",
+            "SYS_SORT": 0.0,
+            "SYS_STATUS": 0
+        },
+        {
+            "FUNCTIONID_ZLFW": "",
+            "MAINTABLENAME_ZLFW": "CORE_TABLECOLUMN",
+            "MXZD_BIANH": "SYS_CREATOR",
+            "MXZD_MIAOS": "",
+            "MXZD_MINGC": "创建人",
+            "MXZD_MORZ": "",
+            "MXZD_SHIFCJ": 1,
+            "MXZD_SHIFWY": 0,
+            "MXZD_TABLEID": "6CF7918291CE46ECB1B905F2B9BF098C",
+            "MXZD_XIAOSJD": "",
+            "MXZD_YINGWM": "",
+            "MXZD_YUNXWK": 0,
+            "MXZD_ZIDCD": 32,
+            "MXZD_ZIDLX": "STRING(32)",
+            "RWID": "1C2AAE9C322D4324B344808792996DF6",
+            "SYS_CREATETIME": "2022-07-25 10:02:45",
+            "SYS_CREATOR": "33CE0962586841F9A477020CA6FCFFED",
+            "SYS_MODIFYBY": "",
+            "SYS_MODIFYTIME": "",
+            "SYS_SORT": 1000.0,
+            "SYS_STATUS": 0
+        },
+        {
+            "FUNCTIONID_ZLFW": "",
+            "MAINTABLENAME_ZLFW": "CORE_TABLECOLUMN",
+            "MXZD_BIANH": "SYS_CREATETIME",
+            "MXZD_MIAOS": "",
+            "MXZD_MINGC": "创建时间",
+            "MXZD_MORZ": "",
+            "MXZD_SHIFCJ": 1,
+            "MXZD_SHIFWY": 0,
+            "MXZD_TABLEID": "6CF7918291CE46ECB1B905F2B9BF098C",
+            "MXZD_XIAOSJD": "",
+            "MXZD_YINGWM": "",
+            "MXZD_YUNXWK": 0,
+            "MXZD_ZIDCD": "",
+            "MXZD_ZIDLX": "DATETIME",
+            "RWID": "624F76209D8749F8A886D455EC01388A",
+            "SYS_CREATETIME": "2022-07-25 10:02:45",
+            "SYS_CREATOR": "33CE0962586841F9A477020CA6FCFFED",
+            "SYS_MODIFYBY": "",
+            "SYS_MODIFYTIME": "",
+            "SYS_SORT": 1001.0,
+            "SYS_STATUS": 0
+        },
+        {
+            "FUNCTIONID_ZLFW": "",
+            "MAINTABLENAME_ZLFW": "CORE_TABLECOLUMN",
+            "MXZD_BIANH": "SYS_MODIFYBY",
+            "MXZD_MIAOS": "",
+            "MXZD_MINGC": "修改人",
+            "MXZD_MORZ": "",
+            "MXZD_SHIFCJ": 1,
+            "MXZD_SHIFWY": 0,
+            "MXZD_TABLEID": "6CF7918291CE46ECB1B905F2B9BF098C",
+            "MXZD_XIAOSJD": "",
+            "MXZD_YINGWM": "",
+            "MXZD_YUNXWK": 1,
+            "MXZD_ZIDCD": 32,
+            "MXZD_ZIDLX": "STRING(32)",
+            "RWID": "03F2788CAF2B41C2AE50ADE647F24AED",
+            "SYS_CREATETIME": "2022-07-25 10:02:45",
+            "SYS_CREATOR": "33CE0962586841F9A477020CA6FCFFED",
+            "SYS_MODIFYBY": "",
+            "SYS_MODIFYTIME": "",
+            "SYS_SORT": 1002.0,
+            "SYS_STATUS": 0
+        },
+        {
+            "FUNCTIONID_ZLFW": "",
+            "MAINTABLENAME_ZLFW": "CORE_TABLECOLUMN",
+            "MXZD_BIANH": "SYS_MODIFYTIME",
+            "MXZD_MIAOS": "",
+            "MXZD_MINGC": "修改时间",
+            "MXZD_MORZ": "",
+            "MXZD_SHIFCJ": 1,
+            "MXZD_SHIFWY": 0,
+            "MXZD_TABLEID": "6CF7918291CE46ECB1B905F2B9BF098C",
+            "MXZD_XIAOSJD": "",
+            "MXZD_YINGWM": "",
+            "MXZD_YUNXWK": 1,
+            "MXZD_ZIDCD": "",
+            "MXZD_ZIDLX": "DATETIME",
+            "RWID": "34BC604F2486426686BE3D75BCE1D1DE",
+            "SYS_CREATETIME": "2022-07-25 10:02:45",
+            "SYS_CREATOR": "33CE0962586841F9A477020CA6FCFFED",
+            "SYS_MODIFYBY": "",
+            "SYS_MODIFYTIME": "",
+            "SYS_SORT": 1003.0,
+            "SYS_STATUS": 0
+        },
+        {
+            "FUNCTIONID_ZLFW": "",
+            "MAINTABLENAME_ZLFW": "CORE_TABLECOLUMN",
+            "MXZD_BIANH": "SYS_SORT",
+            "MXZD_MIAOS": "",
+            "MXZD_MINGC": "排序",
+            "MXZD_MORZ": "",
+            "MXZD_SHIFCJ": 1,
+            "MXZD_SHIFWY": 0,
+            "MXZD_TABLEID": "6CF7918291CE46ECB1B905F2B9BF098C",
+            "MXZD_XIAOSJD": 6,
+            "MXZD_YINGWM": "",
+            "MXZD_YUNXWK": 1,
+            "MXZD_ZIDCD": "",
+            "MXZD_ZIDLX": "FLOAT(X)",
+            "RWID": "874AD3C2A98F4AC99751499F4E672899",
+            "SYS_CREATETIME": "2022-07-25 10:02:45",
+            "SYS_CREATOR": "33CE0962586841F9A477020CA6FCFFED",
+            "SYS_MODIFYBY": "",
+            "SYS_MODIFYTIME": "",
+            "SYS_SORT": 1004.0,
+            "SYS_STATUS": 0
+        },
+        {
+            "FUNCTIONID_ZLFW": "",
+            "MAINTABLENAME_ZLFW": "CORE_TABLECOLUMN",
+            "MXZD_BIANH": "SYS_PID",
+            "MXZD_MIAOS": "",
+            "MXZD_MINGC": "流程实例ID",
+            "MXZD_MORZ": "",
+            "MXZD_SHIFCJ": 1,
+            "MXZD_SHIFWY": 0,
+            "MXZD_TABLEID": "6CF7918291CE46ECB1B905F2B9BF098C",
+            "MXZD_XIAOSJD": "",
+            "MXZD_YINGWM": "",
+            "MXZD_YUNXWK": 1,
+            "MXZD_ZIDCD": 32,
+            "MXZD_ZIDLX": "STRING(32)",
+            "RWID": "07555FF694414044AE907DB3B0260E8E",
+            "SYS_CREATETIME": "2022-07-25 10:02:45",
+            "SYS_CREATOR": "33CE0962586841F9A477020CA6FCFFED",
+            "SYS_MODIFYBY": "",
+            "SYS_MODIFYTIME": "",
+            "SYS_SORT": 1005.0,
+            "SYS_STATUS": 0
+        },
+        {
+            "FUNCTIONID_ZLFW": "",
+            "MAINTABLENAME_ZLFW": "CORE_TABLECOLUMN",
+            "MXZD_BIANH": "SYS_AUDFLAG",
+            "MXZD_MIAOS": "",
+            "MXZD_MINGC": "审核状态",
+            "MXZD_MORZ": "",
+            "MXZD_SHIFCJ": 1,
+            "MXZD_SHIFWY": 0,
+            "MXZD_TABLEID": "6CF7918291CE46ECB1B905F2B9BF098C",
+            "MXZD_XIAOSJD": "",
+            "MXZD_YINGWM": "",
+            "MXZD_YUNXWK": 1,
+            "MXZD_ZIDCD": "",
+            "MXZD_ZIDLX": "INTEGER",
+            "RWID": "13AC13D897BB45BA8B6E8C5312F662E3",
+            "SYS_CREATETIME": "2022-07-25 10:02:45",
+            "SYS_CREATOR": "33CE0962586841F9A477020CA6FCFFED",
+            "SYS_MODIFYBY": "",
+            "SYS_MODIFYTIME": "",
+            "SYS_SORT": 1006.0,
+            "SYS_STATUS": 0
+        },
+        {
+            "FUNCTIONID_ZLFW": "",
+            "MAINTABLENAME_ZLFW": "CORE_TABLECOLUMN",
+            "MXZD_BIANH": "SYS_STATUS",
+            "MXZD_MIAOS": "",
+            "MXZD_MINGC": "数据状态",
+            "MXZD_MORZ": "",
+            "MXZD_SHIFCJ": 1,
+            "MXZD_SHIFWY": 0,
+            "MXZD_TABLEID": "6CF7918291CE46ECB1B905F2B9BF098C",
+            "MXZD_XIAOSJD": "",
+            "MXZD_YINGWM": "",
+            "MXZD_YUNXWK": 1,
+            "MXZD_ZIDCD": "",
+            "MXZD_ZIDLX": "INTEGER",
+            "RWID": "F541243EEEE7494EB09A6532690F1167",
+            "SYS_CREATETIME": "2022-07-25 10:02:45",
+            "SYS_CREATOR": "33CE0962586841F9A477020CA6FCFFED",
+            "SYS_MODIFYBY": "",
+            "SYS_MODIFYTIME": "",
+            "SYS_SORT": 1007.0,
+            "SYS_STATUS": 0
+        }
+    ],
+    "indexs": [],
+    "links": [],
+    "rows": [
+        
+    ]
+}

modules/kdayun-app/src/main/resources/view/base/token.ftl

@@ -55,10 +55,10 @@
             if (link.href && link.href !== '' && link.href !== 'javascript:;' && link.href !== "") {
                 link.href = getTokenIdUrl(link.href)
             }
-            var layhref = $(this).attr("lay-href");
+            var url = $(this).attr("yh-href");
-            if (layhref && layhref !== '' && layhref !== 'javascript:;' && layhref !== "") {
+            if (url && url !== '' && url !== 'javascript:;' && url !== "") {
-                layhref = getTokenIdUrl(layhref);
+                url = getTokenIdUrl(url);
-                $(this).attr("lay-href", layhref);
+                $(this).attr("yh-href", url);
             }
         });
 

modules/kdayun-app/src/main/resources/view/manager/coresysopt/main_coresysopt.ftl

@@ -145,9 +145,11 @@
                         <div class="theme-name">{{item.theme_title}}</div>
                         <div class="blank"></div>
                         <div class="layadmin-setTheme-header" style="background-color: {{item['navBgInput']}};"></div>
+                        {{# if(item.layout !=='top'){   }}
                         <div class="layadmin-setTheme-side" style="background-color: {{item['menuBgInput']}};">
                             <div class="layadmin-setTheme-logo" style="background-color: {{item['logoBgInput']}};"></div>
                         </div>
+                        {{# }                           }}
                     </li>
 				{{#  }); }}
                 </ul>
@@ -298,7 +300,7 @@
                     </div>
                 </div>
                 <div class="layui-form-item">
-                    <label class="layui-form-label">左侧菜单</label>
+                    <label class="layui-form-label">菜单</label>
                     <div class="layui-input-block"></div>
                      <div class="layui-input-block">
                         <label class="layui-form-label layui-form-label-child">搜索框背景</label>

modules/kdayun-app/src/main/resources/view/manager/index.ftl

@@ -51,128 +51,8 @@
     <div class="load_title">正在加载 - 后台管理<br><span></span></div>
   </div>
   <div id="kdayun-app" class="kdayun-app-layout-left kdayun-app-layout">
-    <div class="layui-layout layui-layout-admin">
-      <div class="layui-header header header-demo">
-        <!-- 头部区域 -->
-        <ul class="layui-nav layui-layout-left">
-          <li class="layui-nav-item admin-side-toggle" lay-unselect>
-            <a href="javascript:;" layadmin-event="flexible" title="侧边伸缩">
-              <i class="fa fa-bars" aria-hidden="true" id="kdayun-app-flexible"></i>
-            </a>
-          </li>
-          <li class="layui-nav-item admin-side-full" lay-unselect>
-            <a href="javascript:;" layadmin-event="fullscreen" title="全屏">
-              <i class="fa fa-life-bouy" aria-hidden="true"></i>
-            </a>
-          </li>
-          <li class="layui-nav-item admin-side-head" lay-unselect>
-            <a href="${request.contextPath}/index/" target="_blank" title="前台">
-              <i class="fa fa-home" aria-hidden="true"></i>
-            </a>
-          </li>
-          <li class="layui-nav-item admin-side-cacheclear" lay-unselect>
-            <a href="javascript:;"  title="清除服务器缓存">
-              <#--  <i class="layui-icon layui-icon-delete"></i>  -->
-              <i class="fa fa-trash-o" aria-hidden="true"></i>
-            </a>
-          </li>
-        </ul>
-        <ul class="layui-nav layui-layout-right" lay-filter="layadmin-layout-right">
-          <li class="layui-nav-item " lay-unselect>
-            <a href="javascript:;">
-              <img id="TOUX" src="" style="width: 40px;height: 40px;border-radius: 50%;" />
-              <cite id='OBJNAME'></cite>
-            </a>
-            <dl class="layui-nav-child">
-              <dd>  
-                <a lay-href="${request.contextPath}/info/">
-                  <i class="fa fa-user-circle" aria-hidden="true" style="margin-right: 6px;color: #333;"></i>个人信息</a>
-              </dd>
-              <!-- <dd>
-                <a lay-href="/Manage/Account/Setting/"><i class="fa fa-gear" aria-hidden="true"></i>设置</a>
-              </dd> -->
-              <hr>
-              <dd layadmin-event="logout" style="text-align: left;">
-                <a href="${request.contextPath}/manager/logout/">
-                  <i class="fa fa-sign-out" aria-hidden="true"  style="margin-right: 6px;color: #333;"></i> 注销</a>
-              </dd>
-            </dl>
-          </li>
-          <li class="layui-nav-item layui-show-xs-inline-block layui-hide-sm" lay-unselect>
-            <a href="javascript:;" layadmin-event="more">
-              <i class="layui-icon layui-icon-more-vertical"></i>
-            </a>
-          </li>
-        </ul>
-      </div>
-      <!-- 侧边菜单 -->
-      <div class="layui-side">
-        <div class="layui-logo logo layui-logo-admin" lay-href="http://www.kdayun.com">
-          <img class="layui-logo-img" src="${request.contextPath}<@configValue id='CAAB580980C74A169D8AFEB418ABB5AA'> </@configValue>" />
-          <span style="font-size: 22px;">后台管理</span>
-        </div>
-        <div class="navbar-side-search">
-            <input 
-              type="text" 
-              placeholder="搜索..." 
-              id="navbarSearchValue" 
-              autocomplete="off" 
-              class="layui-input layui-inline navbar-seacher-input">
-            <i class="layui-icon layui-icon-search" id="navbarSearchIcon"></i>
-             <ul class="navbarSearchResult layui-hide"></ul>
-        </div> 
-        <div class="layui-side-scroll  kdayun-menu" id="admin-navbar-menu">
-			
-        </div>
-      </div>
-
-      <!-- 页面标签 -->
-      <div class="layadmin-pagetabs" id="LAY_app_tabs" style="border-bottom: solid 1px #277FD0;padding-left: 0px;padding-right: 40px;">
-        <div class="layui-icon layadmin-tabs-control layui-icon-prev" layadmin-event="leftPage" style="display: none;"></div>
-        <div class="layui-icon layadmin-tabs-control layui-icon-next" layadmin-event="rightPage" style="display: none;"></div>
-        <div class="layui-icon layadmin-tabs-control layui-icon-down">
-          <ul id="kd-tabs-select" class="layui-nav layadmin-tabs-select" lay-filter="layadmin-pagetabs-nav">
-            <li class="layui-nav-item" lay-unselect>
-              <a href="javascript:;"></a>
-              <dl class="layui-nav-child layui-anim-fadein">
-                <dd layadmin-event="closeThisTabs">
-                  <a href="javascript:;">关闭当前标签页</a>
-                </dd>
-                <dd layadmin-event="closeOtherTabs">
-                  <a href="javascript:;">关闭其它标签页</a>
-                </dd>
-                <dd layadmin-event="closeAllTabs">
-                  <a href="javascript:;">关闭全部标签页</a>
-                </dd>
-                <dd layadmin-event="refreshCurrentPage">
-                  <a href="javascript:;">刷新当前页面</a>
-                </dd>
-              </dl>
-            </li>
-          </ul>
-        </div>
-        <div class="layui-tab admin-nav-card" lay-unauto lay-allowClose="true" lay-filter="layadmin-layout-tabs">
-          <ul class="layui-tab-title" id="LAY_app_tabsheader">
-            <li lay-id="${request.contextPath}/manager/home/" lay-attr="${request.contextPath}/manager/home/" class="layui-this">
-              <i class="layui-icon layui-icon-home"></i>
-              <cite>首页</cite>
-            </li>
-          </ul>
-        </div>
-      </div>
-      <!-- 主体内容 -->
-      <div class="layui-body" id="LAY_app_body">
-        <div class="layadmin-tabsbody-item layui-show">
-          <!-- <iframe id="layadminIframe" class="layadmin-iframe" src="${request.contextPath}/manager/home/index" frameborder="no" border="0" ></iframe> -->
-          <iframe id="layadminIframe" class="layadmin-iframe" src="${request.contextPath}/manager/corehomepage/console/index" frameborder="no" border="0" ></iframe>
-        </div>
-      </div>
-
-      <!-- 辅助元素，一般用于移动设备下遮罩 -->
-      <div class="layadmin-body-shade" layadmin-event="shade"></div>
-    </div>
   </div>
-    <script src="${request.contextPath}/static/libs/svg-inject.min.js"></script>
+  <script src="${request.contextPath}/static/libs/svg-inject.min.js"></script>
 	<script src="${request.contextPath}/static/libs/layui/layui.js"></script>
 	<script src="${request.contextPath}/static/framework/messenger.js"></script>
 	<script>
@@ -194,7 +74,7 @@
 
   
   <script id="tpl-logo" type="text/html">
-        <div class="layui-logo logo layui-logo-admin" lay-href="http://www.kdayun.com">
+        <div class="layui-logo logo layui-logo-admin" yh-href="http://www.kdayun.com">
           <img class="layui-logo-img" src="${request.contextPath}<@configValue id='CAAB580980C74A169D8AFEB418ABB5AA'> </@configValue>" />
           <span style="font-size: 22px;">后台管理</span>
         </div>
@@ -233,7 +113,7 @@
             </a>
             <dl class="layui-nav-child">
               <dd>  
-                <a lay-href="${request.contextPath}/info/">
+                <a yh-href="${request.contextPath}/info/">
                   <i class="fa fa-user-circle" aria-hidden="true" style="margin-right: 6px;color: #333;"></i>个人信息</a>
               </dd>
               <hr>
@@ -255,12 +135,12 @@
         </div>
   </script>
   <script id="tpl-left-side" type="text/html">
-      <div class="layui-side layui-side-menu kdayun-left-side">
+      <div class="kdayun-menu">
           
       </div>
   </script>
   <script id="tpl-menu" type="text/html">
-    <div class="layui-side-scroll kdayun-left-size-scroll" id="admin-navbar-menu">
+    <div class="kdayun-menu-container" id="admin-navbar-menu">
   
     </div>
   </script>

modules/kdayun-app/src/main/resources/view/web/index.ftl

@@ -64,7 +64,7 @@
       </ul>
       <ul class="layui-nav layui-layout-right" lay-filter="layadmin-layout-right">
           <li class="layui-nav-item" lay-unselect>
-              <a layadmin-event="message" lay-href="${request.contextPath}/manager/coremodelshow/?modelCode=CORE_LCDBS" nopost="1" lay-text="消息中心">
+              <a layadmin-event="message" yh-href="${request.contextPath}/manager/coremodelshow/?modelCode=CORE_LCDBS" nopost="1" lay-text="消息中心">
                   <i class="layui-icon layui-icon-notice"></i>
                   <!-- 如果有新消息，则显示小圆点 -->
                   <span class="layui-badge-dot"></span>
@@ -100,11 +100,11 @@
               </a>
               <dl class="layui-nav-child">
                   <dd id="jbzl" class="setitem">
-                      <a lay-href="${request.contextPath}/info">
+                      <a yh-href="${request.contextPath}/info">
                           <i class="fa fa-user-circle" aria-hidden="true" style="margin-right: 6px;color: #333;"></i>基本资料</a>
                   </dd>
                   <dd id="xgmm" class="setitem">
-                      <a lay-href="${request.contextPath}/password">
+                      <a yh-href="${request.contextPath}/password">
                           <i class="fa fa-edit" aria-hidden="true" style="margin-right: 6px;color: #333;"></i>修改密码
                       </a>
                   </dd>
@@ -258,7 +258,7 @@
       <!-- 头部区域 -->
       <ul class="layui-nav layui-layout-right kdayun-header-right-tools" lay-filter="layadmin-layout-right">
               <li class="layui-nav-item" lay-unselect>
-                  <a layadmin-event="message" lay-href="${request.contextPath}/manager/coremodelshow/?modelCode=CORE_LCDBS" nopost="1" lay-text="消息中心">
+                  <a layadmin-event="message" yh-href="${request.contextPath}/manager/coremodelshow/?modelCode=CORE_LCDBS" nopost="1" lay-text="消息中心">
                       <i class="layui-icon layui-icon-notice"></i>
                       <!-- 如果有新消息，则显示小圆点 -->
                       <span class="layui-badge-dot"></span>
@@ -284,11 +284,11 @@
                   </a>
                   <dl class="layui-nav-child">
                       <dd id="jbzl" class="setitem">
-                          <a lay-href="${request.contextPath}/info">
+                          <a yh-href="${request.contextPath}/info">
                               <i class="fa fa-user-circle" aria-hidden="true" style="margin-right: 6px;color: #333;"></i>基本资料</a>
                       </dd>
                       <dd id="xgmm" class="setitem">
-                          <a lay-href="${request.contextPath}/password">
+                          <a yh-href="${request.contextPath}/password">
                               <i class="fa fa-edit" aria-hidden="true" style="margin-right: 6px;color: #333;"></i>修改密码
                           </a>
                       </dd>
@@ -321,12 +321,12 @@
         </div>
   </script>
   <script id="tpl-left-side" type="text/html">
-      <div class="layui-side layui-side-menu kdayun-left-side">
+      <div class="kdayun-menu">
           
       </div>
   </script>
   <script id="tpl-menu" type="text/html">
-    <div class="layui-side-scroll kdayun-left-size-scroll" id="admin-navbar-menu">
+    <div class="kdayun-menu-container" id="admin-navbar-menu">
   
     </div>
   </script>