linkmore-design 1.0.55 → 1.0.56

package/lib/LmFilter/filterFns/index.js

@@ -11,8 +11,6 @@ var _defineProperty2 = _interopRequireDefault(require("@babel/runtime/helpers/de
 
 var _objectSpread3 = _interopRequireDefault(require("@babel/runtime/helpers/objectSpread2"));
 
-var _objectDestructuringEmpty2 = _interopRequireDefault(require("@babel/runtime/helpers/objectDestructuringEmpty"));
-
 var _utils = require("../utils");
 
 // 核心参数集合
@@ -20,7 +18,7 @@ var CoreOptions = function CoreOptions(_ref) {
   var state = _ref.state,
       dispatch = _ref.dispatch,
       props = _ref.props;
-  (0, _objectDestructuringEmpty2.default)(props); // 设置筛选的值 item => Object || Array => [{label: '',  value: ''}, ...]
+  var onChange = props.onChange; // 设置筛选的值 item => Object || Array => [{label: '',  value: ''}, ...]
 
   var setFilterValue = function setFilterValue(item, field) {
     var basicFilter = (0, _objectSpread3.default)((0, _objectSpread3.default)({}, state.basicFilter), {}, (0, _defineProperty2.default)({}, field, item));
@@ -34,6 +32,27 @@ var CoreOptions = function CoreOptions(_ref) {
       type: 'changeBasicFilter',
       basicFilter: basicFilter
     });
+
+    var formatVK = function formatVK() {
+      var obj = {};
+      Object.entries(basicFilter).forEach(function (item) {
+        if (Array.isArray(item[1])) {
+          obj[item[0]] = item[1].map(function (v) {
+            return v.value;
+          });
+          return;
+        }
+
+        obj[item[0]] = item[1].value;
+      });
+      return obj;
+    }; // 触发外部事件
+
+
+    onChange === null || onChange === void 0 ? void 0 : onChange({
+      basicFilter: basicFilter,
+      formatVK: formatVK()
+    });
   }; // 根据字段查找过滤的数据, 不存在时返回默认值
 
 

package/lib/LmFilter/localization.d.ts

@@ -0,0 +1,8 @@
+export declare const DefaultLocalization: {
+    globalQuery: {
+        filter: any[];
+    };
+    filterQuery: {
+        filter: any[];
+    };
+};

package/lib/LmFilter/localization.js

@@ -0,0 +1,19 @@
+"use strict";
+
+Object.defineProperty(exports, "__esModule", {
+  value: true
+});
+exports.DefaultLocalization = void 0;
+// export interface LM_Localization {
+//   fieldName: string,
+//   operator: number,
+// }
+var DefaultLocalization = {
+  globalQuery: {
+    filter: []
+  },
+  filterQuery: {
+    filter: []
+  }
+};
+exports.DefaultLocalization = DefaultLocalization;

package/lib/LmFilter/style/style.css

@@ -10,6 +10,9 @@
 .lm_filter_wrapper .lm_filter_container .lm_filter .lm_filter_search {
   max-width: 140px;
 }
+.lm_filter_wrapper .lm_filter_container .lm_filter .lm_filter_complex {
+  display: inline-flex;
+}
 .lm_filter_basic_item {
   display: inline-flex;
   align-items: center;
@@ -41,18 +44,22 @@
   color: var(--text-color);
   transition: 0.3s;
 }
-.lm_filter_basic_item .filter_item_icon:hover {
-  color: var(--primary-color);
+.lm_filter_basic_item .filter_item_icon.addon_before {
+  color: var(--font-color);
 }
-.lm_filter_basic_item.expand .filter_item_icon {
+.lm_filter_basic_item.expand .filter_item_icon.addon_after {
   transform: rotateX(180deg);
 }
 .lm_filter_basic_item.active .filter_item_value {
   color: var(--primary-color);
 }
-.lm_filter_basic_item.active .filter_item_icon {
+.lm_filter_basic_item.active .filter_item_icon.addon_after {
   transform: rotateX(180deg);
 }
+.lm_filter_basic_item.active.lm_filter_complex_item .filter_item_icon,
+.lm_filter_basic_item.active.lm_filter_complex_item .filter_item_label {
+  color: var(--primary-color);
+}
 .ant-dropdown.filter_dropdown_container_cascader > div {
   transform: translateY(-4px);
 }

package/lib/LmFilter/wrapper/FilterRoot.js

@@ -25,7 +25,10 @@ var _filterFns = _interopRequireDefault(require("../filterFns"));
 var reducer = function reducer(state, action) {
   var basicFilter = action.basicFilter,
       resize = action.resize,
-      rows = action.rows;
+      rows = action.rows,
+      complexDrawer = action.complexDrawer,
+      valueDrawer = action.valueDrawer,
+      complexFilter = action.complexFilter;
 
   switch (action.type) {
     case 'changeBasicFilter':
@@ -43,6 +46,22 @@ var reducer = function reducer(state, action) {
       return (0, _objectSpread2.default)((0, _objectSpread2.default)({}, state), {}, {
         resize: resize
       });
+    // 高级筛选
+
+    case 'changeComplexFilter':
+      return (0, _objectSpread2.default)((0, _objectSpread2.default)({}, state), {}, {
+        complexFilter: complexFilter
+      });
+
+    case 'changeComplexDrawer':
+      return (0, _objectSpread2.default)((0, _objectSpread2.default)({}, state), {}, {
+        complexDrawer: complexDrawer
+      });
+
+    case 'changeValueDrawer':
+      return (0, _objectSpread2.default)((0, _objectSpread2.default)({}, state), {}, {
+        valueDrawer: valueDrawer
+      });
 
     case 'reset':
       // 一键清空
@@ -53,12 +72,43 @@ var reducer = function reducer(state, action) {
     default:
       throw new Error();
   }
-}; // 仅在初始化时触发一次
-
-
-var getInitialState = function getInitialState(props) {
+}; // 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 globalQuery = localization.globalQuery,
+      filterQuery = localization.filterQuery;
+  var basicFilter = {};
+  filterQuery.filter.forEach(function (item) {
+    basicFilter[item.fieldName] = item.value;
+  });
   return {
-    basicFilter: {}
+    basicFilter: basicFilter,
+    complexFilter: {},
+    complexDrawer: {
+      visible: false,
+      data: {}
+    },
+    valueDrawer: {
+      visible: false,
+      data: {}
+    }
   };
 };
 

package/lib/Switch/index.d.ts

@@ -1,2 +1,3 @@
-import { Switch } from 'antd';
+import { FC } from 'react';
+declare const Switch: FC<any>;
 export default Switch;

package/lib/Switch/index.js

@@ -11,5 +11,38 @@ require("antd/es/switch/style");
 
 var _switch = _interopRequireDefault(require("antd/es/switch"));
 
-var _default = _switch.default;
+var _defineProperty2 = _interopRequireDefault(require("@babel/runtime/helpers/defineProperty"));
+
+var _react = _interopRequireDefault(require("react"));
+
+var _classnames = _interopRequireDefault(require("classnames"));
+
+var __rest = void 0 && (void 0).__rest || function (s, e) {
+  var t = {};
+
+  for (var p in s) {
+    if (Object.prototype.hasOwnProperty.call(s, p) && e.indexOf(p) < 0) t[p] = s[p];
+  }
+
+  if (s != null && typeof Object.getOwnPropertySymbols === "function") for (var i = 0, p = Object.getOwnPropertySymbols(s); i < p.length; i++) {
+    if (e.indexOf(p[i]) < 0 && Object.prototype.propertyIsEnumerable.call(s, p[i])) t[p[i]] = s[p[i]];
+  }
+  return t;
+};
+
+var Switch = function Switch(props) {
+  var _props$size = props.size,
+      size = _props$size === void 0 ? 'default' : _props$size,
+      className = props.className,
+      restProps = __rest(props, ["size", "className"]);
+
+  var classs = (0, _classnames.default)('lm-switch', className, (0, _defineProperty2.default)({}, "lm-switch-".concat(size), size));
+  return /*#__PURE__*/_react.default.createElement(_switch.default, Object.assign({
+    className: classs
+  }, restProps, {
+    size: size
+  }));
+};
+
+var _default = Switch;
 exports.default = _default;

package/lib/Switch/style/index.css

@@ -503,3 +503,44 @@ html {
 .card_cell_content:hover .card_cell_body .card_cell_checkbox {
   opacity: 1;
 }
+.ant-switch.lm-switch {
+  width: 48px;
+  height: 24px;
+  line-height: 24px;
+  margin-bottom: 8px;
+  background: rgba(0, 0, 0, 0.25);
+}
+.ant-switch.lm-switch .ant-switch-handle {
+  width: 20px;
+  height: 20px;
+}
+.ant-switch.lm-switch .ant-switch-handle::before {
+  border-radius: 10px;
+}
+.ant-switch.lm-switch.ant-switch-checked {
+  background: #1890ff;
+}
+.ant-switch.lm-switch.ant-switch-checked .ant-switch-handle {
+  left: calc(100% - 20px - 2px);
+}
+.ant-switch.lm-switch.ant-switch-checked.ant-switch-disabled {
+  background: #C5E3FE;
+}
+.ant-switch.lm-switch.ant-switch-disabled {
+  background: rgba(0, 0, 0, 0.06);
+  opacity: 1;
+}
+.ant-switch.lm-switch-small {
+  width: 28px;
+  height: 16px;
+}
+.ant-switch.lm-switch-small .ant-switch-handle {
+  width: 12px;
+  height: 12px;
+}
+.ant-switch.lm-switch-small .ant-switch-handle::before {
+  border-radius: 6px;
+}
+.ant-switch.lm-switch-small.ant-switch-checked .ant-switch-handle {
+  left: calc(100% - 12px - 2px);
+}

package/package.json

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