linkmore-design 1.0.60 → 1.0.62

package/lib/LmFilter/wrapper/FilterRoot.js

@@ -9,8 +9,6 @@ Object.defineProperty(exports, "__esModule", {
 });
 exports.default = void 0;
 
-var _extends2 = _interopRequireDefault(require("@babel/runtime/helpers/extends"));
-
 var _slicedToArray2 = _interopRequireDefault(require("@babel/runtime/helpers/slicedToArray"));
 
 var _objectSpread2 = _interopRequireDefault(require("@babel/runtime/helpers/objectSpread2"));
@@ -26,6 +24,7 @@ var _utils = require("../utils");
 // 根文件 => 参数聚合
 var reducer = function reducer(state, action) {
   var basicFilter = action.basicFilter,
+      basicQuery = action.basicQuery,
       resize = action.resize,
       rows = action.rows,
       complexDrawer = action.complexDrawer,
@@ -39,6 +38,12 @@ var reducer = function reducer(state, action) {
         basicFilter: basicFilter
       });
 
+    case 'changeBasicQuery':
+      // 基础筛选数据改变
+      return (0, _objectSpread2.default)((0, _objectSpread2.default)({}, state), {}, {
+        basicQuery: basicQuery
+      });
+
     case 'changeRows':
       return (0, _objectSpread2.default)((0, _objectSpread2.default)({}, state), {}, {
         rows: rows
@@ -69,6 +74,7 @@ var reducer = function reducer(state, action) {
       // 一键清空
       return (0, _objectSpread2.default)((0, _objectSpread2.default)({}, state), {}, {
         basicFilter: {},
+        basicQuery: {},
         complexFilter: {}
       });
 
@@ -79,34 +85,46 @@ var reducer = function reducer(state, action) {
 
 
 var getInitialState = function getInitialState(_ref) {
+  var _Object$keys;
+
   var localization = _ref.localization,
-      dataSource = _ref.dataSource;
+      dataSource = _ref.dataSource,
+      searchKey = _ref.searchKey;
   var globalQuery = localization.globalQuery,
-      filterQuery = localization.filterQuery;
-  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;
+      basicFilter = localization.basicFilter;
+  var basicQuery = (_Object$keys = Object.keys(basicFilter)) === null || _Object$keys === void 0 ? void 0 : _Object$keys.reduce(function (pre, cur) {
+    var item = dataSource.find(function (v) {
+      if (cur === v.field) {
+        return v.show || typeof v.show !== 'boolean';
       }
 
-      return pre;
-    }, {});
-  }
+      return false;
+    });
+
+    if (cur === searchKey) {
+      item = {
+        field: searchKey,
+        operator: 'contains',
+        fieldType: 'string'
+      };
+    }
 
+    if ((0, _utils.getIsHas)(basicFilter[cur]) && !!item) {
+      var _item, _item2;
+
+      pre[cur] = {
+        fieldName: cur,
+        fieldType: ((_item = item) === null || _item === void 0 ? void 0 : _item.valueType) || 'string',
+        value: Array.isArray(basicFilter[cur]) ? basicFilter[cur] : [basicFilter[cur]],
+        operator: ((_item2 = item) === null || _item2 === void 0 ? void 0 : _item2.operator) || 'equal'
+      };
+    }
+
+    return pre;
+  }, {});
   return {
     basicFilter: basicFilter,
+    basicQuery: basicQuery,
     complexFilter: {},
     complexDrawer: {
       visible: false,
@@ -127,29 +145,8 @@ var LmFilterRoot = function LmFilterRoot(props, ref) {
   var _useReducer = (0, _react.useReducer)(reducer, initialState),
       _useReducer2 = (0, _slicedToArray2.default)(_useReducer, 2),
       state = _useReducer2[0],
-      dispatch = _useReducer2[1]; // 初始化配置
-
-
-  var configProps = (0, _react.useMemo)(function () {
-    var resetProps = (0, _extends2.default)({}, props);
-    return (0, _objectSpread2.default)({
-      dataSource: [],
-      // 数据源
-      enableSearch: true,
-      // 是否启用模糊查询
-      enableBaisc: true,
-      // 是否启用基础筛选
-      enableComplex: false,
-      // 是否启用高级筛选
-      enableCustom: false,
-      // 是否启用自定义筛选
-      size: 'middle',
-      // 尺寸
-      searchKey: 'search',
-      // 搜索的key值
-      placeholder: '请输入'
-    }, resetProps);
-  }, [props]); // 事件集合
+      dispatch = _useReducer2[1]; // 事件集合
+
 
   var eventProps = (0, _react.useMemo)(function () {
     return (0, _filterFns.default)({
@@ -159,7 +156,7 @@ var LmFilterRoot = function LmFilterRoot(props, ref) {
     });
   }, [state, dispatch, props]); // 组件示例
 
-  var instance = (0, _objectSpread2.default)((0, _objectSpread2.default)((0, _objectSpread2.default)({}, configProps), eventProps), {}, {
+  var instance = (0, _objectSpread2.default)((0, _objectSpread2.default)((0, _objectSpread2.default)({}, props), eventProps), {}, {
     state: state,
     dispatch: dispatch
   }); // 向外暴露出的方法

package/lib/LmTable/Table.js

@@ -428,8 +428,12 @@ var ResetTable = /*#__PURE__*/(0, _react.forwardRef)(function (props, ref) {
   var customizeRenderEmpty = function customizeRenderEmpty() {
     return /*#__PURE__*/_react.default.createElement("div", {
       className: "lm_table_empty"
-    }, /*#__PURE__*/_react.default.createElement("img", {
-      src: _empty.default
+    }, /*#__PURE__*/_react.default.createElement("div", {
+      className: "empty_img",
+      style: {
+        width: '130px',
+        height: '80px'
+      }
     }), /*#__PURE__*/_react.default.createElement("span", null, "\u6682\u65E0\u6570\u636E"));
   };
 
@@ -513,7 +517,9 @@ var ResetTable = /*#__PURE__*/(0, _react.forwardRef)(function (props, ref) {
       width: '100%'
     }
   }, /*#__PURE__*/_react.default.createElement(_configProvider.default, {
-    renderEmpty: emptyProps ? function () {
+    renderEmpty: loading ? function () {
+      return null;
+    } : 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, {

package/lib/LmTable/style/index.css

@@ -1098,6 +1098,11 @@ html {
   height: 80px;
   margin-bottom: 8px;
 }
+#lm_protable_warp .lm_protable .lm_table_empty .empty_img {
+  background-size: cover;
+  margin-bottom: 8px;
+  background-image: url('data:image/png;base64,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');
+}
 #lm_protable_warp .lm_protable .lm_table_empty > span {
   color: var(--font-color);
 }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "linkmore-design",
-  "version": "1.0.60",
+  "version": "1.0.62",
   "author": {
     "name": "nowthen",
     "email": "rnlvwyx@gmail.com"
@@ -58,13 +58,13 @@
     "@typescript-eslint/eslint-plugin": "^5.28.0",
     "@typescript-eslint/parser": "^5.28.0",
     "ahooks": "^3.6.2",
-    "antd": "^4.20.7",
+    "antd": "^4.22.6",
     "axios": "^0.21.0",
     "classnames": "^2.3.1",
     "dayjs": "^1.9.7",
+    "hex-to-rgba": "^2.0.1",
     "immer": "^9.0.15",
     "intersection-observer": "^0.12.2",
-    "hex-to-rgba": "^2.0.1",
     "lodash": "^4.17.21",
     "react-cookies": "^0.1.1",
     "react-query": "^3.34.15",