linkmore-design 1.0.59 → 1.0.60

package/lib/CardTable/table/TableRoot.js

@@ -22,14 +22,16 @@ var _TableWrapper = _interopRequireDefault(require("./TableWrapper"));
 var _fns = _interopRequireDefault(require("../fns"));
 
 var _excluded = ["checkKeys", "trigger", "checkMethod"],
-    _excluded2 = ["rowConfig", "cellConfig", "defaultConfig", "checkboxConfig", "pagerConfig", "toolbarConfig"];
+    _excluded2 = ["checkKey", "trigger"],
+    _excluded3 = ["rowConfig", "cellConfig", "defaultConfig", "checkboxConfig", "radioConfig", "selectionConfig", "pagerConfig", "toolbarConfig"];
 
 var reducer = function reducer(state, action) {
   var page = action.page,
       resize = action.resize,
       columnCount = action.columnCount,
       rows = action.rows,
-      checkboxConfig = action.checkboxConfig;
+      checkboxConfig = action.checkboxConfig,
+      radioConfig = action.radioConfig;
 
   switch (action.type) {
     case 'changePage':
@@ -59,6 +61,12 @@ var reducer = function reducer(state, action) {
         checkboxConfig: (0, _objectSpread2.default)((0, _objectSpread2.default)({}, state.checkboxConfig), checkboxConfig)
       });
 
+    case 'changeRadioConfig':
+      // 单选中的Key
+      return (0, _objectSpread2.default)((0, _objectSpread2.default)({}, state), {}, {
+        radioConfig: (0, _objectSpread2.default)((0, _objectSpread2.default)({}, state.radioConfig), radioConfig)
+      });
+
     default:
       throw new Error();
   }
