linkmore-design 1.0.57 → 1.0.60

package/lib/LmFilter/utils.js

@@ -5,14 +5,12 @@ var _interopRequireDefault = require("@babel/runtime/helpers/interopRequireDefau
 Object.defineProperty(exports, "__esModule", {
   value: true
 });
-exports.getFlat = getFlat;
+exports.getFlatItem = getFlatItem;
 exports.getIsHas = getIsHas;
 exports.getRanges = getRanges;
 exports.getValueForType = getValueForType;
 exports.uniqueFunc = uniqueFunc;
 
-var _toConsumableArray2 = _interopRequireDefault(require("@babel/runtime/helpers/toConsumableArray"));
-
 var _typeof2 = _interopRequireDefault(require("@babel/runtime/helpers/typeof"));
 
 var _dayjs = _interopRequireDefault(require("dayjs"));
@@ -44,7 +42,9 @@ function getValueForType(type) {
 function uniqueFunc(arr, guid) {
   var res = new Map();
   return arr.filter(function (item) {
-    return !res.has(item[guid]) && res.set(item[guid], 1);
+    var isHas = (item === null || item === void 0 ? void 0 : item[guid]) || typeof (item === null || item === void 0 ? void 0 : item[guid]) === 'number';
+    var resetItem = isHas ? item === null || item === void 0 ? void 0 : item[guid] : item;
+    return !res.has(resetItem) && res.set(resetItem, 1);
   });
 } // 获取最近的时间段
 
@@ -55,17 +55,66 @@ function getRanges() {
     '近一月': [(0, _dayjs.default)().subtract(1, 'month').format('YYYY-MM-DD'), (0, _dayjs.default)().format('YYYY-MM-DD')],
     '近一年': [(0, _dayjs.default)().subtract(1, 'year').format('YYYY-MM-DD'), (0, _dayjs.default)().format('YYYY-MM-DD')]
   };
-}
-
-function getFlat(arr) {
-  var nValue = [];
-  arr.forEach(function (item) {
-    if (item.length > 1) {
-      var suf = item.splice(1);
-      getFlat(suf);
+} // 级联选择器获取深层结构数据 type: 遍历子/父结构
+
+
+function getFlatItem(filterValues, originArr) {
+  var type = arguments.length > 2 && arguments[2] !== undefined ? arguments[2] : 'children';
+  var nArr = []; // 获取子级项
+
+  var getChildren = function getChildren(item) {
+    var _item$children;
+
+    if (type === 'parent') {
+      nArr.push(item);
+      return;
+    }
+
+    if (item === null || item === void 0 ? void 0 : (_item$children = item.children) === null || _item$children === void 0 ? void 0 : _item$children.length) {
+      item === null || item === void 0 ? void 0 : item.children.forEach(function (v) {
+        return getChildren(v);
+      });
     } else {
-      nValue.push.apply(nValue, (0, _toConsumableArray2.default)(item[0].children));
+      nArr.push(item);
+    }
+  }; // 检测到三级结构
+
+
+  filterValues.forEach(function (item) {
+    if (item.length === 1) {
+      var findItem = originArr.find(function (v) {
+        return v.value === item[item.length - 1];
+      });
+      getChildren(findItem);
+    }
+
+    if (item.length === 2) {
+      var findArr1 = originArr.find(function (v) {
+        return v.value === item[0];
+      }).children;
+
+      var _findItem = findArr1.find(function (v) {
+        return v.value === item[item.length - 1];
+      });
+
+      getChildren(_findItem);
+    }
+
+    if (item.length === 3) {
+      var _findArr = originArr.find(function (v) {
+        return v.value === item[0];
+      }).children;
+
+      var findArr2 = _findArr.find(function (v) {
+        return v.value === item[1];
+      }).children;
+
+      var _findItem2 = findArr2.find(function (v) {
+        return v.value === item[item.length - 1];
+      });
+
+      nArr.push(_findItem2);
     }
   });
-  return nValue;
+  return nArr;
 }

package/lib/LmFilter/wrapper/Filter.js

@@ -18,13 +18,16 @@ var _complexFilter = _interopRequireDefault(require("../complexFilter"));
 // 筛选组合
 var LmFilter = /*#__PURE__*/_react.default.memo(function (_ref) {
   var instance = _ref.instance;
+  var enableBaisc = instance.enableBaisc,
+      enableComplex = instance.enableComplex,
+      enableCustom = instance.enableCustom;
   return /*#__PURE__*/_react.default.createElement("div", {
     className: "lm_filter"
-  }, /*#__PURE__*/_react.default.createElement(_customFilter.default, {
+  }, enableCustom && /*#__PURE__*/_react.default.createElement(_customFilter.default, {
     instance: instance
-  }), /*#__PURE__*/_react.default.createElement(_baseFilter.default, {
+  }), enableBaisc && /*#__PURE__*/_react.default.createElement(_baseFilter.default, {
     instance: instance
-  }), /*#__PURE__*/_react.default.createElement(_complexFilter.default, {
+  }), enableComplex && /*#__PURE__*/_react.default.createElement(_complexFilter.default, {
     instance: instance
   }));
 });

package/lib/LmFilter/wrapper/FilterRoot.js

@@ -21,6 +21,8 @@ var _FilterWrapper = _interopRequireDefault(require("./FilterWrapper"));
 
 var _filterFns = _interopRequireDefault(require("../filterFns"));
 
+var _utils = require("../utils");
+
 // 根文件 => 参数聚合
 var reducer = function reducer(state, action) {
   var basicFilter = action.basicFilter,
@@ -66,38 +68,43 @@ var reducer = function reducer(state, action) {
     case 'reset':
       // 一键清空
       return (0, _objectSpread2.default)((0, _objectSpread2.default)({}, state), {}, {
-        basicFilter: {}
+        basicFilter: {},
+        complexFilter: {}
       });
 
     default:
       throw new Error();
   }
-}; // const getRows = ({ fieldName, value }, arr) => {
-//   const findItem = arr.find(item => {
-//     return item.field === fieldName;
-//   })
-//   switch (findItem.type) {
-//     case 'input':
-//       return value;
-//     case 'select':
-//       return findItem.data.find(v => v.value === value);
-//     case 'checkbox':
-//       return findItem.data.find(v => [value].includes(v.value));
-//     default:
-//       break;
-//   }
-// };
-// 仅在初始化时触发一次
+}; // 仅在初始化时触发一次
 
 
 var getInitialState = function getInitialState(_ref) {
-  var localization = _ref.localization;
+  var localization = _ref.localization,
+      dataSource = _ref.dataSource;
   var globalQuery = localization.globalQuery,
       filterQuery = localization.filterQuery;
-  var basicFilter = {};
-  filterQuery.filter.forEach(function (item) {
-    basicFilter[item.fieldName] = item.value;
-  });
+  var basicFilter = {}; // 初始化基础查询缓存
+
+  if (filterQuery === null || filterQuery === void 0 ? void 0 : filterQuery.filter) {
+    basicFilter = filterQuery === null || filterQuery === void 0 ? void 0 : filterQuery.filter.reduce(function (pre, cur) {
+      // 查找改数据是否展示
+      var someData = dataSource.some(function (v) {
+        if (cur.fieldName === v.field) {
+          var isHidden = !v.show && typeof v.show === 'boolean';
+          return !isHidden;
+        }
+
+        return false;
+      });
+
+      if ((0, _utils.getIsHas)(cur.value) && someData) {
+        pre[cur.fieldName] = cur.value;
+      }
+
+      return pre;
+    }, {});
+  }
+
   return {
     basicFilter: basicFilter,
     complexFilter: {},

package/lib/LmTable/Table.js

@@ -23,14 +23,14 @@ var _slicedToArray2 = _interopRequireDefault(require("@babel/runtime/helpers/sli
 
 var _objectWithoutProperties2 = _interopRequireDefault(require("@babel/runtime/helpers/objectWithoutProperties"));
 
-var _icons = require("@ant-design/icons");
-
 var _proTable = _interopRequireDefault(require("@ant-design/pro-table"));
 
 var _sortable = require("@dnd-kit/sortable");
 
 var _classnames = _interopRequireDefault(require("classnames"));
 
+var _linkmoreDesign = require("linkmore-design");
+
 var _lodash = require("lodash");
 
 var _react = _interopRequireWildcard(require("react"));
@@ -39,13 +39,11 @@ var _reactResizable = require("react-resizable");
 
 var _reactSortableHoc = require("react-sortable-hoc");
 
-var _linkmoreDesign = require("linkmore-design");
-
 var _empty = _interopRequireDefault(require("./assets/empty.png"));
 
 var _resetConfig = _interopRequireDefault(require("./resetConfig"));
 
-var _excluded = ["dataSource", "autoSize", "columns", "rowClick", "onDoubleClick", "checkConfig", "summary", "pagination", "hiddenPage", "loading", "virtual", "sortOpen", "resizeable", "customCheck", "components", "rowSelection", "columnsState", "onChange", "filterChange", "tableRowType", "size"],
+var _excluded = ["dataSource", "autoSize", "columns", "rowClick", "onDoubleClick", "checkConfig", "summary", "pagination", "hiddenPage", "loading", "virtual", "sortOpen", "resizeable", "customCheck", "components", "rowSelection", "columnsState", "onChange", "filterChange", "tableRowType", "size", "emptyProps"],
     _excluded2 = ["className", "style"],
     _excluded3 = ["onResize", "width", "onResizeStop"];
 var Summary = _proTable.default.Summary; // const DragHandle = SortableHandle(() => <MenuOutlined style={{ cursor: 'grab', color: '#999' }} />);
@@ -97,7 +95,9 @@ var ResetTable = /*#__PURE__*/(0, _react.forwardRef)(function (props, ref) {
       tableRowType = _props$tableRowType === void 0 ? 'default' : _props$tableRowType,
       _props$size = props.size,
       size = _props$size === void 0 ? 'default' : _props$size,
+      emptyProps = props.emptyProps,
       resetProps = (0, _objectWithoutProperties2.default)(props, _excluded);
+  console.log(emptyProps, '--emptyProps');
   var _resetProps$rowKey = resetProps.rowKey,
       rowKey = _resetProps$rowKey === void 0 ? 'id' : _resetProps$rowKey;
 
@@ -513,7 +513,9 @@ var ResetTable = /*#__PURE__*/(0, _react.forwardRef)(function (props, ref) {
       width: '100%'
     }
   }, /*#__PURE__*/_react.default.createElement(_configProvider.default, {
-    renderEmpty: customizeRenderEmpty
+    renderEmpty: emptyProps ? function () {
+      return /*#__PURE__*/_react.default.createElement(_linkmoreDesign.Empty, emptyProps, (emptyProps === null || emptyProps === void 0 ? void 0 : emptyProps.footer) || null);
+    } : customizeRenderEmpty
   }, /*#__PURE__*/_react.default.createElement(_proTable.default, (0, _extends2.default)({}, config, {
     loading: loading,
     dataSource: dataSource,

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "linkmore-design",
-  "version": "1.0.57",
+  "version": "1.0.60",
   "author": {
     "name": "nowthen",
     "email": "rnlvwyx@gmail.com"