-
-
+
@@ -69,87 +67,32 @@
var table = layui.table;
var $ = layui.jquery;
- // var id = GetQueryString("id");
-
- var id = "3";
-
- var _data = [];
-
-
- $.ajax({
- type: "GET",
- async: false,
- url: '/dsBase/dataease/getDataSetTable?dataset_id=' + id,
- dataType: "json",
- success: function (res) {
- _data = res.data;
- }
- });
-
-
- var _emptyData = {};
- var _cols = [];
- let keys = Object.keys(_data[0]);
-
- keys.forEach((item, index) => {
- _emptyData[item] = "";
- var _obj = { field: item, title: item, edit: 'text' }
- _cols.push(_obj);
- });
- _cols.push({ title: '操作1', toolbar: '#table-bar' });
table.render({
- elem: '#ID-table-demo-data',
- id: 'ID-table-demo-data',
- page: false,
- cols: [_cols],
- data: _data
- });
-
- table.on('tool(ID-table-demo-data)', function (obj) {
- if (obj.event === 'add') {
- _data.splice(obj.index + 1, 0, _emptyData);
- table.cache['ID-table-demo-data'] = _data;
- table.renderData('ID-table-demo-data');
- } else {
- var cacheData = table.cache['ID-table-demo-data'];
- cacheData.splice(obj.index, 1)
- table.renderData('ID-table-demo-data');
- }
+ elem: '#data-table',
+ url: '/dsBase/dataease/getDataSet',
+ height: 'full-35',
+ page: {
+ limit: 20
+ , layout: ['count', 'prev', 'page', 'next', 'skip']
+ , prev: "上一页"
+ , next: "下一页"
+ },
+ cols: [[
+ { title: '序号', align: 'center', width: "5%", type: 'numbers' },
+ { title: '分类', field: 'parent_name', align: 'center' },
+ { title: '数据集', field: 'dataset_name', align: 'center'},
+ { title: '表名', field: 'table_name', align: 'center'},
+ { title: '操作', toolbar: '#table-bar', align: 'center'}
+ ]],
+ skin: 'line',
+ defaultToolbar: []
});
- $("#getData").click(function () {
-
- const cleanedData = table.cache['ID-table-demo-data'].map(item => {
- const { LAY_NUM, LAY_INDEX, ...rest } = item;
- return rest;
- });
-
- $.ajax({
- type: "POST",
- dataType: "json",
- async: false,
- url: '/dsBase/dataease/saveDataSetTable',
- data: {
- "dataset_id": id,
- "data": JSON.stringify(cleanedData)
- },
- success: function (res) {
- console.log(res);
- }
- });
-
-
+ table.on('tool(data-table)', function (obj) {
+ window.location.href = "./dataMod.html?id=" + obj.data.id;
});
- function GetQueryString(name, istop) {
- var reg = new RegExp("(^|&)" + name + "=([^&]*)(&|$)", "i");
- var r = window.location.search.substr(1).match(reg);
- if (typeof (istop) != "undefined") r = top.location.search.substr(1).match(reg);
-
- if (r != null) return unescape(r[2]);
- return null;
- }
});
diff --git a/WebRoot/html/pages/dataease/dataMod.html b/WebRoot/html/pages/dataease/dataMod.html
index 663460bb..abfd9a44 100644
--- a/WebRoot/html/pages/dataease/dataMod.html
+++ b/WebRoot/html/pages/dataease/dataMod.html
@@ -72,10 +72,10 @@