linkmore-design 1.0.47 → 1.0.50

package/es/CkFilter/baseFilter/index.js

@@ -11,8 +11,6 @@ exports.default = void 0;
 
 var _extends2 = _interopRequireDefault(require("@babel/runtime/helpers/esm/extends"));
 
-var _defineProperty2 = _interopRequireDefault(require("@babel/runtime/helpers/esm/defineProperty"));
-
 var _objectSpread2 = _interopRequireDefault(require("@babel/runtime/helpers/esm/objectSpread2"));
 
 var _linkmoreDesign = require("linkmore-design");
@@ -56,15 +54,6 @@ var Filter = function Filter() {
       orderFields = state.orderFields,
       customFilterValues = state.customFilterValues,
       complexFilterValues = state.complexFilterValues;
-  var hasClear = (0, _react.useMemo)(function () {
-    var _Object$keys, _Object$keys2;
-
-    var obj = (0, _objectSpread2.default)({}, filterValues);
-    delete obj[searchKey];
-    var hasBaseFilter = !!((_Object$keys = Object.keys(obj)) === null || _Object$keys === void 0 ? void 0 : _Object$keys.length);
-    var hasComplexFilter = !!((_Object$keys2 = Object.keys(complexFilterValues)) === null || _Object$keys2 === void 0 ? void 0 : _Object$keys2.length);
-    return hasBaseFilter || hasComplexFilter;
-  }, [filterValues, complexFilterValues]);
 
   var handleFilter = function handleFilter(val) {
     var nValue = (0, _objectSpread2.default)({}, filterValues);
@@ -80,26 +69,6 @@ var Filter = function Filter() {
     });
     onChange === null || onChange === void 0 ? void 0 : onChange(nValue, customFilterValues);
     return false;
-  }; // 一键清空 清空筛选，保留模糊查询
-
-
-  var handleClear = function handleClear() {
-    var _inputRef$current;
-
-    if ((_inputRef$current = inputRef.current) === null || _inputRef$current === void 0 ? void 0 : _inputRef$current.input) {
-      inputRef.current.input.value = '';
-    }
-
-    var baseFilter = filterValues[searchKey] ? (0, _defineProperty2.default)({}, searchKey, filterValues[searchKey]) : {};
-    dispatch({
-      type: 'changeFilterValues',
-      filterValues: baseFilter
-    });
-    dispatch({
-      type: 'changeComplexFilterValues',
-      complexFilterValues: {}
-    });
-    onChange === null || onChange === void 0 ? void 0 : onChange(baseFilter, customFilterValues);
   };
 
   return /*#__PURE__*/_react.default.createElement(_react.default.Fragment, null, search && /*#__PURE__*/_react.default.createElement("div", {
@@ -118,10 +87,7 @@ var Filter = function Filter() {
     return /*#__PURE__*/_react.default.createElement(_filterMenu.default, (0, _extends2.default)({
       key: v.field
     }, v));
-  })), /*#__PURE__*/_react.default.createElement(_NestedFilter.default, null), hasClear && /*#__PURE__*/_react.default.createElement(_linkmoreDesign.Button, {
-    type: "link",
-    onClick: handleClear
-  }, "\u4E00\u952E\u6E05\u7A7A"));
+  })), /*#__PURE__*/_react.default.createElement(_NestedFilter.default, null));
 };
 
 var _default = Filter;

package/es/CkFilter/complexFilter/drawer.js

