linkmore-design 1.0.46 → 1.0.47

package/lib/CardTable/table/TableRoot.js

@@ -21,7 +21,7 @@ var _react = _interopRequireWildcard(require("react"));
 
 var _TableWrapper = _interopRequireDefault(require("./TableWrapper"));
 
-var _excluded = ["rowConfig", "cellConfig", "defaultConfig", "checkboxConfig", "checkboxClick"];
+var _excluded = ["rowConfig", "cellConfig", "defaultConfig", "checkboxChange"];
 
 var reducer = function reducer(state, action) {
   var page = action.page,
@@ -60,28 +60,35 @@ var reducer = function reducer(state, action) {
     default:
       throw new Error();
   }
-};
-
-var getInitialState = function getInitialState(_ref) {
-  var _ref$checkboxConfig$c = _ref.checkboxConfig.checkKeys,
-      checkKeys = _ref$checkboxConfig$c === void 0 ? [] : _ref$checkboxConfig$c,
-      _ref$dataSource = _ref.dataSource,
-      dataSource = _ref$dataSource === void 0 ? [] : _ref$dataSource,
-      cellKey = _ref.cellKey;
+}; // 仅在初始化时触发一次
+
+
+var getInitialState = function getInitialState(props) {
+  var _props$checkboxConfig = props.checkboxConfig,
+      _props$checkboxConfig2 = _props$checkboxConfig.checkKeys,
+      checkKeys = _props$checkboxConfig2 === void 0 ? [] : _props$checkboxConfig2,
+      _props$checkboxConfig3 = _props$checkboxConfig.trigger,
+      trigger = _props$checkboxConfig3 === void 0 ? 'default' : _props$checkboxConfig3,
+      _props$dataSource = props.dataSource,
+      dataSource = _props$dataSource === void 0 ? [] : _props$dataSource,
+      cellKey = props.cellKey;
   var checkValues = dataSource.filter(function (v) {
     return checkKeys.includes(v[cellKey]);
   }) || [];
   return {
+    // 复选框的配置
     checkboxConfig: {
       checkKeys: checkKeys,
-      checkValues: checkValues
+      checkValues: checkValues,
+      trigger: trigger
     },
-    defaultValue: [],
+    // 分页的配置
     page: {
       pageIndex: 1,
       pageSize: 20,
       total: 0
     },
+    // 容器盒子的大小
     resize: {
       widht: 0,
       height: 0
@@ -93,18 +100,17 @@ var getInitialState = function getInitialState(_ref) {
   };
 };
 
-var LmCardTableRoot = function LmCardTableRoot(_ref2) {
-  var rowConfig = _ref2.rowConfig,
-      cellConfig = _ref2.cellConfig,
-      defaultConfig = _ref2.defaultConfig,
-      checkboxConfig = _ref2.checkboxConfig,
-      checkboxClick = _ref2.checkboxClick,
-      resetProps = (0, _objectWithoutProperties2.default)(_ref2, _excluded);
+var LmCardTableRoot = function LmCardTableRoot(props, ref) {
+  var rowConfig = props.rowConfig,
+      cellConfig = props.cellConfig,
+      defaultConfig = props.defaultConfig,
+      checkboxChange = props.checkboxChange,
+      resetProps = (0, _objectWithoutProperties2.default)(props, _excluded);
   var initialState = (0, _react.useMemo)(function () {
     return getInitialState((0, _objectSpread2.default)({
-      checkboxConfig: checkboxConfig
+      checkboxChange: checkboxChange
     }, resetProps));
-  }, [checkboxConfig, resetProps]);
+  }, [checkboxChange, resetProps]);
 
   var _useReducer = (0, _react.useReducer)(reducer, initialState),
       _useReducer2 = (0, _slicedToArray2.default)(_useReducer, 2),
@@ -120,14 +126,14 @@ var LmCardTableRoot = function LmCardTableRoot(_ref2) {
       checkKeys = _state$checkboxConfig.checkKeys,
       checkValues = _state$checkboxConfig.checkValues; // 设置选中的数据
 
-  var setSelectCells = function setSelectCells(checked, cell) {
+  var setSelectCells = function setSelectCells(checked, cell, cellIndex) {
     var nKeys = checked ? [].concat((0, _toConsumableArray2.default)(checkKeys), [cell[resetProps.cellKey]]) : checkKeys.filter(function (v) {
       return v !== cell[resetProps.cellKey];
     });
     var nValues = checked ? [].concat((0, _toConsumableArray2.default)(checkValues), [cell]) : checkValues.filter(function (v) {
       return v[resetProps.cellKey] !== cell[resetProps.cellKey];
     });
-    checkboxClick(nValues);
+    checkboxChange === null || checkboxChange === void 0 ? void 0 : checkboxChange(checked, cell, cellIndex);
     dispatch({
       type: 'changeCheckboxConfig',
       checkboxConfig: {
@@ -135,6 +141,20 @@ var LmCardTableRoot = function LmCardTableRoot(_ref2) {
         checkValues: nValues
       }
     });
+  }; // 外部设置选中的值
+
+
+  var setCheckboxKeys = function setCheckboxKeys(checkKeys) {
+    var checkValues = resetProps.dataSource.filter(function (v) {
+      return checkKeys.includes(v[resetProps.cellKey]);
+    }) || [];
+    dispatch({
+      type: 'changeCheckboxConfig',
+      checkboxConfig: {
+        checkKeys: checkKeys,
+        checkValues: checkValues
+      }
+    });
   }; // 配置对象收集
 
 
@@ -155,11 +175,21 @@ var LmCardTableRoot = function LmCardTableRoot(_ref2) {
     dispatch: dispatch
   }, config), resetProps), {}, {
     setSelectCells: setSelectCells
+  }); // 向外暴露出的方法
+
+  (0, _react.useImperativeHandle)(ref, function () {
+    return {
+      getCheckboxRecords: function getCheckboxRecords() {
+        return state.checkboxConfig.checkValues;
+      },
+      setCheckboxKeys: setCheckboxKeys
+    };
   });
   return /*#__PURE__*/_react.default.createElement(_react.default.Fragment, null, !isFullScreen && /*#__PURE__*/_react.default.createElement(_TableWrapper.default, {
     table: table
   }));
 };
 
-var _default = LmCardTableRoot;
+var _default = /*#__PURE__*/(0, _react.forwardRef)(LmCardTableRoot);
+
 exports.default = _default;

package/lib/CkFilter/baseFilter/filterMenu.js

@@ -96,6 +96,10 @@ var FilterMenu = function FilterMenu(props) {
     }); // 触发外部查询, 单击时不关闭菜单
 
     (_state$instance$onCha = (_state$instance = state.instance).onChange) === null || _state$instance$onCha === void 0 ? void 0 : _state$instance$onCha.call(_state$instance, nValue, state.customFilterValues);