@@ -67,27 +75,43 @@ var reducer = function reducer(state, action) {
 
 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$checkboxConfig4 = _props$checkboxConfig.checkMethod,
-      checkMethod = _props$checkboxConfig4 === void 0 ? true : _props$checkboxConfig4,
-      resetCheckCOnfig = (0, _objectWithoutProperties2.default)(_props$checkboxConfig, _excluded),
+      checkboxConfig = _props$checkboxConfig === void 0 ? {} : _props$checkboxConfig,
+      _props$radioConfig = props.radioConfig,
+      radioConfig = _props$radioConfig === void 0 ? {} : _props$radioConfig,
       _props$dataSource = props.dataSource,
       dataSource = _props$dataSource === void 0 ? [] : _props$dataSource,
       cellKey = props.cellKey;
+  var _checkboxConfig$check = checkboxConfig.checkKeys,
+      checkKeys = _checkboxConfig$check === void 0 ? [] : _checkboxConfig$check,
+      _checkboxConfig$trigg = checkboxConfig.trigger,
+      checkboxTrigger = _checkboxConfig$trigg === void 0 ? 'default' : _checkboxConfig$trigg,
+      _checkboxConfig$check2 = checkboxConfig.checkMethod,
+      checkMethod = _checkboxConfig$check2 === void 0 ? true : _checkboxConfig$check2,
+      resetCheckCOnfig = (0, _objectWithoutProperties2.default)(checkboxConfig, _excluded);
+  var _radioConfig$checkKey = radioConfig.checkKey,
+      checkKey = _radioConfig$checkKey === void 0 ? '' : _radioConfig$checkKey,
+      _radioConfig$trigger = radioConfig.trigger,
+      radioTrigger = _radioConfig$trigger === void 0 ? 'default' : _radioConfig$trigger,
+      resetRadioConfig = (0, _objectWithoutProperties2.default)(radioConfig, _excluded2);
   var checkValues = dataSource.filter(function (v) {
     return checkKeys.includes(v[cellKey]);
   }) || [];
+  var checkValue = dataSource.find(function (v) {
+    return checkKey === v[cellKey];
+  });
   return {
     // 复选框的配置
     checkboxConfig: (0, _objectSpread2.default)({
       checkKeys: checkKeys,
       checkValues: checkValues,
-      trigger: trigger,
+      trigger: checkboxTrigger,
       checkMethod: checkMethod
     }, resetCheckCOnfig),
+    radioConfig: (0, _objectSpread2.default)({
+      checkKey: checkKey,
+      checkValue: checkValue,
+      trigger: radioTrigger
+    }, resetRadioConfig),
     // 分页的配置
     page: {
       pageIndex: 1,
@@ -127,9 +151,11 @@ var LmCardTableRoot = function LmCardTableRoot(props, ref) {
         cellConfig = props.cellConfig,
         defaultConfig = props.defaultConfig,
         checkboxConfig = props.checkboxConfig,
+        radioConfig = props.radioConfig,
+        selectionConfig = props.selectionConfig,
         pagerConfig = props.pagerConfig,
         toolbarConfig = props.toolbarConfig,
-        resetProps = (0, _objectWithoutProperties2.default)(props, _excluded2);
+        resetProps = (0, _objectWithoutProperties2.default)(props, _excluded3);
     return (0, _objectSpread2.default)((0, _objectSpread2.default)({}, resetProps), {}, {
       rowConfig: (0, _objectSpread2.default)({
         // 行配置
@@ -140,6 +166,10 @@ var LmCardTableRoot = function LmCardTableRoot(props, ref) {
         width: 192,
         height: 282
       }, cellConfig),
+      selectionConfig: (0, _objectSpread2.default)({
+        type: ['checkbox', 'radio']
+      }, selectionConfig),
+      radioConfig: (0, _objectSpread2.default)({}, radioConfig),
       checkboxConfig: (0, _objectSpread2.default)({}, checkboxConfig),
       pagerConfig: (0, _objectSpread2.default)({}, pagerConfig),
       toolbarConfig: (0, _objectSpread2.default)({}, toolbarConfig),
@@ -151,9 +181,9 @@ var LmCardTableRoot = function LmCardTableRoot(props, ref) {
     return (0, _fns.default)({
       state: state,
       dispatch: dispatch,
-      props: props
+      props: configProps
     });
-  }, [state, dispatch, props]);
+  }, [state, dispatch, configProps]);
   var table = (0, _objectSpread2.default)((0, _objectSpread2.default)((0, _objectSpread2.default)({}, configProps), eventProps), {}, {
     state: state,
     dispatch: dispatch
@@ -163,6 +193,9 @@ var LmCardTableRoot = function LmCardTableRoot(props, ref) {
     return (0, _objectSpread2.default)({
       getCheckboxRecords: function getCheckboxRecords() {
         return state.checkboxConfig.checkValues;
+      },
+      getRadioRecord: function getRadioRecord() {
+        return state.radioConfig.checkValue;
       }
     }, eventProps);
   });

package/lib/Dropdown/index.js

@@ -124,7 +124,7 @@ LMDropdown.Button = function (props) {
         type: 'lmweb-down'
       }),
       overlayClassName: (0, _classnames.default)(props.overlayClassName, 'lm_dropdown_overlay'),
-      className: (0, _classnames.default)(props.className, 'lm_dropdown_button', props.disabled ? 'disabled' : '')
+      className: (0, _classnames.default)(props.className, 'lm_dropdown_button', props.disabled ? 'disabled' : '', props.type)
     }));
   }
 
@@ -140,7 +140,7 @@ LMDropdown.Button = function (props) {
     overlayStyle: minwidth ? Object.assign({
       minWidth: minwidth
     }, props.overlayStyle) : Object.assign({}, props.overlayStyle),
-    className: (0, _classnames.default)(props.className, 'lm_dropdown_button', props.disabled ? 'disabled' : '')
+    className: (0, _classnames.default)(props.className, 'lm_dropdown_button', props.disabled ? 'disabled' : '', props.type)
   })));
 };
 

package/lib/Dropdown/style/index.css

@@ -528,10 +528,13 @@ html {
   background-color: var(--disabled-bg-color);
 }
 .lm_dropdown_button {
-  border-radius: 2px;
+  border-radius: 4px;
   border: 1px solid var(--color-15);
   box-sizing: content-box;
 }
