ns-base-module 2.0.12 → 2.0.14
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/FilterPopover/Filter.js +10 -2
- package/dist/FilterPopover/index.js +0 -1
- package/dist/SubtotalsModal/subtotalTemplate.js +1 -6
- package/dist/umd/ns-base-module.min.css +1 -1
- package/dist/umd/ns-base-module.min.js +1 -1
- package/package.json +1 -1
- package/style/components/ClassFilter.scss +6 -6
|
@@ -75,6 +75,8 @@ var Filter = function Filter(props) {
|
|
|
75
75
|
var searchValue = useRef("");
|
|
76
76
|
var searchEmnuValue = useRef([]); // 枚举搜索
|
|
77
77
|
var srolRef = useRef(null);
|
|
78
|
+
var orderTypeRef = useRef("");
|
|
79
|
+
var orderKeyRef = useRef("");
|
|
78
80
|
var page = useRef({
|
|
79
81
|
pageNum: 1,
|
|
80
82
|
pageSize: 40,
|
|
@@ -140,8 +142,8 @@ var Filter = function Filter(props) {
|
|
|
140
142
|
pageSize: page.current.pageSize,
|
|
141
143
|
distinctField: [dataIndex],
|
|
142
144
|
variablePara: variablePara,
|
|
143
|
-
orderKey: orderKey,
|
|
144
|
-
orderType: orderType
|
|
145
|
+
orderKey: orderKeyRef.current || orderKey,
|
|
146
|
+
orderType: orderTypeRef.current || orderType
|
|
145
147
|
};
|
|
146
148
|
res = {};
|
|
147
149
|
datas = [];
|
|
@@ -401,10 +403,16 @@ var Filter = function Filter(props) {
|
|
|
401
403
|
};
|
|
402
404
|
var handleSort = function handleSort(key) {
|
|
403
405
|
if (checkSort === "asc" && key === "asc" || checkSort === "desc" && key === "desc") {
|
|
406
|
+
orderTypeRef.current = "";
|
|
407
|
+
orderKeyRef.current = "";
|
|
404
408
|
onSort === null || onSort === void 0 || onSort("");
|
|
409
|
+
getDates();
|
|
405
410
|
return;
|
|
406
411
|
}
|
|
407
412
|
onSort === null || onSort === void 0 || onSort(key);
|
|
413
|
+
orderKeyRef.current = dataIndex;
|
|
414
|
+
orderTypeRef.current = key;
|
|
415
|
+
getDates();
|
|
408
416
|
};
|
|
409
417
|
var selectSearch = function selectSearch(e) {
|
|
410
418
|
setSelectValue(e);
|
|
@@ -87,7 +87,6 @@ var Index = function Index(_ref2) {
|
|
|
87
87
|
|
|
88
88
|
// 活动的icon显示
|
|
89
89
|
var visibilityStyle = useMemo(function () {
|
|
90
|
-
console.log("filterValuefilterValue:", filterValue);
|
|
91
90
|
var _value = get(props === null || props === void 0 ? void 0 : props.filterSearch, "".concat(dataIndex, ".value"), "");
|
|
92
91
|
if (!dataIndex) return null;
|
|
93
92
|
if (!_value) {
|
|
@@ -291,17 +291,12 @@ var Index = function Index(props) {
|
|
|
291
291
|
}),
|
|
292
292
|
onConfirm: confirm,
|
|
293
293
|
onCancel: cancel
|
|
294
|
-
}, /*#__PURE__*/React.createElement(Tooltip, {
|
|
295
|
-
placement: "top",
|
|
296
|
-
title: initLang({
|
|
297
|
-
id: "prompt.delTemplate"
|
|
298
|
-
})
|
|
299
294
|
}, /*#__PURE__*/React.createElement(DeleteOutlined, {
|
|
300
295
|
className: "set-icon",
|
|
301
296
|
onClick: function onClick() {
|
|
302
297
|
return handleDel(item);
|
|
303
298
|
}
|
|
304
|
-
}))
|
|
299
|
+
}));
|
|
305
300
|
var copyDom = /*#__PURE__*/React.createElement(Tooltip, {
|
|
306
301
|
placement: "top",
|
|
307
302
|
title: initLang({
|
|
@@ -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-right:8px;padding:2.5px 8px}.class-filter-component.tags-wrap .tags-list.action{background-color:var(--
|
|
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-right:8px;padding:2.5px 8px}.class-filter-component.tags-wrap .tags-list.action{background-color:var(--primary-color);color:var(--primary-text-color)}.class-filter-component .filter-component-tree-content .tags-list{font-size:12px;margin-right: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(--primary-color);color:var(--primary-text-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(--primary-color);color:var(--primary-text-color)}.dropdownWrap .num-txt{background:red;border-radius:8px;color:#fff;margin-left:2px;padding:0 4px}.filter-wrapper-body{font-size:12px;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:270px}.popover-body.config-body{width:320px}.popover-body.config-body .top-wrap{margin-bottom:6px}.popover-body .top-wrap{align-items:center;display:flex;justify-content:space-between;margin-bottom:18px}.popover-body .title{font-size:14px}.popover-body .add-icon{cursor:pointer;font-weight:700}.popover-body .list-title{font-size:12px;margin-bottom:14px}.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-icon{cursor:pointer;font-size:12px;text-align:right;width:20px}.mode-name-wrap{padding:12px 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}.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}.set-text-default{font-size: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:50px}.columns-tree-main .columns-tree-icon{color:#000;font-size:14px;text-align:right;visibility:hidden}.columns-tree-main:hover .columns-tree-icon{visibility:visible}
|