ns-base-module 1.0.19 → 1.0.20
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/TableHeaderConfigPopover/index.d.ts +1 -0
- package/dist/TableHeaderConfigPopover/index.d.ts.map +1 -1
- package/dist/TableHeaderConfigPopover/index.js +65 -3
- package/dist/TableHeaderConfigPopover/updateColumns.d.ts.map +1 -1
- package/dist/TableHeaderConfigPopover/updateColumns.js +16 -3
- package/dist/umd/ns-base-module.min.js +1 -1
- package/package.json +1 -1
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["index.tsx"],"names":[],"mappings":"AA8BA,OAAO,KAA6C,MAAM,OAAO,CAAC;AAKlE,OAAO,sDAAsD,CAAC;AAK9D,UAAU,QAAQ;IAChB,OAAO,EAAE,GAAG,CAAC;IACb,gBAAgB,EAAE,MAAM,GAAG,SAAS,CAAC;IACrC,QAAQ,EAAE,MAAM,CAAC;IACjB,QAAQ,CAAC,EAAE,MAAM,CAAC,MAAM,EAAE,GAAG,CAAC,GAAG,IAAI,CAAC;IACtC,aAAa,EAAE,CAAC,WAAW,EAAE,MAAM,CAAC,MAAM,EAAE,GAAG,CAAC,EAAE,KAAK,IAAI,CAAC;IAC5D,UAAU,CAAC,EAAE,MAAM,IAAI,CAAC;IACxB,kBAAkB,CAAC,EAAE,MAAM,IAAI,CAAC;IAChC,UAAU,CAAC,EAAE,GAAG,CAAC;IACjB,OAAO,EAAE,GAAG,CAAC;IACb,UAAU,EAAE,GAAG,CAAC;IAChB,UAAU,CAAC,EAAE,OAAO,CAAC;
|
|
1
|
+
{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["index.tsx"],"names":[],"mappings":"AA8BA,OAAO,KAA6C,MAAM,OAAO,CAAC;AAKlE,OAAO,sDAAsD,CAAC;AAK9D,UAAU,QAAQ;IAChB,OAAO,EAAE,GAAG,CAAC;IACb,gBAAgB,EAAE,MAAM,GAAG,SAAS,CAAC;IACrC,QAAQ,EAAE,MAAM,CAAC;IACjB,QAAQ,CAAC,EAAE,MAAM,CAAC,MAAM,EAAE,GAAG,CAAC,GAAG,IAAI,CAAC;IACtC,aAAa,EAAE,CAAC,WAAW,EAAE,MAAM,CAAC,MAAM,EAAE,GAAG,CAAC,EAAE,KAAK,IAAI,CAAC;IAC5D,UAAU,CAAC,EAAE,MAAM,IAAI,CAAC;IACxB,kBAAkB,CAAC,EAAE,MAAM,IAAI,CAAC;IAChC,UAAU,CAAC,EAAE,GAAG,CAAC;IACjB,OAAO,EAAE,GAAG,CAAC;IACb,UAAU,EAAE,GAAG,CAAC;IAChB,UAAU,CAAC,EAAE,OAAO,CAAC;IACrB,IAAI,EAAE,OAAO,CAAC;CACf;AACD,UAAU,MAAO,SAAQ,QAAQ;IAC/B,QAAQ,EAAE,MAAM,CAAC;CAClB;AAi/BD,QAAA,MAAM,KAAK,EAAE,KAAK,CAAC,EAAE,CAAC,MAAM,CAmD3B,CAAC;AAEF,eAAe,KAAK,CAAC"}
|
|
@@ -45,7 +45,8 @@ import { initColumns, sortColums } from "./utils";
|
|
|
45
45
|
var ColumnsToolbarRender = /*#__PURE__*/memo(function (props) {
|
|
46
46
|
var columns = props.columns,
|
|
47
47
|
updateColumns = props.updateColumns,
|
|
48
|
-
newColumns = props.newColumns
|
|
48
|
+
newColumns = props.newColumns,
|
|
49
|
+
init = props.init;
|
|
49
50
|
var _useState = useState([]),
|
|
50
51
|
_useState2 = _slicedToArray(_useState, 2),
|
|
51
52
|
columnsTree = _useState2[0],
|
|
@@ -771,6 +772,10 @@ var ColumnsToolbar = function ColumnsToolbar(_ref4) {
|
|
|
771
772
|
_template.push(item);
|
|
772
773
|
}
|
|
773
774
|
if (item.is_default === "Y") {
|
|
775
|
+
// if (props.init) {
|
|
776
|
+
// props.updateColumns(JSON.parse(item.define));
|
|
777
|
+
// }
|
|
778
|
+
|
|
774
779
|
setValue(item.value);
|
|
775
780
|
setCurItem(item);
|
|
776
781
|
}
|
|
@@ -1133,7 +1138,64 @@ var ColumnsToolbar = function ColumnsToolbar(_ref4) {
|
|
|
1133
1138
|
};
|
|
1134
1139
|
var Index = function Index(_ref9) {
|
|
1135
1140
|
var props = Object.assign({}, (_objectDestructuringEmpty(_ref9), _ref9));
|
|
1136
|
-
|
|
1141
|
+
useEffect(function () {
|
|
1142
|
+
if (props.init) {
|
|
1143
|
+
getColumnsFilter();
|
|
1144
|
+
}
|
|
1145
|
+
}, []);
|
|
1146
|
+
var getColumnsFilter = /*#__PURE__*/function () {
|
|
1147
|
+
var _ref10 = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee7() {
|
|
1148
|
+
var _res3;
|
|
1149
|
+
var res, _res4, _templateUser, _template;
|
|
1150
|
+
return _regeneratorRuntime().wrap(function _callee7$(_context7) {
|
|
1151
|
+
while (1) switch (_context7.prev = _context7.next) {
|
|
1152
|
+
case 0:
|
|
1153
|
+
res = {}; // debugger;
|
|
1154
|
+
if (!(props !== null && props !== void 0 && props.request)) {
|
|
1155
|
+
_context7.next = 8;
|
|
1156
|
+
break;
|
|
1157
|
+
}
|
|
1158
|
+
_context7.next = 4;
|
|
1159
|
+
return props === null || props === void 0 ? void 0 : props.request();
|
|
1160
|
+
case 4:
|
|
1161
|
+
res = _context7.sent;
|
|
1162
|
+
res = {
|
|
1163
|
+
data: {
|
|
1164
|
+
data: res
|
|
1165
|
+
}
|
|
1166
|
+
};
|
|
1167
|
+
_context7.next = 11;
|
|
1168
|
+
break;
|
|
1169
|
+
case 8:
|
|
1170
|
+
_context7.next = 10;
|
|
1171
|
+
return queryColumnsConfig({
|
|
1172
|
+
menuCode: props.menuCode,
|
|
1173
|
+
formTemplateCode: props.formTemplateCode,
|
|
1174
|
+
queryType: props.crossQuery ? "cross" : "list"
|
|
1175
|
+
});
|
|
1176
|
+
case 10:
|
|
1177
|
+
res = _context7.sent;
|
|
1178
|
+
case 11:
|
|
1179
|
+
if ((_res3 = res) !== null && _res3 !== void 0 && (_res3 = _res3.data) !== null && _res3 !== void 0 && _res3.data) {
|
|
1180
|
+
_templateUser = [];
|
|
1181
|
+
_template = [];
|
|
1182
|
+
(_res4 = res) === null || _res4 === void 0 || (_res4 = _res4.data) === null || _res4 === void 0 || _res4.data.forEach(function (item) {
|
|
1183
|
+
if (item.is_default === "Y") {
|
|
1184
|
+
props.updateColumns(JSON.parse(item.define));
|
|
1185
|
+
}
|
|
1186
|
+
});
|
|
1187
|
+
}
|
|
1188
|
+
case 12:
|
|
1189
|
+
case "end":
|
|
1190
|
+
return _context7.stop();
|
|
1191
|
+
}
|
|
1192
|
+
}, _callee7);
|
|
1193
|
+
}));
|
|
1194
|
+
return function getColumnsFilter() {
|
|
1195
|
+
return _ref10.apply(this, arguments);
|
|
1196
|
+
};
|
|
1197
|
+
}();
|
|
1198
|
+
return /*#__PURE__*/React.createElement("span", null, /*#__PURE__*/React.createElement(Popover, {
|
|
1137
1199
|
placement: "bottomLeft",
|
|
1138
1200
|
trigger: "click",
|
|
1139
1201
|
title: "",
|
|
@@ -1145,6 +1207,6 @@ var Index = function Index(_ref9) {
|
|
|
1145
1207
|
})
|
|
1146
1208
|
}, /*#__PURE__*/React.createElement(SettingOutlined, {
|
|
1147
1209
|
className: "icon-button-wrapper"
|
|
1148
|
-
})));
|
|
1210
|
+
}))));
|
|
1149
1211
|
};
|
|
1150
1212
|
export default Index;
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"updateColumns.d.ts","sourceRoot":"","sources":["updateColumns.tsx"],"names":[],"mappings":"
|
|
1
|
+
{"version":3,"file":"updateColumns.d.ts","sourceRoot":"","sources":["updateColumns.tsx"],"names":[],"mappings":"AAMA,OAAO,KAAK,MAAM,OAAO,CAAC;AAI1B,aAAK,aAAa,GAAG;IACnB,QAAQ,EAAE,MAAM,CAAC;IACjB,gBAAgB,EAAE,MAAM,CAAC;IACzB,OAAO,EAAE,GAAG,CAAC;IACb,aAAa,EAAE,CAAC,IAAI,EAAE,MAAM,CAAC,MAAM,EAAE,GAAG,CAAC,EAAE,KAAK,IAAI,CAAC;CACtD,CAAC;AAEF,QAAA,MAAM,KAAK,UAAW,aAAa,sBAwBlC,CAAC;AAEF,eAAe,KAAK,CAAC"}
|
|
@@ -1,3 +1,13 @@
|
|
|
1
|
+
var _excluded = ["menuCode", "formTemplateCode", "columns", "updateColumns"];
|
|
2
|
+
function _extends() { _extends = Object.assign ? Object.assign.bind() : function (target) { for (var i = 1; i < arguments.length; i++) { var source = arguments[i]; for (var key in source) { if (Object.prototype.hasOwnProperty.call(source, key)) { target[key] = source[key]; } } } return target; }; return _extends.apply(this, arguments); }
|
|
3
|
+
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; }
|
|
4
|
+
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; }
|
|
5
|
+
/*
|
|
6
|
+
* @description:
|
|
7
|
+
* @author chenchangfu
|
|
8
|
+
* Copyright (c) 2019, AUTHOR. All rights reserved.
|
|
9
|
+
* AUTHOR PROPRIETARY/CONFIDENTIAL. Use is subject to license terms.
|
|
10
|
+
*/
|
|
1
11
|
import React from "react";
|
|
2
12
|
import TableHeaderConfigPopover from "../TableHeaderConfigPopover";
|
|
3
13
|
import { adapterColumns } from "./utils";
|
|
@@ -5,7 +15,8 @@ var Index = function Index(props) {
|
|
|
5
15
|
var menuCode = props.menuCode,
|
|
6
16
|
formTemplateCode = props.formTemplateCode,
|
|
7
17
|
columns = props.columns,
|
|
8
|
-
updateColumns = props.updateColumns
|
|
18
|
+
updateColumns = props.updateColumns,
|
|
19
|
+
otherParam = _objectWithoutProperties(props, _excluded);
|
|
9
20
|
|
|
10
21
|
// 新columns 和旧的模板对比 返回处理后数据
|
|
11
22
|
var changeColumns = function changeColumns(tree) {
|
|
@@ -16,11 +27,13 @@ var Index = function Index(props) {
|
|
|
16
27
|
JsonPares = _adapterColumns.JsonPares;
|
|
17
28
|
updateColumns(JsonPares);
|
|
18
29
|
};
|
|
19
|
-
return /*#__PURE__*/React.createElement(TableHeaderConfigPopover, {
|
|
30
|
+
return /*#__PURE__*/React.createElement(TableHeaderConfigPopover, _extends({
|
|
31
|
+
request: otherParam.request,
|
|
32
|
+
saveColumn: otherParam.saveColumn,
|
|
20
33
|
menuCode: menuCode,
|
|
21
34
|
formTemplateCode: formTemplateCode,
|
|
22
35
|
columns: columns,
|
|
23
36
|
updateColumns: changeColumns
|
|
24
|
-
});
|
|
37
|
+
}, otherParam));
|
|
25
38
|
};
|
|
26
39
|
export default Index;
|