+.lm_dropdown_button.primary {
+  border: 1px solid var(--primary-color);
+}
 .lm_dropdown_button .ant-btn {
   height: 30px;
   border-top: 0px;
@@ -557,13 +560,28 @@ html {
 .lm_dropdown_button .ant-btn .lm_default_icon {
   color: var(--text-color);
 }
+.lm_dropdown_button .ant-btn-primary .anticon {
+  color: var(--color-contrast);
+}
 .lm_dropdown_button:hover {
   color: var(--primary-hover-color) !important;
   border: 1px solid var(--primary-hover-color);
+  border-radius: 4px;
 }
 .lm_dropdown_button:hover .ant-btn {
   color: var(--primary-hover-color) !important;
 }
+.lm_dropdown_button:hover .anticon {
+  color: var(--primary-hover-color);
+}
+.lm_dropdown_button:hover .ant-btn-primary {
+  background-color: var(--primary-hover-color);
+  color: var(--color-contrast) !important;
+  position: relative;
+}
+.lm_dropdown_button:hover .ant-btn-primary .anticon {
+  color: var(--color-contrast);
+}
 .lm_dropdown_button.disabled {
   color: var(--disabled-font-color) !important;
   border: 1px solid var(--disabled-border-color);

package/lib/Form/index.d.ts

@@ -1,22 +1,27 @@
 import React from 'react';
-import { Form as AntdForm, FormInstance, FormProps, List } from 'antd';
+import { Form as AntdForm, FormInstance, FormProps, List, FormItemProps } from 'antd';
 import useFormInstance from 'antd/lib/form/hooks/useFormInstance';
 import { FormProvider } from 'antd/lib/form/context';
 import { useForm, useWatch } from 'antd/lib/form/Form';
 export interface LmFormProps extends FormProps {
     responsive?: Boolean;
 }
+export interface LmFormItemProps extends FormItemProps {
+    useStatus: any;
+    errorPlacement?: string;
+}
 declare const Reform: <Values = any>(props: FormProps<Values> & {
     children?: React.ReactNode;
 } & {
     ref?: React.Ref<FormInstance<Values>>;
 }) => React.ReactElement;
+declare const LMFormItem: (props: LmFormItemProps) => JSX.Element;
 declare type InternalFormType = typeof Reform;
 interface FormInterface extends InternalFormType {
     useForm: typeof useForm;
     useFormInstance: typeof useFormInstance;
     useWatch: typeof useWatch;
-    Item: typeof AntdForm.Item;
+    Item: typeof LMFormItem;
     List: typeof List;
     ErrorList: typeof AntdForm.ErrorList;
     Provider: typeof FormProvider;

package/lib/Form/index.js

@@ -40,6 +40,7 @@ var __rest = void 0 && (void 0).__rest || function (s, e) {
   return t;
 };
 
+// import useFormItemStatus from 'antd/lib/form/hooks/useFormItemStatus';
 var classNamePrefix = 'lm_form';
 
 var LMForm = function LMForm(props, ref) {
@@ -67,8 +68,22 @@ var LMForm = function LMForm(props, ref) {
 
 var Reform = /*#__PURE__*/_react.default.forwardRef(LMForm);
 
+var LMFormItem = function LMFormItem(props) {
+  var children = props.children,
+      className = props.className,
+      _props$errorPlacement = props.errorPlacement,
+      errorPlacement = _props$errorPlacement === void 0 ? 'default' : _props$errorPlacement,
+      restProps = __rest(props, ["children", "className", "errorPlacement"]);
+
+  var tipClassName = errorPlacement === 'default' ? '' : "lm_form-item-tip-error lm_form-item-tip-error-".concat(errorPlacement);
+  var classes = (0, _classnames.default)(className, tipClassName);
+  return /*#__PURE__*/_react.default.createElement(_form.default.Item, Object.assign({
+    className: classes
+  }, restProps), children);
+};
+
 var Form = Reform;
-Form.Item = _form.default.Item;
+Form.Item = LMFormItem;
 Form.List = _list.default;
 Form.ErrorList = _form.default.ErrorList;
 Form.useForm = _Form2.useForm;

package/lib/Form/style/index.css

@@ -564,3 +564,84 @@ html {
 .lm_container_wrapper .lm_container.responsive.lm_col_5 .ant-form-item:nth-of-type(5n) {
   margin-right: 0;
 }
+.lm_form .lm_form-item-tip-error .ant-form-item-explain {
+  position: absolute;
+  display: flex;
+  top: 0;
+  left: 100%;
+  z-index: 100;
+  color: #FA4F53;
+  pointer-events: none;
+}
+.lm_form .lm_form-item-tip-error .ant-form-item-explain::before {
+  content: ' ';
+  position: absolute;
+  z-index: 10;
+  display: inline-block;
+  height: 0;
+  width: 0;
+  background-color: #fff;
+  transform: rotate(45deg);
+  border-width: 4px;
+  border-style: solid;
+}
+.lm_form .lm_form-item-tip-error .ant-form-item-explain .ant-form-item-explain-error {
+  line-height: 20px;
+  font-size: 12px;
+  background-color: #fff;
+  padding: 6px 8px;
+  box-shadow: 0 0 6px 2px #e3e3e3;
+  border-radius: 2px;
+}
+.lm_form .lm_form-item-tip-error-right .ant-form-item-explain::before {
+  box-shadow: -1px 1px 1px 0px #f0f0f0;
+  border-color: transparent transparent #fff #fff;
+  margin-left: 3px;
+  margin-top: 12px;
+}
+.lm_form .lm_form-item-tip-error-right .ant-form-item-explain .ant-form-item-explain-error {
+  margin-left: 7px;
+}
+.lm_form .lm_form-item-tip-error-left .ant-form-item-explain {
+  left: -100%;
+  justify-content: flex-end;
+  padding-right: 7px;
+}
+.lm_form .lm_form-item-tip-error-left .ant-form-item-explain::before {
+  box-shadow: 1px -1px 1px 0px #f0f0f0;
+  border-color: #fff #fff transparent transparent;
+  margin-left: -11px;
+  margin-top: 12px;
+  left: 100%;
+}
+.lm_form .lm_form-item-tip-error-left .ant-form-item-explain .ant-form-item-explain-error {
+  margin-left: -4px;
+}
+.lm_form .lm_form-item-tip-error-top .ant-form-item-explain {
+  top: -39px;
+  left: 0;
+  justify-content: center;
+}
+.lm_form .lm_form-item-tip-error-top .ant-form-item-explain::before {
+  box-shadow: 1px 1px 1px 0px #f0f0f0;
+  border-color: transparent #fff #fff transparent;
+  background-color: #fff;
+  margin-top: 28px;
+}
+.lm_form .lm_form-item-tip-error-top .ant-form-item-explain .ant-form-item-explain-error {
+  margin-left: -4px;
+}
+.lm_form .lm_form-item-tip-error-bottom .ant-form-item-explain {
+  top: 39px;
+  left: 0;
+  justify-content: center;
+}
+.lm_form .lm_form-item-tip-error-bottom .ant-form-item-explain::before {
+  box-shadow: -1px -1px 1px 0px #f0f0f0;
+  border-color: #fff transparent transparent #fff;
+  background-color: #fff;
+  margin-top: -4px;
+}
+.lm_form .lm_form-item-tip-error-bottom .ant-form-item-explain .ant-form-item-explain-error {
+  margin-left: -4px;
+}

package/lib/IconFont/index.js

@@ -8,7 +8,7 @@ exports.default = void 0;
 var _icons = require("@ant-design/icons");
 
 var IconFont = (0, _icons.createFromIconfontCN)({
-  scriptUrl: '//at.alicdn.com/t/c/font_2966019_sw56tprypkb.js' // 在 iconfont.cn 上生成
+  scriptUrl: '//at.alicdn.com/t/c/font_2966019_totaqlvhjak.js' // 在 iconfont.cn 上生成
   // scriptUrl: require('./font/iconfont.js'),
 
 });

package/lib/LmEditTable/EditTable.js

@@ -267,10 +267,11 @@ var EditableCell = function EditableCell(props) {
       handleSave = props.handleSave,
       handleAdd = props.handleAdd,
       handleDelete = props.handleDelete,
+      handleCopy = props.handleCopy,
       itemProps = props.itemProps,
       setValid = props.setValid,
       reWriteOriginSource = props.reWriteOriginSource,
-      restProps = __rest(props, ["record", "rowKey", "isEdit", "col", "handleTableRowDelete", "handleTableRowAdd", "getLength", "isHoverEdit", "editEnum", "valueType", "children", "handleSave", "handleAdd", "handleDelete", "itemProps", "setValid", "reWriteOriginSource"]);
+      restProps = __rest(props, ["record", "rowKey", "isEdit", "col", "handleTableRowDelete", "handleTableRowAdd", "getLength", "isHoverEdit", "editEnum", "valueType", "children", "handleSave", "handleAdd", "handleDelete", "handleCopy", "itemProps", "setValid", "reWriteOriginSource"]);
   /** 去除移入移出功能，保留最纯粹的功能，优化性能 */
 
 
@@ -294,44 +295,45 @@ var EditableCell = function EditableCell(props) {
         while (1) {
           switch (_context.prev = _context.next) {
             case 0:
-              console.log(row, 'rrr', form.getFieldsValue(), record);
-              _context.prev = 1;
+              _context.prev = 0;
               _context.t0 = row;
 
               if (_context.t0) {
-                _context.next = 7;
+                _context.next = 6;
                 break;
               }
 
-              _context.next = 6;
+              _context.next = 5;
               return form.getFieldsValue();
 
-            case 6:
+            case 5:
               _context.t0 = _context.sent;
 
-            case 7:
+            case 6:
               values = _context.t0;
-              console.log(Object.assign(Object.assign({}, values), (0, _defineProperty2.default)({}, rowKey, record === null || record === void 0 ? void 0 : record[rowKey])), 'vvvv');
+              console.log(Object.assign(Object.assign({
+                record: record
+              }, values), (0, _defineProperty2.default)({}, rowKey, record === null || record === void 0 ? void 0 : record[rowKey])), 'vvvv');
               console.time('testForEach');
-              handleSave(Object.assign(Object.assign({}, values), (0, _defineProperty2.default)({}, rowKey, record === null || record === void 0 ? void 0 : record[rowKey])));
+              handleSave(Object.assign(Object.assign(Object.assign({}, record), values), (0, _defineProperty2.default)({}, rowKey, record === null || record === void 0 ? void 0 : record[rowKey])));
               console.timeEnd('testForEach');
-              _context.next = 14;
+              _context.next = 13;
               return form.validateFields();
 
-            case 14:
-              _context.next = 18;
+            case 13:
+              _context.next = 17;
               break;
 
-            case 16:
-              _context.prev = 16;
-              _context.t1 = _context["catch"](1);
+            case 15:
+              _context.prev = 15;
+              _context.t1 = _context["catch"](0);
 
-            case 18:
+            case 17:
             case "end":
               return _context.stop();
           }
         }
-      }, _callee, null, [[1, 16]]);
+      }, _callee, null, [[0, 15]]);
     }));
   }; // 触发保存
 
@@ -339,6 +341,15 @@ var EditableCell = function EditableCell(props) {
   var handleFormItemChange = function handleFormItemChange(e) {
     save === null || save === void 0 ? void 0 : save();
   };
+  /** 快捷刷子，把当前的所有列的值，刷成当前的选中的列 */
+
+
+  var copyKey = function copyKey(e) {
+    e === null || e === void 0 ? void 0 : e.stopPropagation();
+    console.log(rowKey, record[rowKey], 'fff');
+    var dataIndex = col.dataIndex;
+    handleCopy === null || handleCopy === void 0 ? void 0 : handleCopy(dataIndex, record[dataIndex]);
+  };
 
   var Control = function Control(con) {
     switch (con) {
@@ -360,6 +371,10 @@ var EditableCell = function EditableCell(props) {
             noStyle: true
           }, /*#__PURE__*/_react.default.cloneElement(componentProps.addonAfter, {
             onChange: handleFormItemChange
+          })) : null,
+          suffix: componentProps.quickcopy ? /*#__PURE__*/_react.default.createElement("span", null, /*#__PURE__*/_react.default.createElement(_linkmoreDesign.IconFont, {
+            onClick: copyKey,
+            type: 'lmweb-icon_m_brush'
           })) : null
         }));
 
