linkmore-design 1.0.63 → 1.0.64

package/lib/LmFilter/filterFns/index.js

@@ -13,22 +13,50 @@ var _defineProperty2 = _interopRequireDefault(require("@babel/runtime/helpers/de
 
 var _objectSpread4 = _interopRequireDefault(require("@babel/runtime/helpers/objectSpread2"));
 
+var _toConsumableArray2 = _interopRequireDefault(require("@babel/runtime/helpers/toConsumableArray"));
+
 var _react = _interopRequireWildcard(require("react"));
 
 var _utils = require("../utils");
 
 // 初始化查询结构
 var initLocalization = function initLocalization(props) {
-  var _filterQuery$filters, _filterQuery$filters$;
+  var _globalQuery$filters, _globalQuery$filters$, _filterQuery$filters, _filterQuery$filters$;
 
   var localization = props.localization,
       dataSource = props.dataSource,
-      searchKey = props.searchKey;
+      searchKey = props.searchKey,
+      customOptions = props.customOptions;
   var globalQuery = localization.globalQuery,
       filterQuery = localization.filterQuery;
   var basicFilter = (localization === null || localization === void 0 ? void 0 : localization.basicFilter) || {};
   var basicQuery = {}; // 存储查询结构
 
+  var customFilter = (customOptions === null || customOptions === void 0 ? void 0 : customOptions.find(function (v) {
+    var _localization$customF;
+
+    return (v === null || v === void 0 ? void 0 : v.value) === (localization === null || localization === void 0 ? void 0 : (_localization$customF = localization.customFilter) === null || _localization$customF === void 0 ? void 0 : _localization$customF.value);
+  })) || {};
+  var customQuery = {}; // 自定义筛选存储结构
+
+  if (globalQuery === null || globalQuery === void 0 ? void 0 : (_globalQuery$filters = globalQuery.filters) === null || _globalQuery$filters === void 0 ? void 0 : (_globalQuery$filters$ = _globalQuery$filters[0]) === null || _globalQuery$filters$ === void 0 ? void 0 : _globalQuery$filters$.conditions) {
+    var _globalQuery$filters2, _globalQuery$filters3;
+
+    var globalQueryArr = (globalQuery === null || globalQuery === void 0 ? void 0 : (_globalQuery$filters2 = globalQuery.filters) === null || _globalQuery$filters2 === void 0 ? void 0 : (_globalQuery$filters3 = _globalQuery$filters2[0]) === null || _globalQuery$filters3 === void 0 ? void 0 : _globalQuery$filters3.conditions) || [];
+    customQuery = globalQueryArr.reduce(function (pre, cur) {
+      var checkedValue = cur.value; // 选中的数据
+      // 查找该数据是否展示
+
+      if ((0, _utils.getIsHas)(checkedValue)) {
+        pre[cur.fieldName] = cur;
+      }
+
+      return pre;
+    }, {});
+  }
+
+  ;
+
   if ((0, _utils.getIsHas)(basicFilter)) {
     var _Object$keys;
 
@@ -95,9 +123,12 @@ var initLocalization = function initLocalization(props) {
     }, {});
   }
 
+  ;
   return {
     basicFilter: basicFilter,
-    basicQuery: basicQuery
+    basicQuery: basicQuery,
+    customFilter: customFilter,
+    customQuery: customQuery
   };
 }; // 核心参数集合
 
@@ -110,7 +141,32 @@ var useCoreOptions = function useCoreOptions(_ref) {
       props = _ref.props;
   var onChange = props.onChange,
       dataSource = props.dataSource,
-      searchKey = props.searchKey; // 触发查询 type  basic基础筛选 ｜ complex高级筛选
+      searchKey = props.searchKey,
+      customOptions = props.customOptions; // object => array
+
+  var tranformQuery = (0, _react.useCallback)(function (obj) {
+    var _Object$keys2;
+
+    var nArr = ((_Object$keys2 = Object.keys(obj)) === null || _Object$keys2 === void 0 ? void 0 : _Object$keys2.reduce(function (pre, cur) {
+      var item = dataSource.find(function (v) {
+        return cur === v.field;
+      });
+      var itemValue = obj[cur].value;
+
+      if ((0, _utils.getIsHas)(itemValue) && !!item) {
+        return [].concat((0, _toConsumableArray2.default)(pre), [{
+          fieldName: cur,
+          fieldType: (item === null || item === void 0 ? void 0 : item.valueType) || 'string',
+          type: item.type,
+          value: Array.isArray(itemValue) ? itemValue : [itemValue],
+          operator: obj[cur].mode === 'and' ? 'equal' : 'contains'
+        }]);
+      }
+
+      return pre;
+    }, [])) || [];
+    return nArr;
+  }, [dataSource]); // 触发查询 type  basic基础筛选 ｜ complex高级筛选
 
   var onQuery = (0, _react.useCallback)(function () {
     var _ref2 = arguments.length > 0 && arguments[0] !== undefined ? arguments[0] : {},
@@ -118,13 +174,42 @@ var useCoreOptions = function useCoreOptions(_ref) {
         basicFilter = _ref2$basicFilter === void 0 ? {} : _ref2$basicFilter,
         _ref2$complexFilter = _ref2.complexFilter,
         complexFilter = _ref2$complexFilter === void 0 ? {} : _ref2$complexFilter,
+        _ref2$customFilter = _ref2.customFilter,
+        customFilter = _ref2$customFilter === void 0 ? state.customFilter || {} : _ref2$customFilter,
         _ref2$basicQuery = _ref2.basicQuery,
         basicQuery = _ref2$basicQuery === void 0 ? {} : _ref2$basicQuery,
         _ref2$type = _ref2.type,
         type = _ref2$type === void 0 ? 'basic' : _ref2$type;
 
+    if (type === 'custom') {
+      var _Object$keys3;
+
+      dispatch({
+        type: 'changeCustomFilter',
+        customFilter: customFilter
+      });
+      var globalQuery = {
+        filters: [{
+          conditions: tranformQuery(customFilter === null || customFilter === void 0 ? void 0 : customFilter.data)
+        }]
+      };
+      var filterQuery = {
+        filters: [{
+          conditions: (_Object$keys3 = Object.keys(state.basicQuery)) === null || _Object$keys3 === void 0 ? void 0 : _Object$keys3.map(function (k) {
+            return state.basicQuery[k];
+          })
+        }]
+      };
+      onChange === null || onChange === void 0 ? void 0 : onChange({
+        basicFilter: basicFilter,
+        globalQuery: globalQuery,
+        filterQuery: filterQuery,
+        type: 'custom'
+      });
+    }
+
     if (type === 'basic') {
-      var _Object$keys2;
+      var _Object$keys4;
 
       dispatch({
         type: 'changeBasicFilter',
@@ -140,24 +225,30 @@ var useCoreOptions = function useCoreOptions(_ref) {
       }); // 基础筛选清空高级筛选
       // 抛出给外部查询
 
-      var filterQuery = {
+      var _globalQuery = {
         filters: [{
-          conditions: (_Object$keys2 = Object.keys(basicQuery)) === null || _Object$keys2 === void 0 ? void 0 : _Object$keys2.map(function (k) {
+          conditions: tranformQuery(customFilter.data)
+        }]
+      };
+      var _filterQuery = {
+        filters: [{
+          conditions: (_Object$keys4 = Object.keys(basicQuery)) === null || _Object$keys4 === void 0 ? void 0 : _Object$keys4.map(function (k) {
             return basicQuery[k];
           })
         }]
       };
       onChange === null || onChange === void 0 ? void 0 : onChange({
         basicFilter: basicFilter,
-        filterQuery: filterQuery,
+        globalQuery: _globalQuery,
+        filterQuery: _filterQuery,
         type: 'basic'
       });
     }
 
     if (type === 'complex') {
-      var _Object$keys3, _Object$keys4;
+      var _Object$keys5, _Object$keys6;
 
-      var _basicQuery = (_Object$keys3 = Object.keys(complexFilter)) === null || _Object$keys3 === void 0 ? void 0 : _Object$keys3.reduce(function (pre, cur) {
+      var _basicQuery = (_Object$keys5 = Object.keys(complexFilter)) === null || _Object$keys5 === void 0 ? void 0 : _Object$keys5.reduce(function (pre, cur) {
         var item = dataSource.find(function (v) {
           return cur === v.field;
         });
@@ -195,20 +286,26 @@ var useCoreOptions = function useCoreOptions(_ref) {
         type: 'changeBasicQuery',
         basicQuery: _basicQuery
       });
-      var _filterQuery = {
+      var _globalQuery2 = {
+        filters: [{
+          conditions: tranformQuery(customFilter.data)
+        }]
+      };
+      var _filterQuery2 = {
         filters: [{
-          conditions: (_Object$keys4 = Object.keys(_basicQuery)) === null || _Object$keys4 === void 0 ? void 0 : _Object$keys4.map(function (k) {
+          conditions: (_Object$keys6 = Object.keys(_basicQuery)) === null || _Object$keys6 === void 0 ? void 0 : _Object$keys6.map(function (k) {
             return _basicQuery[k];
           })
         }]
       };
       onChange === null || onChange === void 0 ? void 0 : onChange({
         complexFilter: complexFilter,
-        filterQuery: _filterQuery,
+        globalQuery: _globalQuery2,
+        filterQuery: _filterQuery2,
         type: type
       });
     }
-  }, []); // 清除事件
+  }, [tranformQuery, state]); // 清除事件
 
   var onClearChange = (0, _react.useCallback)(function () {
     var _props$onClearChange;
@@ -227,11 +324,16 @@ var useCoreOptions = function useCoreOptions(_ref) {
     var field = _ref3.field,
         type = _ref3.type;
     var defaultValue = (0, _utils.getValueForType)(type);
+
+    if ((0, _utils.getIsHas)(state.basicFilter[field])) {
+      return state.basicFilter[field];
+    }
+
     return state.basicFilter[field] || defaultValue;
   }, [state.basicFilter]); // 获取查询结构
 
   var getFilterQuery = (0, _react.useCallback)(function () {
-    var _Object$keys5;
+    var _Object$keys7;
 
     var originData = arguments.length > 0 && arguments[0] !== undefined ? arguments[0] : dataSource;
     var basicFilter = (0, _utils.getFilterShow)(state.basicFilter, originData);
@@ -246,7 +348,7 @@ var useCoreOptions = function useCoreOptions(_ref) {
     });
     var filterQuery = {
       filters: [{
-        conditions: (_Object$keys5 = Object.keys(basicQuery)) === null || _Object$keys5 === void 0 ? void 0 : _Object$keys5.map(function (k) {
+        conditions: (_Object$keys7 = Object.keys(basicQuery)) === null || _Object$keys7 === void 0 ? void 0 : _Object$keys7.map(function (k) {
           return basicQuery[k];
         })
       }]
@@ -301,7 +403,9 @@ var useCoreOptions = function useCoreOptions(_ref) {
       localization: localization
     })),
         basicFilter = _initLocalization.basicFilter,
-        basicQuery = _initLocalization.basicQuery;
+        basicQuery = _initLocalization.basicQuery,
+        customFilter = _initLocalization.customFilter,
+        customQuery = _initLocalization.customQuery;
 
     dispatch({
       type: 'changeBasicFilter',
@@ -311,10 +415,31 @@ var useCoreOptions = function useCoreOptions(_ref) {
       type: 'changeBasicQuery',
       basicQuery: basicQuery
     });
-  }, [props]); // 组件内部使用
+    dispatch({
+      type: 'changeCustomFilter',
+      customFilter: customFilter
+    });
+    dispatch({
+      type: 'changeCustomQuery',
+      customQuery: customQuery
+    });
+  }, [props]); // 自定义筛选查询
+
+  var setCustomFilter = (0, _react.useCallback)(function (val) {
+    var customFilter = customOptions.find(function (v) {
+      return v.value === val;
+    });
+    console.log('state.basicFilter', state.basicFilter);
+    onQuery({
+      customFilter: customFilter,
+      basicFilter: state.basicFilter,
+      type: 'custom'
+    });
+  }, [customOptions, state.basicFilter]); // 组件内部使用
 
   var CoreMethods = {
-    onQuery: onQuery
+    onQuery: onQuery,
+    setCustomFilter: setCustomFilter
   }; // 参与Ref转发
 
   var RefMethods = {

package/lib/LmFilter/style/{style.css → index.css}

@@ -5,7 +5,11 @@
   gap: 8px;
   font-size: 12px;
 }
-.lm_filter_wrapper .lm_filter_container .lm_filter .lm_filter_custom_select {
+.lm_filter_wrapper .lm_filter_container .lm_filter .lm_filter_custom {
+  display: inline-flex;
+  gap: 8px;
+}
+.lm_filter_wrapper .lm_filter_container .lm_filter .lm_filter_custom .lm_filter_custom_select {
   display: inline-flex;
   align-items: center;
   justify-content: space-between;
@@ -20,29 +24,34 @@
   cursor: pointer;
   transition: 0.3s;
 }
-.lm_filter_wrapper .lm_filter_container .lm_filter .lm_filter_custom_select.small {
+.lm_filter_wrapper .lm_filter_container .lm_filter .lm_filter_custom .lm_filter_custom_select.small {
   height: 24px;
 }
-.lm_filter_wrapper .lm_filter_container .lm_filter .lm_filter_custom_select .lm_filter_custom_select_label span {
+.lm_filter_wrapper .lm_filter_container .lm_filter .lm_filter_custom .lm_filter_custom_select .lm_filter_custom_select_label span {
   text-overflow: ellipsis;
   white-space: nowrap;
   overflow: hidden;
 }
-.lm_filter_wrapper .lm_filter_container .lm_filter .lm_filter_custom_select .lm_filter_custom_select_icon {
+.lm_filter_wrapper .lm_filter_container .lm_filter .lm_filter_custom .lm_filter_custom_select .lm_filter_custom_select_icon {
   font-size: 14px;
   color: var(--text-color);
   transition: 0.3s;
 }
-.lm_filter_wrapper .lm_filter_container .lm_filter .lm_filter_custom_select:hover {
+.lm_filter_wrapper .lm_filter_container .lm_filter .lm_filter_custom .lm_filter_custom_select:hover {
   border-color: var(--primary-hover-color);
 }
-.lm_filter_wrapper .lm_filter_container .lm_filter .lm_filter_custom_select.expand {
+.lm_filter_wrapper .lm_filter_container .lm_filter .lm_filter_custom .lm_filter_custom_select.expand {
   color: var(--text-color);
   border-color: var(--primary-hover-color);
 }
-.lm_filter_wrapper .lm_filter_container .lm_filter .lm_filter_custom_select.expand .lm_filter_custom_select_icon {
+.lm_filter_wrapper .lm_filter_container .lm_filter .lm_filter_custom .lm_filter_custom_select.expand .lm_filter_custom_select_icon {
   transform: rotateX(180deg);
 }
+.lm_filter_wrapper .lm_filter_container .lm_filter .lm_filter_custom .lm_filter_custom_line {
+  width: 1px;
+  height: 32px;
+  background-color: var(--background-color-hover);
+}
 .lm_filter_wrapper .lm_filter_container .lm_filter .lm_filter_search {
   max-width: 140px;
 }
@@ -176,10 +185,12 @@
 }
 .ant-dropdown .filter_dropdown .filter_body .filter_item .filter_item_operate .icon_hover {
   font-size: 16px;
-  color: var(--primary-color);
   transition: 0.3s;
   opacity: 0;
 }
+.ant-dropdown .filter_dropdown .filter_body .filter_item .filter_item_operate .icon_hover:hover {
+  color: var(--primary-color);
+}
 .ant-dropdown .filter_dropdown .filter_body .filter_item[disabled] {
   display: none;
 }

package/lib/LmFilter/style/index.js

@@ -1,3 +1,3 @@
 "use strict";
 
-require("./style.css");
+require("./index.css");

package/lib/LmFilter/wrapper/FilterRoot.js

@@ -25,11 +25,15 @@ var _utils = require("../utils");
 var reducer = function reducer(state, action) {
   var basicFilter = action.basicFilter,
       basicQuery = action.basicQuery,
+      customFilter = action.customFilter,
+      customQuery = action.customQuery,
       resize = action.resize,
       rows = action.rows,
       complexDrawer = action.complexDrawer,
       valueDrawer = action.valueDrawer,
-      complexFilter = action.complexFilter;
+      complexFilter = action.complexFilter,
+      customDrawer = action.customDrawer,
+      saveModal = action.saveModal;
 
   switch (action.type) {
     case 'changeBasicFilter':
@@ -44,6 +48,18 @@ var reducer = function reducer(state, action) {
         basicQuery: basicQuery
       });
 
+    case 'changeCustomFilter':
+      // 自定义筛选数据改变
+      return (0, _objectSpread2.default)((0, _objectSpread2.default)({}, state), {}, {
+        customFilter: (0, _objectSpread2.default)((0, _objectSpread2.default)({}, state.customFilter), customFilter)
+      });
+
+    case 'changeCustomQuery':
+      // 自定义筛选数据改变
+      return (0, _objectSpread2.default)((0, _objectSpread2.default)({}, state), {}, {
+        customQuery: customQuery
+      });
+
     case 'changeRows':
       return (0, _objectSpread2.default)((0, _objectSpread2.default)({}, state), {}, {
         rows: rows
@@ -69,6 +85,17 @@ var reducer = function reducer(state, action) {
       return (0, _objectSpread2.default)((0, _objectSpread2.default)({}, state), {}, {
         valueDrawer: valueDrawer
       });
+    // 自定义筛选
+
+    case 'changeCustomDrawer':
+      return (0, _objectSpread2.default)((0, _objectSpread2.default)({}, state), {}, {
+        customDrawer: customDrawer
+      });
+
+    case 'changeSaveModal':
+      return (0, _objectSpread2.default)((0, _objectSpread2.default)({}, state), {}, {
+        saveModal: saveModal
+      });
 
     case 'reset':
       // 一键清空
@@ -87,17 +114,36 @@ var reducer = function reducer(state, action) {
 var getInitialState = function getInitialState(props) {
   var _initLocalization = (0, _filterFns.initLocalization)(props),
       basicFilter = _initLocalization.basicFilter,
-      basicQuery = _initLocalization.basicQuery;
+      basicQuery = _initLocalization.basicQuery,
+      customQuery = _initLocalization.customQuery,
+      customFilter = _initLocalization.customFilter;
 
   return {
     basicFilter: basicFilter,
     basicQuery: basicQuery,
+    customFilter: (0, _objectSpread2.default)({
+      value: '',
+      label: '不限',
+      data: {}
+    }, customFilter),
+    // 选中的自定义筛选项
+    customQuery: customQuery,
     complexFilter: {},
     complexDrawer: {
       visible: false,
       data: {}
     },
     valueDrawer: {
+      visible: false,
+      type: 'complex',
+      data: {}
+    },
+    customDrawer: {
+      visible: false,
+      type: 'edit',
+      data: {}
+    },
+    saveModal: {
       visible: false,
       data: {}
     }

package/lib/Mentions/index.d.ts

@@ -0,0 +1,3 @@
+import { Mentions } from 'antd';
+export type { MentionProps } from 'antd';
+export default Mentions;

package/lib/Mentions/index.js

@@ -0,0 +1,15 @@
+"use strict";
+
+var _interopRequireDefault = require("@babel/runtime/helpers/interopRequireDefault").default;
+
+Object.defineProperty(exports, "__esModule", {
+  value: true
+});
+exports.default = void 0;
+
+require("antd/es/mentions/style");
+
+var _mentions = _interopRequireDefault(require("antd/es/mentions"));
+
+var _default = _mentions.default;
+exports.default = _default;