+    dispatch({
+      type: 'changeComplexFilterValues',
+      complexFilterValues: {}
+    });
     !filterType && setVisible(false);
   }, [dispatch, field, state.filterValues, state.instance]); // 展示的内容
 

package/lib/CkFilter/baseFilter/index.js

@@ -54,14 +54,17 @@ var Filter = function Filter() {
       filterValues = state.filterValues,
       visibleFields = state.visibleFields,
       orderFields = state.orderFields,
-      customFilterValues = state.customFilterValues;
+      customFilterValues = state.customFilterValues,
+      complexFilterValues = state.complexFilterValues;
   var hasClear = (0, _react.useMemo)(function () {
-    var _Object$keys;
+    var _Object$keys, _Object$keys2;
 
     var obj = (0, _objectSpread2.default)({}, filterValues);
     delete obj[searchKey];
-    return ((_Object$keys = Object.keys(obj)) === null || _Object$keys === void 0 ? void 0 : _Object$keys.length) || false;
-  }, [filterValues]);
+    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);
@@ -83,17 +86,20 @@ var Filter = function Filter() {
   var handleClear = function handleClear() {
     var _inputRef$current;
 
-    console.log('inputRef.current', inputRef.current.input.value);
-
     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: (0, _defineProperty2.default)({}, searchKey, filterValues[searchKey])
+      filterValues: baseFilter
+    });
+    dispatch({
+      type: 'changeComplexFilterValues',
+      complexFilterValues: {}
     });
