ns-base-module 1.1.73 → 1.1.75
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
- package/dist/CopyCol/index.js +6 -29
- package/dist/Entry/components/Input.js +5 -8
- package/dist/Entry/components/index.scss +0 -86
- package/dist/FilterPopover/Filter.js +39 -64
- package/dist/FilterPopover/index.js +12 -18
- package/dist/Icon/index.js +1 -564
- package/dist/SubtotalsModal/index.js +1 -0
- package/dist/SubtotalsModal/subtotalTemplate.js +11 -9
- package/dist/TableHeaderConfigPopover/index.js +28 -31
- package/dist/TableHeaderConfigPopover/utils.js +54 -122
- package/dist/umd/ns-base-module.min.css +1 -1
- package/dist/umd/ns-base-module.min.js +1 -1
- package/dist/utils/language.js +2 -6
- package/package.json +1 -1
- package/style/components/ClassFilter.scss +4 -4
- package/style/components/FilterPopover.scss +0 -4
- package/style/components/SubtotalsModal.scss +56 -2
- package/style/components/TableHeaderConfigPopover.scss +56 -7
- package/dist/Icon/antdIcon.js +0 -1964
- package/dist/scroll/index.js +0 -281
- package/dist/scroll/stories/InfiniteScrollWithHeight.js +0 -84
- package/dist/scroll/stories/PullDownToRefreshInfScroll.js +0 -83
- package/dist/scroll/stories/ScrollableTargetInfScroll.js +0 -78
- package/dist/scroll/stories/ScrolleableTop.js +0 -86
- package/dist/scroll/stories/WindowInfiniteScrollComponent.js +0 -68
- package/dist/scroll/stories/stories.js +0 -43
- package/dist/scroll/utils/threshold.js +0 -34
- package/style/components/popoverBody.scss +0 -54
|
@@ -1,6 +1,5 @@
|
|
|
1
1
|
function _typeof(o) { "@babel/helpers - typeof"; return _typeof = "function" == typeof Symbol && "symbol" == typeof Symbol.iterator ? function (o) { return typeof o; } : function (o) { return o && "function" == typeof Symbol && o.constructor === Symbol && o !== Symbol.prototype ? "symbol" : typeof o; }, _typeof(o); }
|
|
2
|
-
var _excluded = ["menuCode", "formTemplateCode"]
|
|
3
|
-
_excluded2 = ["children"];
|
|
2
|
+
var _excluded = ["menuCode", "formTemplateCode"];
|
|
4
3
|
function _objectDestructuringEmpty(obj) { if (obj == null) throw new TypeError("Cannot destructure " + obj); }
|
|
5
4
|
function _objectWithoutProperties(source, excluded) { if (source == null) return {}; var target = _objectWithoutPropertiesLoose(source, excluded); var key, i; if (Object.getOwnPropertySymbols) { var sourceSymbolKeys = Object.getOwnPropertySymbols(source); for (i = 0; i < sourceSymbolKeys.length; i++) { key = sourceSymbolKeys[i]; if (excluded.indexOf(key) >= 0) continue; if (!Object.prototype.propertyIsEnumerable.call(source, key)) continue; target[key] = source[key]; } } return target; }
|
|
6
5
|
function _objectWithoutPropertiesLoose(source, excluded) { if (source == null) return {}; var target = {}; var sourceKeys = Object.keys(source); var key, i; for (i = 0; i < sourceKeys.length; i++) { key = sourceKeys[i]; if (excluded.indexOf(key) >= 0) continue; target[key] = source[key]; } return target; }
|
|
@@ -31,7 +30,7 @@ function _arrayWithHoles(arr) { if (Array.isArray(arr)) return arr; }
|
|
|
31
30
|
*/
|
|
32
31
|
// import { crossContext } from "@/my-context";
|
|
33
32
|
// import { initLang } from "@/utils/language";
|
|
34
|
-
import { CopyOutlined, DeleteOutlined, PlusOutlined, SettingOutlined } from "@ant-design/icons";
|
|
33
|
+
import { CopyOutlined, DeleteOutlined, PlusOutlined, SettingOutlined, ShareAltOutlined, UserOutlined } from "@ant-design/icons";
|
|
35
34
|
import { Button, Checkbox, Input, message, Popconfirm, Popover, Radio, Tooltip, Tree } from "antd";
|
|
36
35
|
import { cloneDeep, get, isArray, isEmpty } from "lodash";
|
|
37
36
|
import React, { memo, useEffect, useMemo, useState } from "react";
|
|
@@ -39,7 +38,6 @@ import { DndProvider } from "react-dnd";
|
|
|
39
38
|
import { HTML5Backend } from "react-dnd-html5-backend";
|
|
40
39
|
import Dustbin from "./Dustbin";
|
|
41
40
|
import "../../style/components/TableHeaderConfigPopover.scss";
|
|
42
|
-
import IconCreate from "../Icon";
|
|
43
41
|
import { initLang } from "../utils/language";
|
|
44
42
|
import { queryColumnsConfig, setFormTemplates } from "../utils/services/global";
|
|
45
43
|
import { adapterColumns, sortColums } from "./utils";
|
|
@@ -160,7 +158,7 @@ var ColumnsToolbarRender = /*#__PURE__*/memo(function (props) {
|
|
|
160
158
|
|
|
161
159
|
// 禁止跨层级拖拽 模板 和更新的数据匹配渲染问题, 渲染时也只匹配同级增删改
|
|
162
160
|
// 修复 模板存储 a下的b, 新表头b在c下面 并改名d
|
|
163
|
-
if (node.parentCode !== dragNode.parentCode) {
|
|
161
|
+
if ((node.parentCode || dragNode.parentCode) && node.parentCode !== dragNode.parentCode) {
|
|
164
162
|
message.warning("不允许改变层级");
|
|
165
163
|
return;
|
|
166
164
|
}
|
|
@@ -494,8 +492,9 @@ var ColumnsToolbarRender = /*#__PURE__*/memo(function (props) {
|
|
|
494
492
|
title: d.customizable === false ? d.title : /*#__PURE__*/React.createElement(Dustbin, {
|
|
495
493
|
item: d,
|
|
496
494
|
onChange: changeTableHeader,
|
|
497
|
-
onFixed: onFixed
|
|
498
|
-
|
|
495
|
+
onFixed: onFixed
|
|
496
|
+
// showArrows={showArrows}
|
|
497
|
+
,
|
|
499
498
|
onDrop: d.customizable === false ? null : onDrop // 子动态列 不能拖拽
|
|
500
499
|
}),
|
|
501
500
|
children: titleChildren(d.children, showArrows)
|
|
@@ -532,7 +531,7 @@ var ColumnsToolbarRender = /*#__PURE__*/memo(function (props) {
|
|
|
532
531
|
onChange: changeInput
|
|
533
532
|
}), /*#__PURE__*/React.createElement(Radio.Group, {
|
|
534
533
|
style: {
|
|
535
|
-
paddingTop:
|
|
534
|
+
paddingTop: 6
|
|
536
535
|
},
|
|
537
536
|
onChange: function onChange(e) {
|
|
538
537
|
setPermsType(e.target.value);
|
|
@@ -561,7 +560,11 @@ var ColumnsToolbarRender = /*#__PURE__*/memo(function (props) {
|
|
|
561
560
|
indeterminate: indeterminate,
|
|
562
561
|
onChange: selectAllChange,
|
|
563
562
|
className: "tree_selectall"
|
|
564
|
-
}, /*#__PURE__*/React.createElement("span",
|
|
563
|
+
}, /*#__PURE__*/React.createElement("span", {
|
|
564
|
+
style: {
|
|
565
|
+
color: "#0273b0"
|
|
566
|
+
}
|
|
567
|
+
}, initLang({
|
|
565
568
|
id: "app.search.modal.selectAll"
|
|
566
569
|
}))), !!leftFixed.length && /*#__PURE__*/React.createElement("div", null, /*#__PURE__*/React.createElement("div", {
|
|
567
570
|
className: "columns-fixed-title"
|
|
@@ -602,7 +605,7 @@ var ColumnsToolbarRender = /*#__PURE__*/memo(function (props) {
|
|
|
602
605
|
showLine: true,
|
|
603
606
|
rootStyle: {
|
|
604
607
|
overflowY: "auto",
|
|
605
|
-
maxHeight: "
|
|
608
|
+
maxHeight: "500px"
|
|
606
609
|
},
|
|
607
610
|
checkedKeys: flatColumns(unFixed, true).filter(function (col) {
|
|
608
611
|
return col.checked;
|
|
@@ -797,11 +800,11 @@ var ColumnsToolbar = function ColumnsToolbar(_ref4) {
|
|
|
797
800
|
}
|
|
798
801
|
if (item.is_default === "Y") {
|
|
799
802
|
hasDefault = true;
|
|
800
|
-
|
|
803
|
+
setValue(item.value);
|
|
801
804
|
setCurItem(item);
|
|
802
805
|
}
|
|
803
806
|
if (item.is_default_public === "Y" && !hasDefault) {
|
|
804
|
-
|
|
807
|
+
setValue(item.value);
|
|
805
808
|
setCurItem(item);
|
|
806
809
|
}
|
|
807
810
|
});
|
|
@@ -905,13 +908,8 @@ var ColumnsToolbar = function ColumnsToolbar(_ref4) {
|
|
|
905
908
|
return _ref7.apply(this, arguments);
|
|
906
909
|
};
|
|
907
910
|
}();
|
|
908
|
-
var updateValue = function updateValue(_value) {
|
|
909
|
-
var _props$onChange;
|
|
910
|
-
setValue(_value);
|
|
911
|
-
(_props$onChange = props.onChange) === null || _props$onChange === void 0 || _props$onChange.call(props, _value);
|
|
912
|
-
};
|
|
913
911
|
var onChange = function onChange(e) {
|
|
914
|
-
|
|
912
|
+
setValue(e.target.value);
|
|
915
913
|
var arr = [].concat(_toConsumableArray(templateUser), _toConsumableArray(template));
|
|
916
914
|
arr.forEach(function (item) {
|
|
917
915
|
if (item.value === e.target.value) {
|
|
@@ -1003,7 +1001,7 @@ var ColumnsToolbar = function ColumnsToolbar(_ref4) {
|
|
|
1003
1001
|
|
|
1004
1002
|
// 取消选择 恢复默认
|
|
1005
1003
|
var cancelSelect = function cancelSelect() {
|
|
1006
|
-
|
|
1004
|
+
setValue("");
|
|
1007
1005
|
setCurItem({});
|
|
1008
1006
|
restColumns("cancel");
|
|
1009
1007
|
};
|
|
@@ -1024,9 +1022,12 @@ var ColumnsToolbar = function ColumnsToolbar(_ref4) {
|
|
|
1024
1022
|
props.updateColumns(_columns);
|
|
1025
1023
|
};
|
|
1026
1024
|
return /*#__PURE__*/React.createElement("div", {
|
|
1027
|
-
className: "popover-body
|
|
1025
|
+
className: "popover-body",
|
|
1026
|
+
style: {
|
|
1027
|
+
width: "500px"
|
|
1028
|
+
}
|
|
1028
1029
|
}, /*#__PURE__*/React.createElement("div", {
|
|
1029
|
-
className: "top-wrap
|
|
1030
|
+
className: "top-wrap"
|
|
1030
1031
|
}, /*#__PURE__*/React.createElement("span", {
|
|
1031
1032
|
className: "title"
|
|
1032
1033
|
}, initLang({
|
|
@@ -1066,8 +1067,7 @@ var ColumnsToolbar = function ColumnsToolbar(_ref4) {
|
|
|
1066
1067
|
}
|
|
1067
1068
|
}, /*#__PURE__*/React.createElement("div", {
|
|
1068
1069
|
className: "list-title"
|
|
1069
|
-
}, /*#__PURE__*/React.createElement(
|
|
1070
|
-
type: "icon-ns-gerenmoban",
|
|
1070
|
+
}, /*#__PURE__*/React.createElement(UserOutlined, {
|
|
1071
1071
|
className: "list-title-icon"
|
|
1072
1072
|
}), initLang({
|
|
1073
1073
|
id: "prompt.personalTemplate"
|
|
@@ -1117,8 +1117,7 @@ var ColumnsToolbar = function ColumnsToolbar(_ref4) {
|
|
|
1117
1117
|
}))));
|
|
1118
1118
|
})), /*#__PURE__*/React.createElement("div", {
|
|
1119
1119
|
className: "list-title"
|
|
1120
|
-
}, /*#__PURE__*/React.createElement(
|
|
1121
|
-
type: "icon-ns-gonggongmoban",
|
|
1120
|
+
}, /*#__PURE__*/React.createElement(ShareAltOutlined, {
|
|
1122
1121
|
className: "list-title-icon"
|
|
1123
1122
|
}), initLang({
|
|
1124
1123
|
id: "prompt.publicTemplate"
|
|
@@ -1179,10 +1178,10 @@ var ColumnsToolbar = function ColumnsToolbar(_ref4) {
|
|
|
1179
1178
|
}))), /*#__PURE__*/React.createElement("div", {
|
|
1180
1179
|
style: {
|
|
1181
1180
|
position: "absolute",
|
|
1182
|
-
|
|
1181
|
+
right: 12,
|
|
1183
1182
|
bottom: 16
|
|
1184
1183
|
}
|
|
1185
|
-
}, (curItem === null || curItem === void 0 ? void 0 : curItem.perms_type)
|
|
1184
|
+
}, (curItem === null || curItem === void 0 ? void 0 : curItem.perms_type) == "private" && /*#__PURE__*/React.createElement(React.Fragment, null, (curItem === null || curItem === void 0 ? void 0 : curItem.is_default) === "Y" ? /*#__PURE__*/React.createElement(Button, {
|
|
1186
1185
|
onClick: function onClick() {
|
|
1187
1186
|
return handleSaveDefault("N");
|
|
1188
1187
|
},
|
|
@@ -1229,8 +1228,6 @@ var ColumnsToolbar = function ColumnsToolbar(_ref4) {
|
|
|
1229
1228
|
};
|
|
1230
1229
|
var Index = function Index(_ref9) {
|
|
1231
1230
|
var props = Object.assign({}, (_objectDestructuringEmpty(_ref9), _ref9));
|
|
1232
|
-
var children = props.children,
|
|
1233
|
-
arg = _objectWithoutProperties(props, _excluded2);
|
|
1234
1231
|
useEffect(function () {
|
|
1235
1232
|
if (props.init) {
|
|
1236
1233
|
getColumnsFilter();
|
|
@@ -1292,8 +1289,8 @@ var Index = function Index(_ref9) {
|
|
|
1292
1289
|
placement: "bottomLeft",
|
|
1293
1290
|
trigger: "click",
|
|
1294
1291
|
title: "",
|
|
1295
|
-
content: /*#__PURE__*/React.createElement(ColumnsToolbar,
|
|
1296
|
-
},
|
|
1292
|
+
content: /*#__PURE__*/React.createElement(ColumnsToolbar, props)
|
|
1293
|
+
}, /*#__PURE__*/React.createElement(Tooltip, {
|
|
1297
1294
|
placement: "left",
|
|
1298
1295
|
title: initLang({
|
|
1299
1296
|
id: "prompt.setTemplate"
|
|
@@ -1,4 +1,10 @@
|
|
|
1
1
|
function _typeof(o) { "@babel/helpers - typeof"; return _typeof = "function" == typeof Symbol && "symbol" == typeof Symbol.iterator ? function (o) { return typeof o; } : function (o) { return o && "function" == typeof Symbol && o.constructor === Symbol && o !== Symbol.prototype ? "symbol" : typeof o; }, _typeof(o); }
|
|
2
|
+
function _toConsumableArray(arr) { return _arrayWithoutHoles(arr) || _iterableToArray(arr) || _unsupportedIterableToArray(arr) || _nonIterableSpread(); }
|
|
3
|
+
function _nonIterableSpread() { throw new TypeError("Invalid attempt to spread non-iterable instance.\nIn order to be iterable, non-array objects must have a [Symbol.iterator]() method."); }
|
|
4
|
+
function _unsupportedIterableToArray(o, minLen) { if (!o) return; if (typeof o === "string") return _arrayLikeToArray(o, minLen); var n = Object.prototype.toString.call(o).slice(8, -1); if (n === "Object" && o.constructor) n = o.constructor.name; if (n === "Map" || n === "Set") return Array.from(o); if (n === "Arguments" || /^(?:Ui|I)nt(?:8|16|32)(?:Clamped)?Array$/.test(n)) return _arrayLikeToArray(o, minLen); }
|
|
5
|
+
function _iterableToArray(iter) { if (typeof Symbol !== "undefined" && iter[Symbol.iterator] != null || iter["@@iterator"] != null) return Array.from(iter); }
|
|
6
|
+
function _arrayWithoutHoles(arr) { if (Array.isArray(arr)) return _arrayLikeToArray(arr); }
|
|
7
|
+
function _arrayLikeToArray(arr, len) { if (len == null || len > arr.length) len = arr.length; for (var i = 0, arr2 = new Array(len); i < len; i++) arr2[i] = arr[i]; return arr2; }
|
|
2
8
|
function ownKeys(e, r) { var t = Object.keys(e); if (Object.getOwnPropertySymbols) { var o = Object.getOwnPropertySymbols(e); r && (o = o.filter(function (r) { return Object.getOwnPropertyDescriptor(e, r).enumerable; })), t.push.apply(t, o); } return t; }
|
|
3
9
|
function _objectSpread(e) { for (var r = 1; r < arguments.length; r++) { var t = null != arguments[r] ? arguments[r] : {}; r % 2 ? ownKeys(Object(t), !0).forEach(function (r) { _defineProperty(e, r, t[r]); }) : Object.getOwnPropertyDescriptors ? Object.defineProperties(e, Object.getOwnPropertyDescriptors(t)) : ownKeys(Object(t)).forEach(function (r) { Object.defineProperty(e, r, Object.getOwnPropertyDescriptor(t, r)); }); } return e; }
|
|
4
10
|
function _defineProperty(obj, key, value) { key = _toPropertyKey(key); if (key in obj) { Object.defineProperty(obj, key, { value: value, enumerable: true, configurable: true, writable: true }); } else { obj[key] = value; } return obj; }
|
|
@@ -66,32 +72,56 @@ var flatColumns = function flatColumns(_columns) {
|
|
|
66
72
|
return initArr;
|
|
67
73
|
};
|
|
68
74
|
|
|
69
|
-
//
|
|
75
|
+
// 遍历数据 引用旧模板的配置: 排序
|
|
76
|
+
var updateTemplateSort = function updateTemplateSort(columns, JsonPares) {
|
|
77
|
+
var sortArr = [];
|
|
78
|
+
for (var r = 0, t = JsonPares.length; r < t; r++) {
|
|
79
|
+
for (var n = 0, l = columns.length; n < l; n++) {
|
|
80
|
+
var _JsonPares$r;
|
|
81
|
+
var _key = (_JsonPares$r = JsonPares[r]) !== null && _JsonPares$r !== void 0 && _JsonPares$r.code ? "code" : "dataIndex";
|
|
82
|
+
if (columns[n][_key] === JsonPares[r][_key]) {
|
|
83
|
+
sortArr.push(columns[n]);
|
|
84
|
+
if (columns[n].children && columns[n].children.length && JsonPares[r].children && JsonPares[r].children.length) {
|
|
85
|
+
// 有子级 递归
|
|
86
|
+
sortArr[sortArr.length - 1].children = updateTemplateSort(columns[n].children, JsonPares[r].children);
|
|
87
|
+
}
|
|
88
|
+
}
|
|
89
|
+
}
|
|
90
|
+
}
|
|
91
|
+
var lastArr = columns.filter(function (d) {
|
|
92
|
+
var _key = d !== null && d !== void 0 && d.code ? "code" : "dataIndex";
|
|
93
|
+
return !find(sortArr, function (o) {
|
|
94
|
+
return o[_key] === d[_key];
|
|
95
|
+
});
|
|
96
|
+
});
|
|
97
|
+
return [].concat(sortArr, _toConsumableArray(lastArr));
|
|
98
|
+
};
|
|
99
|
+
|
|
100
|
+
// 遍历数据 引用旧模板的配置: width fixed checked frontEndFold
|
|
70
101
|
var updateTemplateFilds = function updateTemplateFilds(JsonPares, _columns) {
|
|
71
102
|
var _loop = function _loop(r) {
|
|
72
|
-
var _JsonPares$
|
|
103
|
+
var _JsonPares$r2;
|
|
73
104
|
if (JsonPares[r].children && JsonPares[r].children.length) {
|
|
74
105
|
updateTemplateFilds(JsonPares[r].children, _columns);
|
|
75
106
|
}
|
|
76
|
-
var _key = (_JsonPares$
|
|
107
|
+
var _key = (_JsonPares$r2 = JsonPares[r]) !== null && _JsonPares$r2 !== void 0 && _JsonPares$r2.code ? "code" : "dataIndex";
|
|
77
108
|
var _findItem = find(_columns, function (o) {
|
|
78
109
|
return o[_key] === JsonPares[r][_key];
|
|
79
110
|
});
|
|
80
111
|
if (_findItem) {
|
|
81
|
-
|
|
82
|
-
|
|
83
|
-
|
|
84
|
-
|
|
85
|
-
|
|
86
|
-
|
|
87
|
-
|
|
88
|
-
|
|
89
|
-
|
|
90
|
-
|
|
91
|
-
return: JsonPares[r].return,
|
|
92
|
-
dataIndex: JsonPares[r].dataIndex,
|
|
93
|
-
frontEndFold: JsonPares[r].frontEndFold
|
|
112
|
+
// 模板的配置
|
|
113
|
+
JsonPares[r] = _objectSpread(_objectSpread({}, JsonPares[r]), {}, {
|
|
114
|
+
fixed: _findItem.fixed,
|
|
115
|
+
width: _findItem.width,
|
|
116
|
+
checked: _findItem.checked,
|
|
117
|
+
isAllChildrenFixed: _findItem.isAllChildrenFixed,
|
|
118
|
+
_index: _findItem._index,
|
|
119
|
+
key: _findItem.key,
|
|
120
|
+
return: _findItem.return,
|
|
121
|
+
frontEndFold: _findItem.frontEndFold
|
|
94
122
|
});
|
|
123
|
+
} else {
|
|
124
|
+
JsonPares[r].checked = false;
|
|
95
125
|
}
|
|
96
126
|
};
|
|
97
127
|
for (var r = 0, t = JsonPares.length; r < t; r++) {
|
|
@@ -107,27 +137,6 @@ var updateTemplateFilds = function updateTemplateFilds(JsonPares, _columns) {
|
|
|
107
137
|
* */
|
|
108
138
|
export function adapterColumns(customColumns, columns) {
|
|
109
139
|
if (customColumns && customColumns.length && columns && columns.length) {
|
|
110
|
-
// 展平 columns, 1,子是动态列 父级必须是,父级的表头宽度取决于子级设置.2,子级是浮动 父级同步 解决首行选择框的浮动
|
|
111
|
-
var _columns = flatColumns(columns);
|
|
112
|
-
var itemLoop = function itemLoop(arr, commad) {
|
|
113
|
-
var _loop2 = function _loop2(_k, j) {
|
|
114
|
-
var _code = arr[j].code ? "code" : "dataIndex";
|
|
115
|
-
if (commad === "del") {
|
|
116
|
-
if (!find(_columns, function (o) {
|
|
117
|
-
return o[_code] === arr[j][_code] && o.parentCode === arr[j].parentCode;
|
|
118
|
-
})) {
|
|
119
|
-
arr.splice(j, 1);
|
|
120
|
-
_k -= 1;
|
|
121
|
-
} else if (arr[j].children && arr[j].children.length) {
|
|
122
|
-
itemLoop(arr[j].children, commad);
|
|
123
|
-
}
|
|
124
|
-
}
|
|
125
|
-
k = _k;
|
|
126
|
-
};
|
|
127
|
-
for (var j = 0, k = arr.length; j < k; j++) {
|
|
128
|
-
_loop2(k, j);
|
|
129
|
-
}
|
|
130
|
-
};
|
|
131
140
|
var item = null;
|
|
132
141
|
for (var n = 0, leng = customColumns.length; n < leng; n++) {
|
|
133
142
|
if (customColumns[n].is_default_public == "Y") {
|
|
@@ -139,96 +148,19 @@ export function adapterColumns(customColumns, columns) {
|
|
|
139
148
|
}
|
|
140
149
|
}
|
|
141
150
|
try {
|
|
142
|
-
var
|
|
143
|
-
if ((
|
|
151
|
+
var _item;
|
|
152
|
+
if ((_item = item) !== null && _item !== void 0 && _item.is_default) {
|
|
144
153
|
var JsonPares = JSON.parse(item.define);
|
|
145
|
-
|
|
146
|
-
// 删 旧模板多出的字段
|
|
147
|
-
itemLoop(JsonPares, "del");
|
|
148
|
-
|
|
149
|
-
// 展平 columns
|
|
150
154
|
var flaJsonPares = flatColumns(JsonPares);
|
|
151
|
-
|
|
152
|
-
var _loop3 = function _loop3(j) {
|
|
153
|
-
var _code = _columns[j].code ? "code" : "dataIndex";
|
|
154
|
-
if (!find(flaJsonPares, function (o) {
|
|
155
|
-
return o[_code] === _columns[j][_code] && o.parentCode === _columns[j].parentCode;
|
|
156
|
-
})) {
|
|
157
|
-
var _item = initColumns([_columns[j]], null)[0];
|
|
158
|
-
if (_item.customizable !== false) {
|
|
159
|
-
// 不是动态列
|
|
160
|
-
if (_item.fixed === "left") {
|
|
161
|
-
JsonPares.unshift(_item);
|
|
162
|
-
} else {
|
|
163
|
-
JsonPares.push(_item);
|
|
164
|
-
}
|
|
165
|
-
}
|
|
166
|
-
}
|
|
167
|
-
|
|
168
|
-
// 动态列 columns[j].customizable === false 不能用模板,用列表数据
|
|
169
|
-
if (_columns[j].customizable === false && _code) {
|
|
170
|
-
var loopSetChildren = function loopSetChildren(arr1, arr2) {
|
|
171
|
-
arr1.forEach(function (d) {
|
|
172
|
-
var h = find(arr2, function (o) {
|
|
173
|
-
return o[_code] === d[_code];
|
|
174
|
-
});
|
|
175
|
-
if (h) {
|
|
176
|
-
d.width = h.width;
|
|
177
|
-
d.fixed = h.fixed;
|
|
178
|
-
d.checked = h.checked;
|
|
179
|
-
}
|
|
180
|
-
if (d.children && d.children.length && h !== null && h !== void 0 && h.children && h !== null && h !== void 0 && h.children.length) {
|
|
181
|
-
loopSetChildren(d.children, h.children);
|
|
182
|
-
}
|
|
183
|
-
});
|
|
184
|
-
};
|
|
185
|
-
var loopSetZable = function loopSetZable(_JsonPares) {
|
|
186
|
-
for (var i = 0, l = _JsonPares.length; i < l; i++) {
|
|
187
|
-
if (_columns[j][_code] === _JsonPares[i][_code]) {
|
|
188
|
-
var obj = {
|
|
189
|
-
width: _JsonPares[i].width,
|
|
190
|
-
fixed: _JsonPares[i].fixed,
|
|
191
|
-
checked: _JsonPares[i].checked
|
|
192
|
-
};
|
|
193
|
-
_columns[j] = _objectSpread(_objectSpread({}, _columns[j]), obj);
|
|
194
|
-
if (_columns[j].children && _columns[j].children.length && _JsonPares[i].children && _JsonPares[i].children.length) {
|
|
195
|
-
loopSetChildren(_columns[j].children, _JsonPares[i].children);
|
|
196
|
-
}
|
|
197
|
-
var d = initColumns([_columns[j]], null)[0];
|
|
198
|
-
_JsonPares[i] = _objectSpread({}, d);
|
|
199
|
-
return;
|
|
200
|
-
}
|
|
201
|
-
// else {
|
|
202
|
-
// if (_JsonPares[i].children && _JsonPares[i].children.length) {
|
|
203
|
-
// loopSetZable(_JsonPares[i].children);
|
|
204
|
-
// }
|
|
205
|
-
// }
|
|
206
|
-
}
|
|
207
|
-
};
|
|
208
|
-
loopSetZable(JsonPares);
|
|
209
|
-
}
|
|
210
|
-
};
|
|
211
|
-
for (var j = 0, k = _columns.length; j < k; j++) {
|
|
212
|
-
_loop3(j);
|
|
213
|
-
}
|
|
155
|
+
var columnsClone = JSON.parse(JSON.stringify(columns));
|
|
214
156
|
|
|
215
|
-
//
|
|
216
|
-
|
|
217
|
-
if (dd.fixed && dd.children && dd.children.length) {
|
|
218
|
-
var isAllChildrenFixed = true;
|
|
219
|
-
dd.children.forEach(function (hh) {
|
|
220
|
-
if (hh.checked && hh.fixed !== dd.fixed) {
|
|
221
|
-
isAllChildrenFixed = false;
|
|
222
|
-
}
|
|
223
|
-
});
|
|
224
|
-
dd.isAllChildrenFixed = isAllChildrenFixed;
|
|
225
|
-
}
|
|
226
|
-
});
|
|
157
|
+
// 模板字段排序 替换新字段
|
|
158
|
+
var newArr = updateTemplateSort(columnsClone, JsonPares);
|
|
227
159
|
|
|
228
|
-
//
|
|
229
|
-
updateTemplateFilds(
|
|
160
|
+
// 模板配置的字段替换给新字段
|
|
161
|
+
updateTemplateFilds(newArr, flaJsonPares);
|
|
230
162
|
return {
|
|
231
|
-
JsonPares:
|
|
163
|
+
JsonPares: newArr,
|
|
232
164
|
item: item
|
|
233
165
|
};
|
|
234
166
|
}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
.class-filter-component.tags-wrap{flex:1 1;z-index:2}.class-filter-component.tags-wrap .tags-list{cursor:pointer;display:inline-block;margin-
|
|
1
|
+
.class-filter-component.tags-wrap{flex:1 1;z-index:2}.class-filter-component.tags-wrap .tags-list{cursor:pointer;display:inline-block;margin-left:8px;padding:2.5px 8px}.class-filter-component.tags-wrap .tags-list.action{background-color:var(--w-e-textarea-selected-border-color);color:var(--antd-wave-shadow-color)}.class-filter-component .filter-component-tree-content .tags-list{font-size:12px;margin-left:0}.class-filter-component .filter-component-tree-content :global .ant-tree-node-content-wrapper{padding:0}.class-filter-component .filter-component-tree-content :global .ant-tree-node-content-wrapper.ant-tree-node-selected{background-color:transparent}.class-filter-component .num-txt{background:red;border-radius:8px;color:#fff;margin-left:2px;padding:0 4px}.class-filter-component .actionMenu{background-color:var(--w-e-textarea-selected-border-color);color:var(--antd-wave-shadow-color)}.dropdownWrap :global .ant-dropdown-menu-submenu-vertical{width:120px}.dropdownWrap :global .ant-dropdown-menu-item,.dropdownWrap :global .ant-dropdown-menu-submenu-title{align-items:center;display:flex;padding:0}.dropdownWrap :global .ant-dropdown-menu-item .ant-dropdown-menu-submenu-expand-icon,.dropdownWrap :global .ant-dropdown-menu-submenu-title .ant-dropdown-menu-submenu-expand-icon{padding-left:18px}.dropdownWrap .actionMenu{background-color:var(--w-e-textarea-selected-border-color);color:var(--antd-wave-shadow-color)}.dropdownWrap .num-txt{background:red;border-radius:8px;color:#fff;margin-left:2px;padding:0 4px}.filter-wrapper-body{width:260px}.filter-wrapper-body .sort{border-bottom:1px solid #eee;width:100%}.filter-wrapper-body .sort>span{cursor:pointer;display:inline-block;padding:5px 0;text-align:center;width:33%}.filter-wrapper-body .sort>span:hover{background-color:#eee}.filter-wrapper-body .filter{padding:10px 20px}.filter-wrapper-body .filter .search{margin-bottom:10px}.filter-wrapper-body .filter .search :global .ant-input-sm{padding:.2px 7px}.filter-wrapper-body .filter .filter-group{margin-bottom:10px;max-height:400px;overflow:auto;width:100%}.filter-modal-wrap .ant-modal-body{padding:12px}.chart-type-wrap{align-items:center;display:flex;margin-bottom:8px}.chart-type-wrap .chart-type-ul{display:flex}.chart-type-wrap .chart-type-li{border-radius:4px;cursor:pointer;display:flex;flex-direction:column;height:40px;justify-content:center;margin-right:4px;text-align:center;width:50px}.chart-type-wrap .chart-type-li:hover{background-color:rgba(5,14,26,.031)}.chart-type-wrap .chart-type-li.action{background-color:#e0edfd;color:#267ef0}.chart-type-wrap .chart-type-icon{display:block;font-size:16px}.dnd_quota_main{display:flex;height:100%}.dnd_quota_main .dnd_quota_left{flex:1 1;height:100%}.dnd_quota_main .dnd_quota_left::-webkit-scrollbar{background-color:#f5f5f5;width:4px}.dnd_quota_main .dnd_quota_left::-webkit-scrollbar-track{background-color:#f5f5f5;border-radius:3px;-webkit-box-shadow:inset 0 0 6px rgba(0,0,0,.2)}.dnd_quota_main .dnd_quota_left::-webkit-scrollbar-thumb{background-color:#959595;border-radius:3px;-webkit-box-shadow:inset 0 0 6px rgba(0,0,0,.2)}.dnd_quota_main .dnd_quota_block_top{border:1px solid #eee;border-radius:8px;height:50%;margin-bottom:8px;padding:8px}.dnd_quota_main .dnd_quota_block_top.classify-type{border-bottom:none;border-radius:8px 8px 0 0;margin-bottom:0;padding-bottom:0}.dnd_quota_main .dnd_quota_block_bottom{border:1px solid #eee;border-radius:8px;height:50%;margin-bottom:8px;padding:8px}.dnd_quota_main .dnd_quota_block_bottom.number-type{border-radius:0 0 8px 8px;border-top:none;margin-top:0}.dnd_quota_main .dnd_quota_left-title{display:flex;justify-content:space-between;margin-bottom:6px}.dnd_quota_main .dnd_quota-icon{cursor:pointer}.dnd_quota_main .drag-txt-empty{left:50%;position:absolute;text-align:center;top:50%;transform:translate(-50%,-50%);width:90%}.dnd_quota_main .dnd_quota__item{background-color:#f5f5f5;border-radius:4px;cursor:grab;display:flex;margin-bottom:4px;padding:8px}.dnd_quota_main .dnd_quota__item .item-icon{line-height:1;margin-right:4px;padding-top:1px}.dnd_quota_main .dnd_quota__item .dnd_quota__item_label{flex:1 1;overflow:hidden;text-overflow:ellipsis;white-space:nowrap}.dnd_quota_main .dnd_quota__item .dnd_quota__item_txt{cursor:pointer}.dnd_quota_main .dnd-quota-sortable-wrap{height:calc(100% - 20px);overflow:auto;position:relative}.dnd_quota_main .dnd-quota-sortable-wrap::-webkit-scrollbar{background-color:#f5f5f5;width:4px}.dnd_quota_main .dnd-quota-sortable-wrap::-webkit-scrollbar-track{background-color:#f5f5f5;border-radius:3px;-webkit-box-shadow:inset 0 0 6px rgba(0,0,0,.2)}.dnd_quota_main .dnd-quota-sortable-wrap::-webkit-scrollbar-thumb{background-color:#959595;border-radius:3px;-webkit-box-shadow:inset 0 0 6px rgba(0,0,0,.2)}.dnd_quota_main .dnd-quota-sortable-wrap.init .dnd_quota__item:hover{background-color:#0273b0;color:#fff}.dnd_quota_main .dnd-quota-sortable-wrap.init .dnd_quota__item:hover .item-icon{color:#fff}.dnd_quota_main .dnd-quota-sortable-wrap.init .dnd_quota__item .item-icon{color:#0273b0}.dnd_quota_main .dnd-quota-sortable-wrap.number .dnd_quota__item:hover{background-color:#97c95d;color:#fff}.dnd_quota_main .dnd-quota-sortable-wrap.number .dnd_quota__item:hover .item-icon{color:#fff}.dnd_quota_main .dnd-quota-sortable-wrap.number .dnd_quota__item .item-icon{color:#97c95d}.dnd_quota_main .dnd-quota-sortable-wrap.dimension .dnd_quota__item,.dnd_quota_main .dnd-quota-sortable-wrap.list .dnd_quota__item{background-color:#0273b0;color:#fff}.dnd_quota_main .dnd-quota-sortable-wrap.quota .dnd_quota__item{background-color:#97c95d;color:#fff}.dnd_quota_main .dnd-quota-spce{margin:0 4px}.dnd_quota_main .dnd_quota_right{flex:1 1}.dnd_quota_main .dnd_quota_right .dnd_quota_block_bottom,.dnd_quota_main .dnd_quota_right .dnd_quota_block_top{height:auto}.dnd_quota_main .dnd_quota_right .dnd_quota_right_payground{max-height:340px;min-height:140px}.dnd_quota_main .dnd_quota_right_payground{height:100%}.dnd_quota_main .dnd_quota_right_payground.empty{background:rgba(0,0,0,.08);position:relative}.dnd_quota_main .dnd_quota_right_payground.empty:after{left:50%;position:absolute;top:50%;transform:translate(-50%,-50%);white-space:nowrap}.modal-wrap{z-index:1040!important}.subtotals-modal-wrap{display:flex;height:100%}.subtotals-modal-wrap .subtotals-modal-left{height:100%;width:420px}.subtotals-modal-wrap .subtotals-modal-right{flex:1 1;height:100%;margin-left:16px;width:0}.subtotals-modal-wrap .subtotals-modal-table-top{align-items:center;display:flex;margin-bottom:16px;margin-top:4px;min-width:400px}.subtotals-modal-wrap .subtotals-modal-table-top .subtotals-modal-radio-wrap{flex:1 1;margin-right:-100px;text-align:center;width:0}.add-subtotals-wrap{height:100%}.add-subtotals-bot{height:calc(100% - 50px)}.popover-sum-content .ant-popover-inner-content{padding:0}.popover-sum-content .popover-sum-wrap .popover-sum-list:last-child{border-top:1px solid #e4e4e4}.popover-sum-content .popover-sum-wrap .popover-sum-title{font-weight:700;padding:8px 12px}.popover-sum-content .popover-sum-wrap .popover-sum-li{cursor:pointer;margin:0;padding:8px 12px}.popover-sum-content .popover-sum-wrap .popover-sum-li:hover{background-color:#f5f5f5}.popover-sum-content .popover-sum-wrap .popover-sum-li.action{background-color:#0273b0;color:#fff}.popover-body{min-height:340px;width:260px}.popover-body .top-wrap{align-items:center;display:flex;justify-content:space-between}.popover-body .title{font-size:12px;font-weight:700}.popover-body .add-icon{cursor:pointer;font-weight:700}.popover-body .list-title{font-size:12px;margin:10px 0}.popover-body .list-title-icon{margin-right:6px}.popover-body .list-radio{align-items:center;display:flex;margin-bottom:10px;width:100%}.popover-body .list-radio-label{flex:1 1;font-weight:700}.popover-body .set-text-default{color:var(--antd-wave-shadow-color);font-size:10px}.popover-body .set-icon{cursor:pointer;font-size:12px;text-align:right;width:20px}.mode-name-wrap{padding:10px 0}.icon-button-wrapper{cursor:pointer;margin-left:10px}.columns-fixed-title{color:rgba(0,0,0,.45);font-size:12px;margin-bottom:6px;margin-top:6px;padding-left:24px}.tree_selectall{-ms-user-select:none;user-select:none}.tree_selectall>span:first-child{margin:4px 0 10px 24px!important}.tree_selectall>span:nth-child(2){padding-left:12px}.columns-tree-main{align-items:center;display:flex}.columns-tree-main .drag-title{margin:0 8px;overflow:hidden;text-overflow:ellipsis;white-space:nowrap;width:200px}.columns-tree-main .columns-tree-icon{color:var(--antd-wave-shadow-color);font-size:14px;text-align:right;visibility:hidden}.columns-tree-main:hover .columns-tree-icon{visibility:visible}
|