@lemon-fe/components 0.1.81 → 0.1.84

package/es/BaseTable/index.js

@@ -316,9 +316,11 @@ function BaseTable(props) {
     var newColumns = traverse(columns);
 
     if (isFixedLayout && !hasAutoWidthCol) {
-      newColumns.push({
+      var emptyCol = {
         title: ''
-      });
+      };
+      newColumns.push(emptyCol);
+      flattenCols.push(emptyCol);
     }
 
     return [newColumns, flattenCols];

package/es/BaseTable/index.less

@@ -24,6 +24,7 @@
     align-items: center;
     justify-content: flex-end;
     height: 100%;
+    padding-left: 8px;
     white-space: nowrap;
     background-color: inherit;
 

package/es/ColorPicker/index.d.ts

@@ -0,0 +1,13 @@
+import React from 'react';
+export interface IColorPickerProps {
+    /** 选中的颜色，例：rgba(255, 255, 255, 0) */
+    value?: string;
+    /** 是否禁用透明度 */
+    disableAlpha?: boolean;
+    /** 颜色变化回调 */
+    onChange?: (val: string) => void;
+    /** 是否使用渐变选择器 */
+    gradientEnable?: boolean;
+}
+declare const ColorPicker: React.FC<IColorPickerProps>;
+export default ColorPicker;

package/es/ColorPicker/index.js

@@ -0,0 +1,114 @@
+function _slicedToArray(arr, i) { return _arrayWithHoles(arr) || _iterableToArrayLimit(arr, i) || _unsupportedIterableToArray(arr, i) || _nonIterableRest(); }
+
+function _nonIterableRest() { throw new TypeError("Invalid attempt to destructure non-iterable instance.\nIn order to be iterable, non-array objects must have a [Symbol.iterator]() method."); }
+
+function _unsupportedIterableToArray(o, minLen) { if (!o) return; if (typeof o === "string") return _arrayLikeToArray(o, minLen); var n = Object.prototype.toString.call(o).slice(8, -1); if (n === "Object" && o.constructor) n = o.constructor.name; if (n === "Map" || n === "Set") return Array.from(o); if (n === "Arguments" || /^(?:Ui|I)nt(?:8|16|32)(?:Clamped)?Array$/.test(n)) return _arrayLikeToArray(o, minLen); }
+
+function _arrayLikeToArray(arr, len) { if (len == null || len > arr.length) len = arr.length; for (var i = 0, arr2 = new Array(len); i < len; i++) { arr2[i] = arr[i]; } return arr2; }
+
+function _iterableToArrayLimit(arr, i) { var _i = arr == null ? null : typeof Symbol !== "undefined" && arr[Symbol.iterator] || arr["@@iterator"]; if (_i == null) return; var _arr = []; var _n = true; var _d = false; var _s, _e; try { for (_i = _i.call(arr); !(_n = (_s = _i.next()).done); _n = true) { _arr.push(_s.value); if (i && _arr.length === i) break; } } catch (err) { _d = true; _e = err; } finally { try { if (!_n && _i["return"] != null) _i["return"](); } finally { if (_d) throw _e; } } return _arr; }
+
+function _arrayWithHoles(arr) { if (Array.isArray(arr)) return arr; }
+
+import { Tooltip } from 'antd';
+import React, { useEffect, useState } from 'react';
+import colorString from 'color-string';
+import ReactGPicker from 'react-gcolor-picker';
+import { SketchPicker } from 'react-color';
+var DEFAULT_COLORS = ['#FFD5B6', '#F5A623', '#F8E71C', '#8B572A', '#7ED321', '#417505', '#BD10E0', '#9013FE', '#456ad4', '#4A90E2', '#50E3C2', '#B8E986', '#000000', '#4A4A4A', '#9B9B9B', '#FFFFFF'];
+var DEFAULT_COLOR = 'rgba(255, 255, 255, 0)';
+
+var ColorPicker = function ColorPicker(_ref) {
+  var _ref$value = _ref.value,
+      value = _ref$value === void 0 ? DEFAULT_COLOR : _ref$value,
+      disableAlpha = _ref.disableAlpha,
+      gradientEnable = _ref.gradientEnable,
+      _onChange = _ref.onChange;
+
+  var _useState = useState(false),
+      _useState2 = _slicedToArray(_useState, 2),
+      pickerShow = _useState2[0],
+      setPickerShow = _useState2[1];
+
+  var _useState3 = useState(),
+      _useState4 = _slicedToArray(_useState3, 2),
+      hexColor = _useState4[0],
+      setHexColor = _useState4[1];
+
+  var _useState5 = useState(),
+      _useState6 = _slicedToArray(_useState5, 2),
+      alpha = _useState6[0],
+      setAlpha = _useState6[1];
+
+  useEffect(function () {
+    if (!gradientEnable) {
+      var rgbaColorArr = colorString.get.rgb(value);
+
+      if (!rgbaColorArr) {
+        rgbaColorArr = colorString.get.rgb(DEFAULT_COLOR);
+      }
+
+      setHexColor(colorString.to.hex(rgbaColorArr));
+      setAlpha(rgbaColorArr[3]);
+    }
+  }, [value]);
+
+  var handlePickerShow = function handlePickerShow() {
+    setPickerShow(function (val) {
+      return !val;
+    });
+  };
+
+  var handleColorChange = function handleColorChange(val, event) {
+    var _val$rgb$a;
+
+    event.stopPropagation();
+    _onChange === null || _onChange === void 0 ? void 0 : _onChange("rgba(".concat(val.rgb.r, ", ").concat(val.rgb.g, ", ").concat(val.rgb.b, ", ").concat((_val$rgb$a = val.rgb.a) !== null && _val$rgb$a !== void 0 ? _val$rgb$a : 1, ")"));
+  };
+
+  return /*#__PURE__*/React.createElement("div", null, /*#__PURE__*/React.createElement("div", {
+    style: {
+      border: pickerShow ? '2px solid rgb(69, 143, 255)' : undefined
+    },
+    className: "lemon-color-picker",
+    onClick: handlePickerShow
+  }, /*#__PURE__*/React.createElement("div", {
+    className: "lemon-color-picker-color",
+    style: {
+      background: value,
+      width: gradientEnable ? '100%' : 120
+    }
+  }), !gradientEnable && /*#__PURE__*/React.createElement(React.Fragment, null, /*#__PURE__*/React.createElement("div", {
+    className: "lemon-color-picker-hex"
+  }, hexColor === null || hexColor === void 0 ? void 0 : hexColor.toLocaleUpperCase()), /*#__PURE__*/React.createElement(Tooltip, {
+    placement: "topRight",
+    title: "\u989C\u8272\u7684\u900F\u660E\u5EA6\uFF0C0\u8868\u793A\u900F\u660E\uFF0C100\u8868\u793A\u4E0D\u900F\u660E"
+  }, /*#__PURE__*/React.createElement("div", {
+    className: "lemon-color-picker-alpha"
+  }, Math.floor(Number(alpha) * 100), "%"))), pickerShow && /*#__PURE__*/React.createElement(React.Fragment, null, /*#__PURE__*/React.createElement("div", {
+    className: "lemon-color-picker-pop",
+    onClick: function onClick(e) {
+      return e.stopPropagation();
+    }
+  }, gradientEnable ? /*#__PURE__*/React.createElement("div", {
+    className: "lemon-color-picker-react-picker"
+  }, /*#__PURE__*/React.createElement(ReactGPicker, {
+    showAlpha: !disableAlpha,
+    value: value,
+    onChange: function onChange(v) {
+      _onChange === null || _onChange === void 0 ? void 0 : _onChange(v);
+    },
+    format: "hex",
+    gradient: true,
+    solid: false
+  })) : /*#__PURE__*/React.createElement(SketchPicker, {
+    disableAlpha: disableAlpha,
+    onChange: handleColorChange,
+    color: value,
+    presetColors: DEFAULT_COLORS
+  })), /*#__PURE__*/React.createElement("div", {
+    className: "lemon-color-picker-mask"
+  }))));
+};
+
+export default ColorPicker;

package/es/ColorPicker/index.less

@@ -0,0 +1,47 @@
+.lemon-color-picker {
+  position: relative;
+  display: flex;
+  align-items: center;
+  justify-content: space-between;
+  height: 36px;
+  padding: 6px;
+  color: #333;
+  border: 1px solid #ccc;
+  border-radius: 2px;
+  cursor: pointer;
+
+  &-hex {
+    user-select: none;
+  }
+
+  &-color {
+    width: 120px;
+    height: 100%;
+    border-radius: 2px;
+  }
+
+  &-alpha {
+    padding: 0 6px 0 12px;
+    line-height: 20px;
+    border-left: 1px solid #ccc;
+    user-select: none;
+  }
+  &-pop {
+    position: absolute;
+    top: 40px;
+    left: 0;
+    z-index: 1000;
+  }
+  &-react-picker {
+    border-radius: 4px;
+    box-shadow: #00000026 0 0 0 1px, #00000026 0 8px 16px;
+  }
+  &-mask {
+    position: fixed;
+    top: 0;
+    left: 0;
+    z-index: 800;
+    width: 100%;
+    height: 100%;
+  }
+}

package/es/Filter/index.js

@@ -338,7 +338,7 @@ function Filter(props) {
 
   var handleFinish = function handleFinish() {
     if (onChange) {
-      onChange(form.getFieldsValue(true));
+      onChange(_objectSpread({}, form.getFieldsValue(true)));
     }
   };
 

package/es/index.d.ts

@@ -12,6 +12,7 @@ export type { TableProps, TableRef } from './Table/typings';
 export { default as DurationPicker } from './DurationPicker';
 export { default as InputMaxLength } from './InputMaxLength';
 export { default as TipMark } from './TipMark';
+export { default as ColorPicker } from './ColorPicker';
 export { default as EditableTable } from './EditableTable';
 export { default as EditableCell } from './EditableTable/EditableCell';
 export type { EditableTableProps, EditableTableColumnType, EditableCellFocusedType, EditableTableRef, EditableTableRule, } from './EditableTable/typings';

package/es/index.js

@@ -9,6 +9,7 @@ export { default as Table } from './Table';
 export { default as DurationPicker } from './DurationPicker';
 export { default as InputMaxLength } from './InputMaxLength';
 export { default as TipMark } from './TipMark';
+export { default as ColorPicker } from './ColorPicker';
 export { default as EditableTable } from './EditableTable';
 export { default as EditableCell } from './EditableTable/EditableCell';
 export { default as Popup } from './Popup';

package/es/index.less

@@ -11,6 +11,7 @@
 @import './DurationPicker/index.less';
 @import './InputMaxLength/index.less';
 @import './TipMark/index.less';
+@import './ColorPicker/index.less';
 @import './Popup/index.less';
 @import './SiderTree/index.less';
 @import './FormLayout/index.less';

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@lemon-fe/components",
-  "version": "0.1.81",
+  "version": "0.1.84",
   "description": "> TODO: description",
   "author": "鲁盛杰 <lusj@cnlemon.net>",
   "homepage": "",
@@ -19,6 +19,8 @@
     "@lemon-fe/hooks": "^0.1.67",
     "classnames": "^2.2.6",
     "lodash": "^4.17.21",
+    "react-color": "^2.19.3",
+    "react-gcolor-picker": "^1.2.4",
     "react-resizable": "^3.0.4"
   },
   "peerDependencies": {
@@ -35,11 +37,12 @@
   "devDependencies": {
     "@types/color-string": "^1.5.2",
     "@types/lodash": "^4.14.179",
+    "@types/react-color": "^3.0.6",
     "@types/react-resizable": "^1.7.4",
     "antd": "^4.21.6",
     "rc-resize-observer": "^1.2.0",
     "react": "^17.0.2",
     "react-dom": "^17.0.2"
   },
-  "gitHead": "64ff3935c062ee3fffcdae9f4f22f9368fa989e2"
+  "gitHead": "ae233db2d69aafb8ea66f3df49e8be7f4820b7ad"
 }