-    onChange === null || onChange === void 0 ? void 0 : onChange((0, _defineProperty2.default)({}, searchKey, filterValues[searchKey]), customFilterValues);
+    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", {
@@ -112,10 +118,10 @@ var Filter = function Filter() {
     return /*#__PURE__*/_react.default.createElement(_filterMenu.default, (0, _extends2.default)({
       key: v.field
     }, v));
-  }), hasClear && /*#__PURE__*/_react.default.createElement(_linkmoreDesign.Button, {
+  })), /*#__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));
+  }, "\u4E00\u952E\u6E05\u7A7A"));
 };
 
 var _default = Filter;

package/lib/CkFilter/complexFilter/drawer.js

@@ -294,9 +294,11 @@ var Index = function Index() {
       dispatch = _useStore3.dispatch;
 
   var instance = state.instance,
+      filterValues = state.filterValues,
       _state$complexDrawer = state.complexDrawer,
       visible = _state$complexDrawer.visible,
       data = _state$complexDrawer.data,
+      customFilterValues = state.customFilterValues,
       complexFilterValues = state.complexFilterValues;
   var isHas = (0, _react.useMemo)(function () {
     return (0, _utils.getIsHas)(data);
@@ -323,11 +325,17 @@ var Index = function Index() {
 
   var onSearch = function onSearch() {
     console.log('complexDrawer:', data);
+    var baseFilter = filterValues[instance.searchKey] ? (0, _defineProperty2.default)({}, instance.searchKey, filterValues[instance.searchKey]) : {};
+    dispatch({
+      type: 'changeFilterValues',
+      filterValues: baseFilter
+    });
     dispatch({
       type: 'changeComplexFilterValues',
       complexFilterValues: data
     });
     onClose();
+    instance.onChange(baseFilter, customFilterValues, data);
   };
 
   (0, _react.useEffect)(function () {
@@ -377,9 +385,9 @@ var Index = function Index() {
   }, /*#__PURE__*/_react.default.createElement(_VirtualList.default, {
     options: filterItemData,
     className: "filter_drawer_group_list"
-  }, function (_ref4) {
-    var item = _ref4.item,
-        resetProps = (0, _objectWithoutProperties2.default)(_ref4, _excluded2);
+  }, function (_ref5) {
+    var item = _ref5.item,
+        resetProps = (0, _objectWithoutProperties2.default)(_ref5, _excluded2);
     return /*#__PURE__*/_react.default.createElement("div", (0, _extends2.default)({}, resetProps, {
       className: "filter_drawer_group_item"
     }), /*#__PURE__*/_react.default.createElement(ListItemChecked, item));

package/lib/CustomTableOption/index.js

@@ -37,7 +37,7 @@ var optionsWithDisabled = [{
   value: 'default',
   imgUrl: DefaultImg
 }, {
-  label: '紧凑型',
+  label: '紧凑',
   value: 'small',
   imgUrl: SmallImg
 }, {

package/lib/CustomerService/README.md.old

@@ -0,0 +1,15 @@
+---
+nav:
+  title: 组件
+  path: /components
+group:
+  title: 组件
+  path: /basic
+hide: true
+---
+
+## CustomerService 客服弹窗按钮
+
+### 示例
+
+<code src="./demos/basic.jsx" background="#fff" />

package/lib/EnlargeImg/README.md.old

@@ -0,0 +1,21 @@
+---
+nav:
+  title: 组件
+  path: /components
+group:
+  title: 组件
+  path: /basic
+---
+
+## EnlargeImg 放大图片
+
+<code src="./demos/basic.jsx" background="#fff" />
+
+### EnlargeImg
+
+| 参数      | 说明               | 类型   | 可选 | 默认值 |
+| --------- | ------------------ | ------ | ---- | ------ |
+| src       | 图片路径           | string |      |        |
+| width     | 原始图片宽度       | number |      | 200    |
+| title     | 放大后图片标题名称 | string |      |        |
+| openWidth | 放大后图片的宽度   | number |      | 300    |

package/lib/Filter/README.md.old

@@ -0,0 +1,144 @@
+---
+nav:
+  title: 组件
+  path: /components
+group:
+  title: 组件
+  path: /basic
+---
+
+## Filter 筛选组件(废弃，请使用CkFilter)
+
+### 基本使用
+
+<code src="./demos/basic.jsx" background="#fff" />
+
+### 参数 Props
+
+| 参数         | 说明                                                                 | 类型    | 默认  |
+| ------------ | -------------------------------------------------------------------- | ------- | ----- |
+| data         | 筛选字段                                                             | []      | -     |
+| rememberList | 创建的左侧筛选项(记忆项)                                             | []      | -     |
+| getChane     | 筛选事件，接收筛选后的数据                                           | {}      | -     |
+| remember     | 是否使用记忆筛选                                                     | Boolean | false |
+| complex      | 是否使用高级筛选                                                     | Boolean | false |
+| custom       | 自定义，接收搜索事件传入值和 key（value, field）：例如：快捷筛选单选 | render  | -     |
+| defaultValue | 记忆项的默认值                                                       | render  | -     |
+
+#### Data
+
+| 参数       | 说明                                  | 类型                   | 默认  |
+| ---------- | ------------------------------------- | ---------------------- | ----- |
+| type       | 类型                                  | select/checkbox/tree…… | -     |
+| dateType   | 日期类型，仅当 type='date'时有效      | ''                     | date  |
+| title      | 文字显示                              | ''                     | -     |
+| field      | 字段关键词                            | ''                     | -     |
+| mode       | 查询关系（适用于高级筛选）            | 'and'/'or'             | 'and' |
+| api        | 接口请求                              | ''                     | -     |
+| params     | 入参,配合接口请求                     | {}                     | -     |
+| data       | 默认数据字段（非接口请求）            | []                     | -     |
+| value      | 返回数据（待定）                      | ''                     | -     |
+| more       | 是否动态加载                          | Boolean                | false |
+| fixed      | 是否固定于页面（收为更多筛选内）      | Boolean                | false |
+| expand     | 额外拓展                              | {}                     | {}    |
+| config     | 组件原生属性，仅适用于日期类型        | {}                     | {}    |
+| content    | 自定义下拉结构,e(value)事件接收一个值 | (e) => Dom             | -     |
+| renderItem | 自定义行结构（接收 label）            | Dom                    | -     |
+
+DateType
+
+| 参数        | 说明         | 类型 | 默认 |
+| ----------- | ------------ | ---- | ---- |
+| date        | 年月日       | ''   | -    |
+| rangePicker | 日期区间     | []   | -    |
+| week        | 周           | ''   | -    |
+| month       | 月           | ''   | -    |
+| quarter     | 季           | ''   | -    |
+| year        | 年           | ''   | -    |
+| time        | 时间：时分秒 | ''   | -    |
+
+rememberList 对应自定义的筛选
+
+| 参数      | 说明     | 类型    | 默认 |
+| --------- | -------- | ------- | ---- |
+| id        | key 字段 | ''      | -    |
+| value     | 值       | {}      |      |
+| label     | 文字显示 | string  |      |
+| isDefault | 是否默认 | Boolean | -    |
+| other     | 额外字段 | {}      |      |
+
+rememberList => value 对应单项 filter
+
+| 参数    | 说明         | 类型    | 默认 |
+| ------- | ------------ | ------- | ---- |
+| title   | 标题         | ''      | -    |
+| field   | 字段         | ''      |      |
+| data    | 所有选项数据 | []      |      |
+| checked | 选中的数据   | []      | -    |
+| fixed   | 是否固定     | Boolean | -    |
+| other   | 额外字段     | {}      |      |
+
+### 数据结构设计
+
+```react
+<Filter data={filter} getChange={getChange} custom={Quick} />
+//
+filter: [
+  {
+    type: 'select',
+    more: true, // 暂不扩展
+    api: 'xxx/xxx', // 暂不扩展
+    title: '状态', // 名称
+    field: 'state', // 字段
+    mode: 'and', // or或 and且 默认筛选模式
+    data: [
+      { id: '1', label: '已确认', value: 'ok' },
+      { id: '2', label: '未确认', value: 'no' },
+      { id: '3', label: '已冻结', value: 'fixed' },
+    ],
+  },{
+    type: 'checkbox',
+    more: true, // 暂不扩展
+    api: 'xxx/xxx', // 暂不扩展
+    title: '类别', // 名称
+    field: 'type', // 字段
+    mode: 'and', // or或 and且 默认筛选模式
+    data: [
+      { id: '1', label: '面料', value: 'ok' },
+      { id: '2', label: '辅料', value: 'no' },
+      { id: '3', label: '材料', value: 'fixed' },
+    ],
+  },
+]
+
+// 公用数据  *：暂未确定
+type: '', // 类型
+title: '', // 文字显示
+field: '', // 字段
+mode: 'or', // or/and 查询关系
+api: '', // 接口
+params: {}, // 入参
+data: [], // 数据字段（用于非接口）
+value: '', // 默认选中字段
+more: false, // 是否动态加载
+fixed: true, // 是否固钉于页面
+expand: {}, // 额外拓展
+content: (e) => <span onClick={() => e('333')}>333</span>, // 自定义下拉结构 e函数: 传入选中的值：e(value)
+renderItem: (label) => <span>{label}333</span>, // 自定义行结构
+```
+
+// 点击查询时应调用传入组件的回调函数，并把筛选好的字段数据传给回调，页面会自动筛选，cb 函数应为页面加载表格数据函数，统一用这一个函数处理高级筛选及普通筛选
+
+```js
+const field = {
+  xxx: 123,
+  xxxx: [1, 2, 3],
+  xxxxx: {
+    type: 0,
+  },
+}
+
+cb(field)
+```
+
+// 点击重置时重置组件状态并且调用 cb 函数传参 clear 则页面清空

package/lib/IconFont/font/iconfont.css

@@ -1,8 +1,8 @@
 @font-face {
   font-family: "iconfont"; /* Project id 2966019 */
-  src: url('iconfont.woff2?t=1659492914541') format('woff2'),
-       url('iconfont.woff?t=1659492914541') format('woff'),
-       url('iconfont.ttf?t=1659492914541') format('truetype');
+  src: url('iconfont.woff2?t=1659530996650') format('woff2'),
+       url('iconfont.woff?t=1659530996650') format('woff'),
+       url('iconfont.ttf?t=1659530996650') format('truetype');
 }
 
 .iconfont {
@@ -13,16 +13,16 @@
   -moz-osx-font-smoothing: grayscale;
 }
 
-.lmweb-icon_application_light:before {
-  content: "\e6c7";
+.lmweb-a-icon_m_nullify1:before {
+  content: "\e6cc";
 }
 
-.lmweb-icon_m_nullify:before {
-  content: "\e657";
+.lmweb-a-icon_m_data1:before {
+  content: "\e6cd";
 }
 
-.lmweb-icon_m_data:before {
-  content: "\e658";
+.lmweb-icon_application_light:before {
+  content: "\e6c7";
 }
 
 .lmweb-icon_china1:before {