@aloudata/aloudata-design 0.4.0-beta.10 → 0.4.0-beta.12

package/lib/Steps/components/Step/index.js

@@ -1,31 +1,26 @@
 "use strict";
 
+function _typeof(obj) { "@babel/helpers - typeof"; return _typeof = "function" == typeof Symbol && "symbol" == typeof Symbol.iterator ? function (obj) { return typeof obj; } : function (obj) { return obj && "function" == typeof Symbol && obj.constructor === Symbol && obj !== Symbol.prototype ? "symbol" : typeof obj; }, _typeof(obj); }
 Object.defineProperty(exports, "__esModule", {
   value: true
 });
 exports.Step = Step;
-
 require("@aloudata/icons-react/styles/index.less");
-
 var _CheckFill2 = _interopRequireDefault(require("@aloudata/icons-react/es/icons/CheckFill"));
-
 var _ErrorFill2 = _interopRequireDefault(require("@aloudata/icons-react/es/icons/ErrorFill"));
-
 require("antd/es/steps/style");
-
 var _steps = _interopRequireDefault(require("antd/es/steps"));
-
 var _react = _interopRequireDefault(require("react"));
-
 var _ProcessIcon = require("../ProcessIcon");
-
 function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { default: obj }; }
-
+function ownKeys(object, enumerableOnly) { var keys = Object.keys(object); if (Object.getOwnPropertySymbols) { var symbols = Object.getOwnPropertySymbols(object); enumerableOnly && (symbols = symbols.filter(function (sym) { return Object.getOwnPropertyDescriptor(object, sym).enumerable; })), keys.push.apply(keys, symbols); } return keys; }
+function _objectSpread(target) { for (var i = 1; i < arguments.length; i++) { var source = null != arguments[i] ? arguments[i] : {}; i % 2 ? ownKeys(Object(source), !0).forEach(function (key) { _defineProperty(target, key, source[key]); }) : Object.getOwnPropertyDescriptors ? Object.defineProperties(target, Object.getOwnPropertyDescriptors(source)) : ownKeys(Object(source)).forEach(function (key) { Object.defineProperty(target, key, Object.getOwnPropertyDescriptor(source, key)); }); } return target; }
+function _defineProperty(obj, key, value) { key = _toPropertyKey(key); if (key in obj) { Object.defineProperty(obj, key, { value: value, enumerable: true, configurable: true, writable: true }); } else { obj[key] = value; } return obj; }
+function _toPropertyKey(arg) { var key = _toPrimitive(arg, "string"); return _typeof(key) === "symbol" ? key : String(key); }
+function _toPrimitive(input, hint) { if (_typeof(input) !== "object" || input === null) return input; var prim = input[Symbol.toPrimitive]; if (prim !== undefined) { var res = prim.call(input, hint || "default"); if (_typeof(res) !== "object") return res; throw new TypeError("@@toPrimitive must return a primitive value."); } return (hint === "string" ? String : Number)(input); }
 var AntdStep = _steps.default.Step;
-
 function Step(props) {
   var status = props.status;
-
   var getIcon = function getIcon(stepStatus) {
     if (stepStatus === 'error') {
       return /*#__PURE__*/_react.default.createElement("span", {
@@ -34,7 +29,6 @@ function Step(props) {
         size: 16
       }));
     }
-
     if (stepStatus === 'finish') {
       return /*#__PURE__*/_react.default.createElement("span", {
         className: "check-icon-box icon-box"
@@ -42,20 +36,17 @@ function Step(props) {
         size: 16
       }));
     }
-
     if (stepStatus === 'process') {
       return /*#__PURE__*/_react.default.createElement(_ProcessIcon.ProcessIcon, {
         type: "process"
       });
-    } // wait
-
-
+    }
+    // wait
     return /*#__PURE__*/_react.default.createElement(_ProcessIcon.ProcessIcon, {
       type: "wait"
     });
   };