@@ -742,6 +757,20 @@ var EditTable = /*#__PURE__*/(0, _react.forwardRef)(function (props, ref) {
     }
   };
 
+  var handleCopy = function handleCopy(key, value) {
+    var res = (0, _immer.produce)(dataSourceRef.current, function (draft) {
+      draft.forEach(function (item) {
+        return item[key] = value;
+      });
+    });
+
+    if (onChange) {
+      onChange === null || onChange === void 0 ? void 0 : onChange(res);
+    } else {
+      setDataSource(res);
+    }
+  };
+
   var resultColumns = (0, _react.useMemo)(function () {
     var localColumns = [sortOpen ? {
       title: '',
@@ -815,6 +844,7 @@ var EditTable = /*#__PURE__*/(0, _react.forwardRef)(function (props, ref) {
             isHoverEdit: isHoverEdit,
             handleAdd: handleAdd,
             handleDelete: handleDelete,
+            handleCopy: handleCopy,
             editEnum: typeof col.editEnum === 'function' ? col.editEnum(record) : col.editEnum,
             valueType: typeof col.valueType === 'function' ? col.valueType(record) : col.valueType,
             handleSave: handleSave,

package/lib/LmFilter/LmFilter.js

@@ -19,7 +19,7 @@ var _react = _interopRequireWildcard(require("react"));
 
 var _FilterRoot = _interopRequireDefault(require("./wrapper/FilterRoot"));
 
-var _localization = require("./localization.tsx");
+var _localization = require("./localization");
 
 var _excluded = ["localization"];
 

package/package.json

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