diff --git a/sop-admin/sop-admin-front/assets/js/lib.js b/sop-admin/sop-admin-front/assets/js/lib.js
index 3dc971ca..c16fd746 100644
--- a/sop-admin/sop-admin-front/assets/js/lib.js
+++ b/sop-admin/sop-admin-front/assets/js/lib.js
@@ -13,12 +13,12 @@ var lib = (function () {
'../../assets/lib/jquery/3.2.1/jquery.min.js'
,'../../assets/lib/layui/layui.js'
,'../../assets/lib/easyopen/sdk.js'
+ ,'../../assets/lib/layuiext/Form.js'
,'../../assets/js/ApiUtil.js'
- ,'../../assets/js/Form.js'
- ,'../../assets/js/profile.js'
]
var jsArr = [];
+ var layuiConfig, layuiExtend;
/**
* 加载js
@@ -26,7 +26,7 @@ var lib = (function () {
* @param require layui依赖模块
* @param loadSuccess 加载成功后触发
*/
- function layuiInit(jsArr, require, loadSuccess) {
+ function loadJs(jsArr, loadSuccess) {
// 接着加载自定义的js
jsArr = addVersion(jsArr);
@@ -36,7 +36,7 @@ var lib = (function () {
.script(jsArr) // 接着加载自定义的js
// 全部加载成后执行
.wait(function () {
- layui.use(require, loadSuccess);
+ loadSuccess && loadSuccess();
});
}
@@ -62,16 +62,37 @@ var lib = (function () {
* @returns {lib}
*/
importJs: function (jsPath) {
- jsArr = jsPath || [];
+ if (jsPath) {
+ if (typeof jsPath === 'string') {
+ jsPath = [jsPath];
+ }
+ jsArr = jsArr.concat(jsPath);
+ }
+ return this;
+ }
+ , config: function (cfg) {
+ layuiConfig = cfg;
+ return this;
+ }
+ , extend: function (ext) {
+ layuiExtend = ext;
return this;
}
/**
* layui初始化，同layui.use()
* @param require
- * @param loadSuccess
+ * @param layuiInitFun
*/
- , use: function (require, loadSuccess) {
- layuiInit(jsArr, require, loadSuccess);
+ , use: function (require, layuiInitFun) {
+ loadJs(jsArr, function () {
+ if (layuiConfig) {
+ layui.config(layuiConfig);
+ }
+ if (layuiExtend) {
+ layui.extend(layuiExtend);
+ }
+ layui.use(require, layuiInitFun);
+ });
}
}
})();
diff --git a/sop-admin/sop-admin-front/assets/js/Form.js b/sop-admin/sop-admin-front/assets/lib/layuiext/Form.js
similarity index 100%
rename from sop-admin/sop-admin-front/assets/js/Form.js
rename to sop-admin/sop-admin-front/assets/lib/layuiext/Form.js
diff --git a/sop-admin/sop-admin-front/assets/lib/layuiext/module/treetable-lay/treetable.css b/sop-admin/sop-admin-front/assets/lib/layuiext/module/treetable-lay/treetable.css
new file mode 100644
index 00000000..584b2f8c
--- /dev/null
+++ b/sop-admin/sop-admin-front/assets/lib/layuiext/module/treetable-lay/treetable.css
@@ -0,0 +1,18 @@
+.treeTable-empty {
+ width: 20px;
+ display: inline-block;
+}
+
+.treeTable-icon {
+ cursor: pointer;
+}
+
+.treeTable-icon .layui-icon-triangle-d:before {
+ content: "\e623";
+}
+
+.treeTable-icon.open .layui-icon-triangle-d:before {
+ content: "\e625";
+ background-color: transparent;
+}
+
diff --git a/sop-admin/sop-admin-front/assets/lib/layuiext/module/treetable-lay/treetable.js b/sop-admin/sop-admin-front/assets/lib/layuiext/module/treetable-lay/treetable.js
new file mode 100644
index 00000000..e38a5e1c
--- /dev/null
+++ b/sop-admin/sop-admin-front/assets/lib/layuiext/module/treetable-lay/treetable.js
@@ -0,0 +1,206 @@
+layui.define(['layer', 'table'], function (exports) {
+ var $ = layui.jquery;
+ var layer = layui.layer;
+ var table = layui.table;
+
+ var treetable = {
+ // 渲染树形表格
+ render: function (param) {
+ // 检查参数
+ if (!treetable.checkParam(param)) {
+ return;
+ }
+ // 获取数据
+ if (param.data) {
+ treetable.init(param, param.data);
+ } else {
+ $.getJSON(param.url, param.where, function (res) {
+ treetable.init(param, res.data);
+ });
+ }
+ },
+ // 渲染表格
+ init: function (param, data) {
+ var mData = [];
+ var doneCallback = param.done;
+ var tNodes = data;
+ // 补上id和pid字段
+ for (var i = 0; i < tNodes.length; i++) {
+ var tt = tNodes[i];
+ if (!tt.id) {
+ if (!param.treeIdName) {
+ layer.msg('参数treeIdName不能为空', {icon: 5});
+ return;
+ }
+ tt.id = tt[param.treeIdName];
+ }
+ if (!tt.pid) {
+ if (!param.treePidName) {
+ layer.msg('参数treePidName不能为空', {icon: 5});
+ return;
+ }
+ tt.pid = tt[param.treePidName];
+ }
+ }
+
+ // 对数据进行排序
+ var sort = function (s_pid, data) {
+ for (var i = 0; i < data.length; i++) {
+ if (data[i].pid == s_pid) {
+ var len = mData.length;
+ if (len > 0 && mData[len - 1].id == s_pid) {
+ mData[len - 1].isParent = true;
+ }
+ mData.push(data[i]);
+ sort(data[i].id, data);
+ }
+ }
+ };
+ sort(param.treeSpid, tNodes);
+
+ // 重写参数
+ param.url = undefined;
+ param.data = mData;
+ param.page = {
+ count: param.data.length,
+ limit: param.data.length
+ };
+ param.cols[0][param.treeColIndex].templet = function (d) {
+ var mId = d.id;
+ var mPid = d.pid;
+ var isDir = d.isParent;
+ var emptyNum = treetable.getEmptyNum(mPid, mData);
+ var iconHtml = '';
+ for (var i = 0; i < emptyNum; i++) {
+ iconHtml += '';
+ }
+ if (isDir) {
+ iconHtml += ' ';
+ } else {
+ iconHtml += '';
+ }
+ iconHtml += ' ';
+ var ttype = isDir ? 'dir' : 'file';
+ var vg = '';
+ return vg + iconHtml + d[param.cols[0][param.treeColIndex].field] + ''
+ };
+
+ param.done = function (res, curr, count) {
+ $(param.elem).next().addClass('treeTable');
+ $('.treeTable .layui-table-page').css('display', 'none');
+ $(param.elem).next().attr('treeLinkage', param.treeLinkage);
+ // 绑定事件换成对body绑定
+ /*$('.treeTable .treeTable-icon').click(function () {
+ treetable.toggleRows($(this), param.treeLinkage);
+ });*/
+ if (param.treeDefaultClose) {
+ treetable.foldAll(param.elem);
+ }
+ if (doneCallback) {
+ doneCallback(res, curr, count);
+ }
+ };
+
+ // 渲染表格
+ table.render(param);
+ },
+ // 计算缩进的数量
+ getEmptyNum: function (pid, data) {
+ var num = 0;
+ if (!pid) {
+ return num;
+ }
+ var tPid;
+ for (var i = 0; i < data.length; i++) {
+ if (pid == data[i].id) {
+ num += 1;
+ tPid = data[i].pid;
+ break;
+ }
+ }
+ return num + treetable.getEmptyNum(tPid, data);
+ },
+ // 展开/折叠行
+ toggleRows: function ($dom, linkage) {
+ var type = $dom.attr('lay-ttype');
+ if ('file' == type) {
+ return;
+ }
+ var mId = $dom.attr('lay-tid');
+ var isOpen = $dom.hasClass('open');
+ if (isOpen) {
+ $dom.removeClass('open');
+ } else {
+ $dom.addClass('open');
+ }
+ $dom.closest('tbody').find('tr').each(function () {
+ var $ti = $(this).find('.treeTable-icon');
+ var pid = $ti.attr('lay-tpid');
+ var ttype = $ti.attr('lay-ttype');
+ var tOpen = $ti.hasClass('open');
+ if (mId == pid) {
+ if (isOpen) {
+ $(this).hide();
+ if ('dir' == ttype && tOpen == isOpen) {
+ $ti.trigger('click');
+ }
+ } else {
+ $(this).show();
+ if (linkage && 'dir' == ttype && tOpen == isOpen) {
+ $ti.trigger('click');
+ }
+ }
+ }
+ });
+ },
+ // 检查参数
+ checkParam: function (param) {
+ if (!param.treeSpid && param.treeSpid != 0) {
+ layer.msg('参数treeSpid不能为空', {icon: 5});
+ return false;
+ }
+
+ if (!param.treeColIndex && param.treeColIndex != 0) {
+ layer.msg('参数treeColIndex不能为空', {icon: 5});
+ return false;
+ }
+ return true;
+ },
+ // 展开所有
+ expandAll: function (dom) {
+ $(dom).next('.treeTable').find('.layui-table-body tbody tr').each(function () {
+ var $ti = $(this).find('.treeTable-icon');
+ var ttype = $ti.attr('lay-ttype');
+ var tOpen = $ti.hasClass('open');
+ if ('dir' == ttype && !tOpen) {
+ $ti.trigger('click');
+ }
+ });
+ },
+ // 折叠所有
+ foldAll: function (dom) {
+ $(dom).next('.treeTable').find('.layui-table-body tbody tr').each(function () {
+ var $ti = $(this).find('.treeTable-icon');
+ var ttype = $ti.attr('lay-ttype');
+ var tOpen = $ti.hasClass('open');
+ if ('dir' == ttype && tOpen) {
+ $ti.trigger('click');
+ }
+ });
+ }
+ };
+
+ layui.link(layui.cache.base + 'treetable-lay/treetable.css');
+
+ // 给图标列绑定事件
+ $('body').on('click', '.treeTable .treeTable-icon', function () {
+ var treeLinkage = $(this).parents('.treeTable').attr('treeLinkage');
+ if ('true' == treeLinkage) {
+ treetable.toggleRows($(this), true);
+ } else {
+ treetable.toggleRows($(this), false);
+ }
+ });
+
+ exports('treetable', treetable);
+});
diff --git a/sop-admin/sop-admin-front/pages/service/routeManager.js b/sop-admin/sop-admin-front/pages/service/routeManager.js
index 31125c79..353895c3 100644
--- a/sop-admin/sop-admin-front/pages/service/routeManager.js
+++ b/sop-admin/sop-admin-front/pages/service/routeManager.js
@@ -1,4 +1,4 @@
-lib.use(['element', 'table', 'tree', 'form'], function () {
+lib.importJs('../../assets/js/profile.js').use(['element', 'table', 'tree', 'form'], function () {
var ROUTE_STATUS = {
'0': '待审核'
,'1': '已启用'
diff --git a/sop-admin/sop-admin-front/pages/service/serviceList.html b/sop-admin/sop-admin-front/pages/service/serviceList.html
index 1dc016c8..fc8ab65a 100644
--- a/sop-admin/sop-admin-front/pages/service/serviceList.html
+++ b/sop-admin/sop-admin-front/pages/service/serviceList.html
@@ -32,43 +32,17 @@
-
-
+