-
-  return /*#__PURE__*/_react.default.createElement(AntdStep, Object.assign({}, props, {
+  return /*#__PURE__*/_react.default.createElement(AntdStep, _objectSpread(_objectSpread({}, props), {}, {
     icon: getIcon(status)
   }));
 }

package/lib/Steps/index.d.ts

@@ -1,7 +1,8 @@
+import { StepProps } from 'antd';
 import { ReactElement } from 'react';
 import { IStepProps } from './components/Step';
 export type { IStepProps };
-export declare type TStatus = 'wait' | 'process' | 'finish' | 'error';
+export type TStatus = 'wait' | 'process' | 'finish' | 'error';
 export interface IStepsProps {
     /**
      * @description Steps最外层类名
@@ -28,9 +29,14 @@ export interface IStepsProps {
      * @default process
      */
     status?: TStatus;
+    /**
+     * @description Steps的配置项
+     * @default -
+     */
+    items?: StepProps[];
     children?: ReactElement<IStepProps>[];
 }
-declare function Steps({ className, current, direction, defaultCurrent, status, children, }: IStepsProps): JSX.Element;
+declare function Steps({ className, current, direction, defaultCurrent, status, items: defaultItems, children, }: IStepsProps): JSX.Element;
 declare namespace Steps {
     var Step: typeof import("./components/Step").Step;
 }

package/lib/Steps/index.js

@@ -1,33 +1,79 @@
 "use strict";
 
+function _typeof(obj) { "@babel/helpers - typeof"; return _typeof = "function" == typeof Symbol && "symbol" == typeof Symbol.iterator ? function (obj) { return typeof obj; } : function (obj) { return obj && "function" == typeof Symbol && obj.constructor === Symbol && obj !== Symbol.prototype ? "symbol" : typeof obj; }, _typeof(obj); }
 Object.defineProperty(exports, "__esModule", {
   value: true
 });
 exports.default = void 0;
-
 require("antd/es/steps/style");
-
 var _steps = _interopRequireDefault(require("antd/es/steps"));
-
+require("@aloudata/icons-react/styles/index.less");
+var _CheckFill2 = _interopRequireDefault(require("@aloudata/icons-react/es/icons/CheckFill"));
+var _ErrorFill2 = _interopRequireDefault(require("@aloudata/icons-react/es/icons/ErrorFill"));
 var _react = _interopRequireDefault(require("react"));
-
 var _classnames = _interopRequireDefault(require("classnames"));
-
 var _Step = require("./components/Step");
-
+var _ProcessIcon = require("./components/ProcessIcon");
 function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { default: obj }; }
-
+function ownKeys(object, enumerableOnly) { var keys = Object.keys(object); if (Object.getOwnPropertySymbols) { var symbols = Object.getOwnPropertySymbols(object); enumerableOnly && (symbols = symbols.filter(function (sym) { return Object.getOwnPropertyDescriptor(object, sym).enumerable; })), keys.push.apply(keys, symbols); } return keys; }
+function _objectSpread(target) { for (var i = 1; i < arguments.length; i++) { var source = null != arguments[i] ? arguments[i] : {}; i % 2 ? ownKeys(Object(source), !0).forEach(function (key) { _defineProperty(target, key, source[key]); }) : Object.getOwnPropertyDescriptors ? Object.defineProperties(target, Object.getOwnPropertyDescriptors(source)) : ownKeys(Object(source)).forEach(function (key) { Object.defineProperty(target, key, Object.getOwnPropertyDescriptor(source, key)); }); } return target; }
+function _defineProperty(obj, key, value) { key = _toPropertyKey(key); if (key in obj) { Object.defineProperty(obj, key, { value: value, enumerable: true, configurable: true, writable: true }); } else { obj[key] = value; } return obj; }
+function _toPropertyKey(arg) { var key = _toPrimitive(arg, "string"); return _typeof(key) === "symbol" ? key : String(key); }
+function _toPrimitive(input, hint) { if (_typeof(input) !== "object" || input === null) return input; var prim = input[Symbol.toPrimitive]; if (prim !== undefined) { var res = prim.call(input, hint || "default"); if (_typeof(res) !== "object") return res; throw new TypeError("@@toPrimitive must return a primitive value."); } return (hint === "string" ? String : Number)(input); }
+var getIcon = function getIcon(stepStatus) {
+  if (stepStatus === 'error') {
+    return /*#__PURE__*/_react.default.createElement("span", {
+      className: "error-icon-box icon-box"
+    }, /*#__PURE__*/_react.default.createElement(_ErrorFill2.default, {
+      size: 16
+    }));
+  }
+  if (stepStatus === 'finish') {
+    return /*#__PURE__*/_react.default.createElement("span", {
+      className: "check-icon-box icon-box"
+    }, /*#__PURE__*/_react.default.createElement(_CheckFill2.default, {
+      size: 16
+    }));
+  }
+  if (stepStatus === 'process') {
+    return /*#__PURE__*/_react.default.createElement(_ProcessIcon.ProcessIcon, {
+      type: "process"
+    });
+  }
+  // wait
+  return /*#__PURE__*/_react.default.createElement(_ProcessIcon.ProcessIcon, {
+    type: "wait"
+  });
+};
 var INITIAL = 0;
-
 function Steps(_ref) {
   var className = _ref.className,
-      current = _ref.current,
-      _ref$direction = _ref.direction,
-      direction = _ref$direction === void 0 ? 'horizontal' : _ref$direction,
-      _ref$defaultCurrent = _ref.defaultCurrent,
-      defaultCurrent = _ref$defaultCurrent === void 0 ? INITIAL : _ref$defaultCurrent,
-      status = _ref.status,
-      children = _ref.children;
+    _ref$current = _ref.current,
+    current = _ref$current === void 0 ? INITIAL : _ref$current,
+    _ref$direction = _ref.direction,
+    direction = _ref$direction === void 0 ? 'horizontal' : _ref$direction,
+    _ref$defaultCurrent = _ref.defaultCurrent,
+    defaultCurrent = _ref$defaultCurrent === void 0 ? INITIAL : _ref$defaultCurrent,
+    status = _ref.status,
+    defaultItems = _ref.items,
+    children = _ref.children;
+  var items = defaultItems === null || defaultItems === void 0 ? void 0 : defaultItems.map(function (item, index) {
+    var itemStatus = status;
+    if (!itemStatus) {
+      if (index === current) {
+        itemStatus = 'process';
+      }
+      if (index < current) {
+        itemStatus = 'finish';
+      }
+      if (index > current) {
+        itemStatus = 'wait';
+      }
+    }
+    return _objectSpread(_objectSpread({}, item), {}, {
+      icon: item.icon || getIcon(itemStatus)
+    });
+  });
   return /*#__PURE__*/_react.default.createElement(_steps.default, {
     className: (0, _classnames.default)('ald-steps', className),
     current: current,
@@ -37,10 +83,10 @@ function Steps(_ref) {
     labelPlacement: "vertical",
     responsive: false,
     size: "default",
-    type: "default"
+    type: "default",
+    items: items
   }, children);
 }
-
 Steps.Step = _Step.Step;
 var _default = Steps;
 exports.default = _default;

package/lib/Steps/style/index.js

@@ -1,5 +1,4 @@
 "use strict";
 
 require("../../style");
-
 require("./index.less");

package/lib/Steps/style/index.less

@@ -36,7 +36,6 @@
   // 常规step
   .ant-steps-item {
     .ant-steps-item-tail {
-      display: flex;
       align-items: flex-start;
       height: 30px;
       margin-left: 50px;
@@ -44,7 +43,7 @@
 
       &::after {
         height: 2px;
-        background-color: @NL90;
+        background-color: @BG60;
         content: '';
       }
     }
@@ -74,7 +73,7 @@
   .ant-steps-item-finish {
     .ant-steps-item-tail::after {
       height: 2px;
-      background-color: @B60;
+      background-color: @B40;
     }
 
     .ant-steps-item-title {
@@ -84,7 +83,7 @@
   // 正在进行中的step
   .ant-steps-item-active {
     .ant-steps-item-title {
-      color: @B60;
+      color: @B40;
       font-weight: 500;
     }
   }
@@ -164,7 +163,7 @@
     .ant-steps-item-tail {
       position: absolute;
       top: 18px;
-      left: 8px;
+      left: 50px;
       width: 2px;
       height: 100%;
       margin: 0;
@@ -173,7 +172,7 @@
       &::after {
         width: 2px;
         height: 100%;
-        background-color: @NL90;
+        background-color: @BG60;
       }
     }
   }
@@ -182,7 +181,7 @@
     .ant-steps-item-tail::after {
       width: 2px;
       height: 100%;
-      background-color: @B60;
+      background-color: @B40;
     }
 
     &.ant-steps-item-title {
@@ -211,21 +210,21 @@
   width: 16px;
   height: 16px;
   margin-bottom: 9px;
-  background-color: #fff;
+  background-color: @BG80;
   border-radius: 50%;
 }
 
 .error-icon-box {
-  color: @SC60;
+  color: @SC50;
 }
 
 .check-icon-box {
-  color: @B60;
+  color: @B40;
 }
 // 提升该类名的优先级，不然会被.iconBox覆盖掉
 .ald-steps .process-icon-box {
   position: relative;
-  background-color: @B60;
+  background-color: @B40;
 
   &::after {
     position: absolute;
@@ -242,7 +241,7 @@
 
 .ald-steps .wait-icon-box {
   position: relative;
-  background-color: @BG90;
+  background-color: @BG60;
 
   &::after {
     position: absolute;

package/lib/Switch/index.js

@@ -1,67 +1,48 @@
 "use strict";
 
 function _typeof(obj) { "@babel/helpers - typeof"; return _typeof = "function" == typeof Symbol && "symbol" == typeof Symbol.iterator ? function (obj) { return typeof obj; } : function (obj) { return obj && "function" == typeof Symbol && obj.constructor === Symbol && obj !== Symbol.prototype ? "symbol" : typeof obj; }, _typeof(obj); }
-
 Object.defineProperty(exports, "__esModule", {
   value: true
 });
 exports.default = void 0;
-
 require("antd/es/switch/style");
-
 var _switch = _interopRequireDefault(require("antd/es/switch"));
-
 var _react = _interopRequireWildcard(require("react"));
-
 var _classnames = _interopRequireDefault(require("classnames"));
-
 function _getRequireWildcardCache(nodeInterop) { if (typeof WeakMap !== "function") return null; var cacheBabelInterop = new WeakMap(); var cacheNodeInterop = new WeakMap(); return (_getRequireWildcardCache = function _getRequireWildcardCache(nodeInterop) { return nodeInterop ? cacheNodeInterop : cacheBabelInterop; })(nodeInterop); }
-
 function _interopRequireWildcard(obj, nodeInterop) { if (!nodeInterop && obj && obj.__esModule) { return obj; } if (obj === null || _typeof(obj) !== "object" && typeof obj !== "function") { return { default: obj }; } var cache = _getRequireWildcardCache(nodeInterop); if (cache && cache.has(obj)) { return cache.get(obj); } var newObj = {}; var hasPropertyDescriptor = Object.defineProperty && Object.getOwnPropertyDescriptor; for (var key in obj) { if (key !== "default" && Object.prototype.hasOwnProperty.call(obj, key)) { var desc = hasPropertyDescriptor ? Object.getOwnPropertyDescriptor(obj, key) : null; if (desc && (desc.get || desc.set)) { Object.defineProperty(newObj, key, desc); } else { newObj[key] = obj[key]; } } } newObj.default = obj; if (cache) { cache.set(obj, newObj); } return newObj; }
-
 function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { default: obj }; }
-
 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 _iterableToArrayLimit(arr, i) { var _i = null == arr ? null : "undefined" != typeof Symbol && arr[Symbol.iterator] || arr["@@iterator"]; if (null != _i) { var _s, _e, _x, _r, _arr = [], _n = !0, _d = !1; try { if (_x = (_i = _i.call(arr)).next, 0 === i) { if (Object(_i) !== _i) return; _n = !1; } else for (; !(_n = (_s = _x.call(_i)).done) && (_arr.push(_s.value), _arr.length !== i); _n = !0) { ; } } catch (err) { _d = !0, _e = err; } finally { try { if (!_n && null != _i.return && (_r = _i.return(), Object(_r) !== _r)) return; } finally { if (_d) throw _e; } } return _arr; } }
 function _arrayWithHoles(arr) { if (Array.isArray(arr)) return arr; }
-
 var Switch = function Switch(_ref) {
   var _ref$className = _ref.className,
-      className = _ref$className === void 0 ? '' : _ref$className,
-      _ref$disabled = _ref.disabled,
-      disabled = _ref$disabled === void 0 ? false : _ref$disabled,
-      _ref$loading = _ref.loading,
-      loading = _ref$loading === void 0 ? false : _ref$loading,
-      _ref$size = _ref.size,
-      size = _ref$size === void 0 ? 'middle' : _ref$size,
-      checked = _ref.checked,
-      _ref$defaultChecked = _ref.defaultChecked,
-      defaultChecked = _ref$defaultChecked === void 0 ? false : _ref$defaultChecked,
-      onChange = _ref.onChange,
-      onClick = _ref.onClick,
-      children = _ref.children;
-
+    className = _ref$className === void 0 ? '' : _ref$className,
+    _ref$disabled = _ref.disabled,
+    disabled = _ref$disabled === void 0 ? false : _ref$disabled,
+    _ref$loading = _ref.loading,
+    loading = _ref$loading === void 0 ? false : _ref$loading,
+    _ref$size = _ref.size,
+    size = _ref$size === void 0 ? 'middle' : _ref$size,
+    checked = _ref.checked,
+    _ref$defaultChecked = _ref.defaultChecked,
+    defaultChecked = _ref$defaultChecked === void 0 ? false : _ref$defaultChecked,
+    onChange = _ref.onChange,
+    onClick = _ref.onClick,
+    children = _ref.children;
   var _useState = (0, _react.useState)(typeof checked === 'undefined' ? defaultChecked : checked),
-      _useState2 = _slicedToArray(_useState, 2),
-      userChecked = _useState2[0],
-      setUserChecked = _useState2[1];
-
+    _useState2 = _slicedToArray(_useState, 2),
+    userChecked = _useState2[0],
+    setUserChecked = _useState2[1];
   var onChangeCB = function onChangeCB(isChecked, event) {
     setUserChecked(isChecked);
-
     if (typeof onChange === 'function') {
       onChange(isChecked, event);
     }
   };
-
   var currentDisabled = loading ? true : disabled;
   (0, _react.useEffect)(function () {
     if (typeof checked === 'boolean') {
@@ -85,6 +66,5 @@ var Switch = function Switch(_ref) {
     className: "ald-switch-text"
   }, children));
 };
-
 var _default = Switch;
 exports.default = _default;

package/lib/Switch/style/index.js

@@ -1,5 +1,4 @@
 "use strict";
 
 require("../../style");
-
 require("./index.less");