cloud-b2b 1.1.57 → 1.1.59

package/src/Loading2/Loading2.js

@@ -0,0 +1,15 @@
+import React from 'react';
+import {Spin} from 'antd';
+import variables from '../variables';
+
+function Loading() {
+  return (
+    <div className={variables('Loading2')}>
+      <div>
+        <Spin />
+      </div>
+    </div>
+  );
+}
+
+export default Loading;

package/src/ModalWithDrag/ModalWithDrag.js

@@ -0,0 +1,17 @@
+import React from 'react';
+import {Modal} from 'antd';
+import drag from './drag';
+import variables from '../variables';
+
+const onLoad = (e) => {
+  const dragElement = e.parentNode.parentNode;
+  const targetElement = dragElement.parentNode.parentNode;
+  drag(dragElement, targetElement);
+};
+
+const ModalWithDrag = ({className, children, title, ...props}) => {
+  props.title = <div ref={(e) => e && onLoad(e)}>{title}</div>;
+  return <Modal className={`${className} ${variables('ModalWithDrag')}`} {...props}>{children}</Modal>;
+};
+
+export default ModalWithDrag;

package/{es → src}/ModalWithDrag/drag.js

@@ -1,116 +1,128 @@
-import _concatInstanceProperty from "@babel/runtime-corejs3/core-js-stable/instance/concat";
-import _parseInt from "@babel/runtime-corejs3/core-js-stable/parse-int";
-// 依据CSS3的transform属性进行移动
-var dragByTransform = function dragByTransform(dragElement, targetElement) {
-  var mouseMove = null;
-  var mouseUp = null;
-  var active = false;
-  var offsetX = 0;
-  var offsetY = 0;
-  var x = 0;
-  var y = 0;
-  dragElement.style.cursor = 'move';
-  dragElement.onmousedown = function (e) {
-    mouseMove = document.onmousemove;
-    mouseUp = document.onmouseup;
-    x = e.clientX;
-    y = e.clientY;
-    active = true;
-
-    // 如果下拉框拥有焦点，通过使其失去焦点来关闭掉下拉框
-    if (document.activeElement && document.activeElement !== dragElement) {
-      document.activeElement.blur();
-    }
-    document.onmousemove = function (e) {
-      if (active) {
-        var _context;
-        var x2 = offsetX + e.clientX - x;
-        var y2 = offsetY + e.clientY - y;
-        targetElement.style.transform = _concatInstanceProperty(_context = "translate(".concat(x2, "px, ")).call(_context, y2, "px)");
-      }
-      mouseMove && mouseMove(e);
-    };
-    document.onmouseup = function (e) {
-      if (active) {
-        document.onmousemove = mouseMove;
-        document.onmouseup = mouseUp;
-        offsetX += e.clientX - x;
-        offsetY += e.clientY - y;
-        active = false;
-      }
-      mouseUp && mouseUp(e);
-    };
-    return false;
-  };
-};
-
-// 获取相关CSS属性
-var getCss = function getCss(o, key) {
-  return o.currentStyle ? o.currentStyle[key] : document.defaultView.getComputedStyle(o)[key];
-};
-
-// 依据position属性进行移动
-var dragByPosition = function dragByPosition(dragElement, targetElement) {
-  var mouseMove = null;
-  var mouseUp = null;
-  var active = false;
-  var left = 0;
-  var top = 0;
-  var x = 0;
-  var y = 0;
-  dragElement.style.cursor = 'move';
-  dragElement.onmousedown = function (e) {
-    mouseMove = document.onmousemove;
-    mouseUp = document.onmouseup;
-    x = e.clientX;
-    y = e.clientY;
-    active = true;
-    if (getCss(targetElement, 'left') !== 'auto') {
-      left = _parseInt(getCss(targetElement, "left"));
-    }
-    if (getCss(targetElement, 'top') !== 'auto') {
-      top = _parseInt(getCss(targetElement, 'top'));
-    }
-
-    // 如果下拉框拥有焦点，通过使其失去焦点来关闭掉下拉框
-    if (document.activeElement && document.activeElement !== dragElement) {
-      document.activeElement.blur();
-    }
-    document.onmousemove = function (e) {
-      if (active) {
-        var top2 = top + e.clientY - y;
-        targetElement.style.left = "".concat(left + e.clientX - x, "px");
-        targetElement.style.top = "".concat(top2 > 0 ? top2 : 0, "px");
-      }
-      mouseMove && mouseMove(e);
-    };
-    document.onmouseup = function (e) {
-      if (active) {
-        document.onmousemove = mouseMove;
-        document.onmouseup = mouseUp;
-        active = false;
-      }
-      mouseUp && mouseUp(e);
-    };
-    return false;
-  };
-};
-var drag = function drag(dragElement, targetElement) {
-  if (!dragElement || !targetElement) {
-    console.error('请传入有效的HTML元素对象');
-    return;
-  }
-
-  // 已经绑定过，不需要再次绑定
-  if (dragElement.onmousedown) {
-    return;
-  }
-
-  // 如果目标元素是非定位元素采用transform属性进行移动
-  if (getCss(targetElement, 'position') === 'static') {
-    dragByTransform(dragElement, targetElement);
-  } else {
-    dragByPosition(dragElement, targetElement);
-  }
-};
-export default drag;
+
+// 依据CSS3的transform属性进行移动
+const dragByTransform = (dragElement, targetElement) => {
+  let mouseMove = null;
+  let mouseUp = null;
+  let active = false;
+  let offsetX = 0;
+  let offsetY = 0;
+  let x = 0;
+  let y = 0;
+
+  dragElement.style.cursor = 'move';
+
+  dragElement.onmousedown = (e) => {
+    mouseMove = document.onmousemove;
+    mouseUp = document.onmouseup;
+    x = e.clientX;
+    y = e.clientY;
+    active = true;
+
+    // 如果下拉框拥有焦点，通过使其失去焦点来关闭掉下拉框
+    if (document.activeElement && document.activeElement !== dragElement) {
+      document.activeElement.blur();
+    }
+
+    document.onmousemove = (e) => {
+      if (active) {
+        const x2 = offsetX + e.clientX - x;
+        const y2 = offsetY + e.clientY - y;
+        targetElement.style.transform = `translate(${x2}px, ${y2}px)`;
+      }
+      mouseMove && mouseMove(e);
+    };
+
+    document.onmouseup = (e) => {
+      if (active) {
+        document.onmousemove = mouseMove;
+        document.onmouseup = mouseUp;
+        offsetX += e.clientX - x;
+        offsetY += e.clientY - y;
+        active = false;
+      }
+      mouseUp && mouseUp(e);
+    };
+
+    return false;
+  };
+};
+
+// 获取相关CSS属性
+const getCss = (o, key) => {
+  return o.currentStyle ? o.currentStyle[key] : document.defaultView.getComputedStyle(o)[key];
+};
+
+// 依据position属性进行移动
+const dragByPosition = (dragElement, targetElement) => {
+  let mouseMove = null;
+  let mouseUp = null;
+  let active = false;
+  let left = 0;
+  let top = 0;
+  let x = 0;
+  let y = 0;
+
+  dragElement.style.cursor = 'move';
+
+  dragElement.onmousedown = (e) => {
+    mouseMove = document.onmousemove;
+    mouseUp = document.onmouseup;
+    x = e.clientX;
+    y = e.clientY;
+    active = true;
+
+    if (getCss(targetElement, 'left') !== 'auto'){
+      left = parseInt(getCss(targetElement, "left"));
+    }
+
+    if (getCss(targetElement, 'top') !== 'auto'){
+      top = parseInt(getCss(targetElement, 'top'));
+    }
+
+    // 如果下拉框拥有焦点，通过使其失去焦点来关闭掉下拉框
+    if (document.activeElement && document.activeElement !== dragElement) {
+      document.activeElement.blur();
+    }
+
+    document.onmousemove = (e) => {
+      if (active) {
+        const top2 = top + e.clientY - y;
+        targetElement.style.left = `${left + e.clientX - x}px`;
+        targetElement.style.top = `${top2 > 0 ? top2 : 0}px`;
+      }
+      mouseMove && mouseMove(e);
+    };
+
+    document.onmouseup = (e) => {
+      if (active) {
+        document.onmousemove = mouseMove;
+        document.onmouseup = mouseUp;
+        active = false;
+      }
+      mouseUp && mouseUp(e);
+    };
+
+    return false;
+  };
+};
+
+const drag = (dragElement, targetElement) => {
+  if (!dragElement || !targetElement) {
+    console.error('请传入有效的HTML元素对象');
+    return;
+  }
+
+  // 已经绑定过，不需要再次绑定
+  if (dragElement.onmousedown) {
+    return;
+  }
+
+  // 如果目标元素是非定位元素采用transform属性进行移动
+  if (getCss(targetElement, 'position') === 'static') {
+    dragByTransform(dragElement, targetElement);
+  } else {
+    dragByPosition(dragElement, targetElement);
+  }
+};
+
+export default drag;