@@ -169,7 +169,7 @@ var ListItemChecked = function ListItemChecked(props) {
 
   var tagElem = function tagElem() {
     return /*#__PURE__*/_react.default.createElement(_react.default.Fragment, null, /*#__PURE__*/_react.default.createElement(_tag.default, {
-      className: "site-tag-plus",
+      className: "add_tags",
       onClick: handleAdd
     }, /*#__PURE__*/_react.default.createElement(_IconFont.default, {
       type: "lmweb-plus"
@@ -371,7 +371,8 @@ var Index = function Index() {
       onClick: onClose,
       size: "small"
     }, "\u53D6\u6D88"), !!instance.custom && /*#__PURE__*/_react.default.createElement(_saveModal.default, {
-      state: state
+      state: state,
+      dispatch: dispatch
     }), /*#__PURE__*/_react.default.createElement(_linkmoreDesign.Button, {
       type: "primary",
       onClick: onSearch,

package/es/CkFilter/complexFilter/saveModal.js

@@ -22,7 +22,8 @@ var _react = _interopRequireWildcard(require("react"));
 var _linkmoreDesign = require("linkmore-design");
 
 var Save = function Save(_ref) {
-  var state = _ref.state;
+  var state = _ref.state,
+      dispatch = _ref.dispatch;
 
   var _useState = (0, _react.useState)(false),
       _useState2 = (0, _slicedToArray2.default)(_useState, 2),
@@ -63,20 +64,26 @@ var Save = function Save(_ref) {
 
               console.log('保存数据！', nValue);
               onClose();
-              _context.next = 13;
+              dispatch({
+                type: 'changeComplexDrawer',
+                complexDrawer: (0, _objectSpread2.default)((0, _objectSpread2.default)({}, state.complexDrawer), {}, {
+                  visible: false
+                })
+              });
+              _context.next = 14;
               break;
 
-            case 10:
-              _context.prev = 10;
+            case 11:
+              _context.prev = 11;
               _context.t0 = _context["catch"](0);
               console.log('error:', _context.t0);
 
-            case 13:
+            case 14:
             case "end":
               return _context.stop();
           }
         }
-      }, _callee, null, [[0, 10]]);
+      }, _callee, null, [[0, 11]]);
     }));
 
     return function onSave() {
@@ -105,6 +112,9 @@ var Save = function Save(_ref) {
   }, /*#__PURE__*/_react.default.createElement(_linkmoreDesign.Form, {
     form: form,
     layout: "vertical",
+    initialValues: {
+      default: false
+    },
     size: "default"
   }, /*#__PURE__*/_react.default.createElement("div", {
     className: "filter_drawer_group"

package/es/CkFilter/filter.js

@@ -17,6 +17,8 @@ var _slicedToArray2 = _interopRequireDefault(require("@babel/runtime/helpers/esm
 
 var _react = _interopRequireWildcard(require("react"));
 
+var _linkmoreDesign = require("linkmore-design");
+
 var _baseFilter = _interopRequireDefault(require("./baseFilter"));
 
 var _complexFilter = _interopRequireDefault(require("./complexFilter"));
@@ -42,9 +44,14 @@ var Filter = /*#__PURE__*/(0, _react.forwardRef)(function (props, ref) {
       dispatch = _useContent2[1];
 
   var _state$instance = state.instance,
+      onChange = _state$instance.onChange,
       custom = _state$instance.custom,
       levelGroup = _state$instance.levelGroup,
-      complex = _state$instance.complex; // 初始化
+      complex = _state$instance.complex,
+      searchKey = _state$instance.searchKey,
+      filterValues = state.filterValues,
+      complexFilterValues = state.complexFilterValues,
+      customFilterValues = state.customFilterValues; // 初始化
 
   var setOptions = (0, _react.useCallback)(function () {
     var trigger = props.trigger,
@@ -97,7 +104,7 @@ var Filter = /*#__PURE__*/(0, _react.forwardRef)(function (props, ref) {
 
   (0, _react.useEffect)(function () {
     setOptions();
-  }, [props]);
+  }, [props.data, props.fullData]);
   (0, _react.useEffect)(function () {
     dispatch({
       type: 'initInstance',
@@ -135,6 +142,29 @@ var Filter = /*#__PURE__*/(0, _react.forwardRef)(function (props, ref) {
     (_state$instance$onCha = (_state$instance2 = state.instance).onChange) === null || _state$instance$onCha === void 0 ? void 0 : _state$instance$onCha.call(_state$instance2, nValue, state.customFilterValues);
   };
 
+  var hasClear = (0, _react.useMemo)(function () {
+    var _Object$keys, _Object$keys2;
+
+    var obj = (0, _objectSpread2.default)({}, filterValues);
+    delete obj[searchKey];
+    var hasBaseFilter = !!((_Object$keys = Object.keys(obj)) === null || _Object$keys === void 0 ? void 0 : _Object$keys.length);
+    var hasComplexFilter = !!((_Object$keys2 = Object.keys(complexFilterValues)) === null || _Object$keys2 === void 0 ? void 0 : _Object$keys2.length);
+    return hasBaseFilter || hasComplexFilter;
+  }, [filterValues, complexFilterValues]); // 一键清空 清空筛选，保留模糊查询
+
+  var handleClear = function handleClear() {
+    var baseFilter = filterValues[searchKey] ? (0, _defineProperty2.default)({}, searchKey, filterValues[searchKey]) : {};
+    dispatch({
+      type: 'changeFilterValues',
+      filterValues: baseFilter
+    });
+    dispatch({
+      type: 'changeComplexFilterValues',
+      complexFilterValues: {}
+    });
+    onChange === null || onChange === void 0 ? void 0 : onChange(baseFilter, customFilterValues);
+  };
+
   (0, _react.useImperativeHandle)(ref, function () {
     return {
       setOptions: setOptions,
@@ -150,7 +180,10 @@ var Filter = /*#__PURE__*/(0, _react.forwardRef)(function (props, ref) {
     className: "lm_filter_base"
   }, custom && /*#__PURE__*/_react.default.createElement(_customFilter.default, null), levelGroup && /*#__PURE__*/_react.default.createElement(_radioGroup.default, null), (custom || levelGroup) && /*#__PURE__*/_react.default.createElement("div", {
     className: "line"
-  }), /*#__PURE__*/_react.default.createElement(_baseFilter.default, null), complex && /*#__PURE__*/_react.default.createElement(_complexFilter.default, null)));
+  }), /*#__PURE__*/_react.default.createElement(_baseFilter.default, null), complex && /*#__PURE__*/_react.default.createElement(_complexFilter.default, null), hasClear && /*#__PURE__*/_react.default.createElement(_linkmoreDesign.Button, {
+    type: "link",
+    onClick: handleClear
+  }, "\u4E00\u952E\u6E05\u7A7A")));
 });
 var _default = Filter;
 exports.default = _default;

package/es/CkFilter/style/style.css

@@ -861,12 +861,12 @@ html {
   background-color: var(--background-color);
   margin: 0;
 }
-.ant-drawer.lm_filter_drawer .filter_drawer_group_list .filter_drawer_group_item .item_box .item_tags .ant-tag.site-tag-plus {
+.ant-drawer.lm_filter_drawer .filter_drawer_group_list .filter_drawer_group_item .item_box .item_tags .ant-tag.add_tags {
   background: transparent;
   border-style: dashed;
   cursor: pointer;
 }
-.ant-drawer.lm_filter_drawer .filter_drawer_group_list .filter_drawer_group_item .item_box .item_tags .ant-tag.site-tag-plus:hover {
+.ant-drawer.lm_filter_drawer .filter_drawer_group_list .filter_drawer_group_item .item_box .item_tags .ant-tag.add_tags:hover {
   color: var(--primary-color);
   border-color: var(--primary-color);
 }

package/es/CustomTableOption/columnsSort.js

@@ -107,11 +107,11 @@ var ColumnsSort = /*#__PURE__*/forwardRef(function (_ref, ref) {
     cloneCol.forEach(function (item, index) {
       var _a, _b, _c;
 
-      if (ColumnsStateValue === null || ColumnsStateValue === void 0 ? void 0 : ColumnsStateValue.hasOwnProperty(item.dataIndex)) {
-        var order = (_a = ColumnsStateValue[item.dataIndex]) === null || _a === void 0 ? void 0 : _a.order;
-        item.fixed = ((_b = ColumnsStateValue[item.dataIndex]) === null || _b === void 0 ? void 0 : _b.fixed) || undefined;
+      if (colStateValue === null || colStateValue === void 0 ? void 0 : colStateValue.hasOwnProperty(item.dataIndex)) {
+        var order = (_a = colStateValue[item.dataIndex]) === null || _a === void 0 ? void 0 : _a.order;
+        item.fixed = ((_b = colStateValue[item.dataIndex]) === null || _b === void 0 ? void 0 : _b.fixed) || undefined;
         item.order = [undefined, null].includes(order) ? index : order;
-        item.show = ((_c = ColumnsStateValue[item.dataIndex]) === null || _c === void 0 ? void 0 : _c.show) === false ? false : true;
+        item.show = ((_c = colStateValue[item.dataIndex]) === null || _c === void 0 ? void 0 : _c.show) === false ? false : true;
       }
     });
     var leftSortItem = [];
@@ -150,7 +150,7 @@ var ColumnsSort = /*#__PURE__*/forwardRef(function (_ref, ref) {
   useEffect(function () {
     setLocalColumns(columns);
     setColStateValue(ColumnsStateValue);
-  }, []);
+  }, [columns]);
   var leftSensors = useSensors(useSensor(PointerSensor), useSensor(KeyboardSensor, {
     coordinateGetter: sortableKeyboardCoordinates
   }));
@@ -254,7 +254,7 @@ var ColumnsSort = /*#__PURE__*/forwardRef(function (_ref, ref) {
             obj[item.dataIndex]['order'] = item.order;
           }
 
-          if (![undefined, null].includes(item.order)) {
+          if (![undefined, null].includes(item.show)) {
             obj[item.dataIndex]['show'] = item.show;
           }
 

package/es/CustomTableOption/filterSort.js

@@ -75,9 +75,9 @@ var FilterSort = /*#__PURE__*/forwardRef(function (_ref, ref) {
     cloneCol.forEach(function (item, index) {
       var _a, _b;
 
-      var order = (_a = filterStateValue[item.field]) === null || _a === void 0 ? void 0 : _a.order;
+      var order = (_a = colStateValue[item.field]) === null || _a === void 0 ? void 0 : _a.order;
       item.order = order !== undefined && order !== null ? order : UNLLVALUE.includes(item.order) ? index : item.order;
-      item.show = ((_b = filterStateValue[item.field]) === null || _b === void 0 ? void 0 : _b.show) === false ? false : UNLLVALUE.includes(item.show) ? true : !!item.show;
+      item.show = ((_b = colStateValue[item.field]) === null || _b === void 0 ? void 0 : _b.show) === false ? false : UNLLVALUE.includes(item.show) ? true : !!item.show;
     });
     return cloneCol.filter(function (item) {
       var _a;
@@ -106,7 +106,7 @@ var FilterSort = /*#__PURE__*/forwardRef(function (_ref, ref) {
   useEffect(function () {
     setLocalFilter(filter);
     setColStateValue(filterStateValue);
-  }, []);
+  }, [filter]);
   var sensors = useSensors(useSensor(PointerSensor), useSensor(KeyboardSensor, {
     coordinateGetter: sortableKeyboardCoordinates
   }));
@@ -174,7 +174,7 @@ var FilterSort = /*#__PURE__*/forwardRef(function (_ref, ref) {
             obj[item.field]['order'] = item.order;
           }
 
-          if (![undefined, null].includes(item.order)) {
+          if (![undefined, null].includes(item.show)) {
             obj[item.field]['show'] = item.show;
           }
         });

package/es/CustomTableOption/index.js

@@ -115,8 +115,7 @@ var LMCustomTableOption = /*#__PURE__*/forwardRef(function (props, ref) {
       return setVisible(false);
     }
   }, /*#__PURE__*/React.createElement(Tabs, {
-    defaultActiveKey: "1",
-    destroyInactiveTabPane: true
+    defaultActiveKey: "1"
   }, /*#__PURE__*/React.createElement(TabPane, {
     tab: "\u4E2A\u6027\u5316\u7B5B\u9009",
     key: "1",

package/es/Input/style/style.css

@@ -660,8 +660,28 @@ html {
 .ant-input-group-wrapper.lm_input .ant-input-group-addon {
   padding: 0 8px;
 }
+.ant-input-group-wrapper.lm_input .ant-input-group-addon .lm_select {
+  margin: -5px -8px -4px -9px;
+}
 .ant-input-group-wrapper.lm_input.ant-input-group-wrapper-sm .ant-input-group-addon {
-  padding: 0 5px 0 4px;
+  height: 26px;
+}
+.ant-input-group-wrapper.lm_input.ant-input-group-wrapper-sm .ant-input-group-addon .lm_select {
+  height: 26px;
+  margin: -4px -8px -5px -9px;
+}
+.ant-input-group-wrapper.lm_input.ant-input-group-wrapper-sm .ant-input-group-addon .lm_select .ant-select-selector {
+  height: 26px;
+}
+.ant-input-group-wrapper.lm_input.ant-input-group-wrapper-sm .ant-input-group-addon .lm_select .ant-select-selector > span {
+  height: 26px;
+  line-height: 24px;
+}
+.ant-input-group-wrapper.lm_input.ant-input-group-wrapper-sm .ant-input-group-addon .lm_select .ant-select-selector:after {
+  line-height: 26px;
+}
+.ant-input-group-wrapper.lm_input.ant-input-group-wrapper-sm .ant-input-group-addon .lm_select .ant-select-selector .ant-select-selection-search-input {
+  height: 24px;
 }
 .ant-input-group.ant-input-group-lg .lm_input {
   height: 40px;

package/es/List/index.d.ts

@@ -0,0 +1,2 @@
+import { List } from 'antd';
+export default List;

package/es/List/index.js

@@ -0,0 +1,3 @@
+import "antd/es/list/style";
+import _List from "antd/es/list";
+export default _List;