package/src/NumberInput/NumberInput.js

@@ -0,0 +1,137 @@
+import React from 'react';
+import PropTypes from 'prop-types';
+import {Input} from 'antd';
+import {getObjectExclude} from '../helper';
+
+const parseNumber = (value, {real, sign, zero, precision, fixed, big}) => {
+  const invalid = {invalid: true, value: ''};
+
+  if (value === '') {
+    return {value};
+  }
+
+  // 非数字
+  value = big ? value : Number(value);
+  if (isNaN(value)) {
+    return invalid;
+  }
+
+  // 不能为实数，却包含小数点
+  if (!real && String(value).includes('.')) {
+    return invalid;
+  }
+
+  // 不能为负数，却小于0
+  if (!sign && (value < 0)) {
+    return invalid;
+  }
+
+  // 不能为0，却为0
+  if (!zero && (value === 0)) {
+    return invalid;
+  }
+
+  if (real) {
+    precision = Number(precision);
+    if (precision) {
+      value = value.toFixed(precision);
+      value = value.toString(); // 将数值转换为字符串
+      value = value.replace(/(\.\d*?[1-9])0+$|\.0*$/, "$1"); // 去除小数点后无意义的零
+      if (!fixed) {
+        value = Number(value);
+      }
+    }
+  }
+
+  return {value};
+};
+
+/**
+ * real: true表示带小数点，默认为false
+ * sign: true表示带正负号，默认为false
+ * precision: real为true时，小数的精度；否则无效
+ * zero：true表示可以输入0，默认为false
+ * fixed: real为true时生效; true表示固定显示指定精度的小数，精度由precision确定，默认值为false
+ * big: big为ture时生效; true标识为大数值，与上面所有属性互斥
+ */
+const PROPS = {
+  defaultValue: PropTypes.oneOfType([PropTypes.string, PropTypes.number]),
+  real: PropTypes.bool,
+  sign: PropTypes.bool,
+  precision: PropTypes.any,
+  zero: PropTypes.bool,
+  fixed: PropTypes.bool,
+  big:PropTypes.bool,
+  inputRef: PropTypes.func,
+  onChange: PropTypes.func,
+  onBlur: PropTypes.func
+};
+
+const PROPS_KEYS = Object.keys(PROPS);
+
+class NumberInput extends React.Component {
+  static propTypes = PROPS;
+  state = {typo: false, value: ''};
+
+  onChange = (event) => {
+    const value = event.target.value;
+    if (!this.hasSpecialChar(value)) {
+      this.setState({value, typo: true});
+    }
+  };
+
+  onBlur = (event) => {
+    const {onBlur, onChange, fixed} = this.props;
+    if (this.state.typo) {
+      const {invalid, value} = this.format(this.state.value, fixed);
+      this.setState({typo: false, value: ''});
+      if (!invalid) {
+        onChange && onChange(value);
+      }
+      onBlur && onBlur(event); //有输入才触发外部失去焦点事件，避免非必要请求
+    }
+  };
+
+  hasSpecialChar = (value) => {
+    if (value.includes('+')) {
+      return true;
+    } else if (!this.props.sign && value.includes('-')) {
+      return true;
+    } else {
+      return !this.props.real && value.includes('.');
+    }
+  };
+
+  format = (value, fixed) => {
+    const {real, sign, zero, precision,big} = this.props;
+    return parseNumber(value, {real, sign, zero, precision, fixed,big});
+  };
+
+  getShowValue = () => {
+    if (this.state.typo) {
+      // 处于输入状态从state中取值
+      return this.state.value;
+    } else {
+      // 处于非输入状态从props中取值
+      return this.format(this.props.defaultValue, this.props.fixed).value;
+    }
+  };
+
+  getProps = () => {
+    const props = getObjectExclude(this.props, PROPS_KEYS);
+    return {
+      ...props,
+      type: 'text',
+      ref: this.props.inputRef || null,
+      value: this.getShowValue(),
+      onChange: this.onChange,
+      onBlur: this.onBlur,
+    };
+  };
+
+  render() {
+    return <Input {...this.getProps()} />;
+  }
+}
+
+export default NumberInput;