uepay-mesh 3.0.10 → 3.0.14

package/mesh/cell/edit/input/standardNumber.js

@@ -9,12 +9,12 @@ var _react = _interopRequireDefault(require("react"));
 
 var _antd = require("antd");
 
+var _accounting = _interopRequireDefault(require("accounting"));
+
 var _propTypes = _interopRequireDefault(require("prop-types"));
 
 function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { default: obj }; }
 
-function _extends() { _extends = Object.assign || function (target) { for (var i = 1; i < arguments.length; i++) { var source = arguments[i]; for (var key in source) { if (Object.prototype.hasOwnProperty.call(source, key)) { target[key] = source[key]; } } } return target; }; return _extends.apply(this, arguments); }
-
 function _defineProperty(obj, key, value) { if (key in obj) { Object.defineProperty(obj, key, { value: value, enumerable: true, configurable: true, writable: true }); } else { obj[key] = value; } return obj; }
 
 /**
@@ -27,9 +27,10 @@ function _defineProperty(obj, key, value) { if (key in obj) { Object.definePrope
  * @param props.placeholder {String}
  * @param props.value {String} 值
  * @param props.column {String} 字段标识
- * @param props.max {Number} 输入字符串的最大长度
- * @param props.prefix {String} 数字前缀 //TODO
- * @param props.suffix {String} 数字后缀 //TODO
+ * @param props.min {Number} 最小值
+ * @param props.max {Number} 最大值
+ * @param props.switchThousand {Boolean} 显示千分位
+ * @param props.precision {Number} 小数点位数
  * @param props.onBlur {Function} 失去焦點事件。
  * @param props.onFocus {Function} 得到焦点事件。
  * @param props.onSubmit {Function} 提交(回车) (value, event)=>{}
@@ -72,28 +73,27 @@ class StandardNumber extends _react.default.Component {
     });
 
     _defineProperty(this, "formatter", value => {
-      return value;
+      const {
+        switchThousand,
+        precision
+      } = this.props;
+      return switchThousand || precision ? _accounting.default.formatNumber(value, precision || 0, switchThousand ? ',' : '') : value;
     });
 
     _defineProperty(this, "parser", value => {
-      return value;
+      const {
+        switchPrecision,
+        precision
+      } = this.props;
+      return switchPrecision || precision ? _accounting.default.unformat(value) : value;
     });
   }
 
   render() {
     const {
       props
-    } = this,
-          {
-      value
-    } = props;
-    let exAttr = {};
-
-    if (value) {
-      exAttr.value = value;
-    }
-
-    return /*#__PURE__*/_react.default.createElement(_antd.InputNumber, _extends({
+    } = this;
+    return /*#__PURE__*/_react.default.createElement(_antd.InputNumber, {
       style: props.style,
       className: props.className,
       min: props.min,
@@ -107,8 +107,9 @@ class StandardNumber extends _react.default.Component {
       onBlur: this.handleBlur,
       placeholder: props.placeholder,
       formatter: this.formatter,
-      parser: this.parser
-    }, exAttr));
+      parser: this.parser,
+      value: props.value
+    });
   }
 
 }
@@ -124,8 +125,8 @@ StandardNumber.propTypes = {
   min: _propTypes.default.number,
   max: _propTypes.default.number,
   step: _propTypes.default.number,
-  prefix: _propTypes.default.string,
-  suffix: _propTypes.default.string,
+  precision: _propTypes.default.number,
+  switchThousand: _propTypes.default.bool,
   onBlur: _propTypes.default.func,
   onFocus: _propTypes.default.func,
   onChange: _propTypes.default.func,

package/mesh/cell/search/input/standardNumberSearch.js

@@ -13,16 +13,24 @@ var _searchContain = _interopRequireDefault(require("../searchContain"));
 
 var _propTypes = _interopRequireDefault(require("prop-types"));
 
+var _serverEnums = require("../../../config/serverEnums");
+
 function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { default: obj }; }
 
+function _extends() { _extends = Object.assign || function (target) { for (var i = 1; i < arguments.length; i++) { var source = arguments[i]; for (var key in source) { if (Object.prototype.hasOwnProperty.call(source, key)) { target[key] = source[key]; } } } return target; }; return _extends.apply(this, arguments); }
+
+const Config = {
+  defaultCondValue: _serverEnums.ConditionType.ER.value
+};
 /**
  *
  * @param props
  * @return {*}
  * @constructor
  */
+
 const StandardNumberSearch = props => {
-  return /*#__PURE__*/_react.default.createElement(_searchContain.default, props, _standardNumber.default);
+  return /*#__PURE__*/_react.default.createElement(_searchContain.default, _extends({}, props, Config), _standardNumber.default);
 };
 
 StandardNumberSearch.propTypes = {

package/mesh/cell/search/picker/timestampDatePickerSearch.d.ts

@@ -41,6 +41,25 @@ interface Props {
     condValue?: string;
 }
 
+/**
+ * 声明类型
+ */
+declare type RangeType = { value: string, label: string, moment: () => {} };
+
+/**
+ * 范围选项
+ */
+export class Range {
+    static none: RangeType;
+    static today: RangeType;
+    static day2: RangeType;
+    static day3: RangeType;
+    static week: RangeType;
+    static last24H: RangeType;
+    static last48H: RangeType;
+    static last72H: RangeType;
+}
+
 /**
  * 時間選擇工具
  */

package/mesh/cell/search/picker/timestampDatePickerSearch.js

@@ -3,7 +3,7 @@
 Object.defineProperty(exports, "__esModule", {
   value: true
 });
-exports.default = void 0;
+exports.default = exports.Range = void 0;
 
 var _react = _interopRequireDefault(require("react"));
 
@@ -28,11 +28,74 @@ function _defineProperty(obj, key, value) { if (key in obj) { Object.definePrope
 const {
   RangePicker
 } = _antd.DatePicker;
+
+function subtractNatural(subNum) {
+  const end = (0, _moment.default)().hour(23).minute(59).second(59),
+        begin = end.clone().subtract(subNum, 'days').hour(0).minute(0).second(0);
+  return {
+    begin,
+    end
+  };
+}
+
+function subtractTime(subNum) {
+  const begin = (0, _moment.default)(),
+        end = begin.clone().subtract(subNum, 'days');
+  return {
+    begin,
+    end
+  };
+}
+
+const Range = {
+  none: {
+    value: 'node',
+    label: '無默認',
+    moment: () => {}
+  },
+  today: {
+    value: 'today',
+    label: '當日',
+    moment: () => subtractNatural(0)
+  },
+  day2: {
+    value: 'day2',
+    label: '兩日内',
+    moment: () => subtractNatural(1)
+  },
+  day3: {
+    value: 'day3',
+    label: '三日内',
+    moment: () => subtractNatural(2)
+  },
+  week: {
+    value: 'week',
+    label: '一周内',
+    moment: () => subtractNatural(6)
+  },
+  last24H: {
+    value: 'last24H',
+    label: '24小時内',
+    moment: () => subtractTime(1)
+  },
+  last48H: {
+    value: 'last48H',
+    label: '48小時内',
+    moment: () => subtractTime(2)
+  },
+  last72H: {
+    value: 'last72H',
+    label: '72小時内',
+    moment: () => subtractTime(3)
+  }
+};
 /**
  * 时间戳选择器，所有的时间都会转换为时间戳格式(输出、输入都是13位Long类型的时间戳)。
  * @param props.onChange  {Function} (value: {p[preceding]:, s[subsequent]: 前项,后项}, column)=>{} 進行搜索時回調
  */
 
+exports.Range = Range;
+
 class TimestampDatePickerSearch extends _react.default.Component {
   constructor() {
     super(...arguments);
@@ -51,7 +114,7 @@ class TimestampDatePickerSearch extends _react.default.Component {
         p: moment && (0, _timestampDatePicker.moment2Date)(stringTime, showTime, moment) || undefined,
         s: undefined
       };
-      onChange && onChange(date, column);
+      onChange && onChange(date, column, _serverEnums.RelationType.BETWEEN.value);
     });
 
     _defineProperty(this, "handleCondChange", value => {
@@ -71,14 +134,18 @@ class TimestampDatePickerSearch extends _react.default.Component {
     const _search = {},
           _cond = {};
 
-    if (column.component && column.component.config && column.component.config.timePickerDefaultRange) {
+    if (column.component && column.component.config && column.component.config.timePickerDefaultRange && Range.none.value !== column.component.config.timePickerDefaultRange) {
       const {
         showTime,
         stringTime
       } = column.component.config,
-            today = (0, _moment.default)().format('YYYYMMDD'),
-            p = (0, _timestampDatePicker.moment2Date)(showTime, stringTime, (0, _moment.default)("".concat(today, " 00:00:00"), 'YYYYMMDD hh:mm:ss')),
-            s = (0, _timestampDatePicker.moment2Date)(showTime, stringTime, (0, _moment.default)("".concat(today, " 23:59:59"), 'YYYYMMDD hh:mm:ss'));
+            foo = Range[column.component.config.timePickerDefaultRange].moment,
+            {
+        begin,
+        end
+      } = foo(),
+            p = (0, _timestampDatePicker.moment2Date)(showTime, stringTime, begin),
+            s = (0, _timestampDatePicker.moment2Date)(showTime, stringTime, end);
       _search[column.column] = {
         p,
         s
@@ -132,6 +199,7 @@ class TimestampDatePickerSearch extends _react.default.Component {
       onChange: this.handleChange
     }), /*#__PURE__*/_react.default.createElement(_condSelect.default, {
       condOptions: TimestampDatePickerSearch.DefaultCondTypes,
+      defaultCondValue: _serverEnums.RelationType.BETWEEN.value,
       condValue: condValue,
       onChange: this.handleCondChange
     }), /*#__PURE__*/_react.default.createElement(_antd.Tooltip, {

package/mesh/cell/search/searchContain.js

@@ -22,6 +22,8 @@ function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { de
 function _extends() { _extends = Object.assign || function (target) { for (var i = 1; i < arguments.length; i++) { var source = arguments[i]; for (var key in source) { if (Object.prototype.hasOwnProperty.call(source, key)) { target[key] = source[key]; } } } return target; }; return _extends.apply(this, arguments); }
 
 /**
+ * @param props.condOptions {Array} 可选操作列表
+ * @param props.defaultCondValue {String} 默认条件关联选项
  * @param props.column {String} 字段信息
  * @param props.condValue {String} 搜索框的值
  * @param props.children {React} 包装搜索元素
@@ -51,7 +53,7 @@ function SearchContain(props) {
   }
 
   function handleValueChange(val) {
-    onChange(val, column);
+    onChange(val, column, defaultCondValue);
   }
 
   return /*#__PURE__*/_react.default.createElement("div", {

package/mesh/cell/search/select/standardSelectSearch.js

@@ -19,8 +19,10 @@ function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { de
 
 function _extends() { _extends = Object.assign || function (target) { for (var i = 1; i < arguments.length; i++) { var source = arguments[i]; for (var key in source) { if (Object.prototype.hasOwnProperty.call(source, key)) { target[key] = source[key]; } } } return target; }; return _extends.apply(this, arguments); }
 
-const CondOptions = [_serverEnums.ConditionType.ER],
-      DefaultCondValue = _serverEnums.ConditionType.ER.value;
+const Config = {
+  condOptions: [_serverEnums.ConditionType.ER, _serverEnums.ConditionType.NE],
+  defaultCondValue: _serverEnums.ConditionType.ER.value
+};
 /**
  *
  * @param props
@@ -29,10 +31,7 @@ const CondOptions = [_serverEnums.ConditionType.ER],
  */
 
 const StandardSelectSearch = props => {
-  return /*#__PURE__*/_react.default.createElement(_searchContain.default, _extends({}, props, {
-    condOptions: CondOptions,
-    defaultCondValue: DefaultCondValue
-  }), _standardSelect.default);
+  return /*#__PURE__*/_react.default.createElement(_searchContain.default, _extends({}, props, Config), _standardSelect.default);
 };
 
 StandardSelectSearch.propTypes = {

package/mesh/cell/view/input/standardNumberView.d.ts

@@ -0,0 +1,16 @@
+import * as React from 'react';
+
+interface Props {
+    /**
+     * 样式
+     */
+    style?: React.CSSProperties;
+    className?: string;
+    value?: string | number;
+    precision?: number;
+    switchThousand?: boolean;
+}
+
+declare class StandardNumberView extends React.Component<Props> {}
+
+export default StandardNumberView

package/mesh/cell/view/input/standardNumberView.js

@@ -0,0 +1,80 @@
+"use strict";
+
+Object.defineProperty(exports, "__esModule", {
+  value: true
+});
+exports.default = void 0;
+
+var _react = _interopRequireDefault(require("react"));
+
+var _propTypes = _interopRequireDefault(require("prop-types"));
+
+var _accounting = _interopRequireDefault(require("accounting"));
+
+var _antd = require("antd");
+
+function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { default: obj }; }
+
+/**
+ * 标准选择器的演示框
+ * @param value {String|Number} 当前选择数值
+ * @param matchValue {String|Number|Boolean} 当前选择数值
+ * @param style {Object} 当前选择数值
+ * @param className {String} 當前樣式
+ * @return {*}
+ * @constructor
+ */
+function StandardNumberView(_ref) {
+  let {
+    value,
+    style,
+    className,
+    precision,
+    switchThousand
+  } = _ref;
+  const combineValue = StandardNumberView.format({
+    value,
+    precision,
+    switchThousand
+  });
+  return /*#__PURE__*/_react.default.createElement(_antd.Popover, {
+    content: combineValue
+  }, /*#__PURE__*/_react.default.createElement("span", {
+    style: style,
+    className: className
+  }, combineValue));
+}
+
+;
+StandardNumberView.propTypes = {
+  style: _propTypes.default.object,
+  className: _propTypes.default.string,
+  value: _propTypes.default.oneOfType([_propTypes.default.string, _propTypes.default.number]),
+  precision: _propTypes.default.number,
+  switchThousand: _propTypes.default.bool
+};
+StandardNumberView.defaultProps = {
+  className: 'uepay-cell-standard-number-input'
+};
+
+StandardNumberView.format = function (_ref2) {
+  let {
+    value,
+    max,
+    min,
+    step,
+    precision = 0,
+    switchThousand
+  } = _ref2;
+
+  if (null === value || undefined === value || false === value || '' === value) {
+    return '';
+  } else if (0 === precision || precision || switchThousand) {
+    return _accounting.default.formatNumber(value, precision, switchThousand ? ',' : '');
+  } else {
+    return String(value);
+  }
+};
+
+var _default = StandardNumberView;
+exports.default = _default;

package/mesh/cell/view/input/standardView.js

@@ -21,6 +21,8 @@ function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { de
  * @param matchValue {String|Number|Boolean} 当前选择数值
  * @param style {Object} 当前选择数值
  * @param className {String} 當前樣式
+ * @param prefix {String} 前綴
+ * @param suffix {String} 後綴
  * @return {*}
  * @constructor
  */
@@ -29,22 +31,27 @@ const StandardView = _ref => {
     value,
     style,
     className,
-    matchValue
+    matchValue,
+    prefix,
+    suffix
   } = _ref;
+  const combineValue = prefix || suffix ? "".concat(prefix, " ").concat(value, " ").concat(suffix) : value;
   return /*#__PURE__*/_react.default.createElement(_antd.Popover, {
-    content: value
+    content: combineValue
   }, /*#__PURE__*/_react.default.createElement("span", {
     style: style,
     className: className
   }, matchValue ? /*#__PURE__*/_react.default.createElement(_matchView.default, {
-    value: value,
+    value: combineValue,
     matchValue: matchValue
-  }) : value));
+  }) : combineValue));
 };
 
 StandardView.propTypes = {
   style: _propTypes.default.object,
   className: _propTypes.default.string,
+  prefix: _propTypes.default.string,
+  suffix: _propTypes.default.string,
   value: _propTypes.default.oneOfType([_propTypes.default.string, _propTypes.default.number]),
   matchValue: _propTypes.default.oneOfType([_propTypes.default.string, _propTypes.default.number, _propTypes.default.bool])
 };

package/mesh/cell/view.d.ts

@@ -1,6 +1,6 @@
 export { default as SelectView } from './view/select/standardSelectView';
 export { default as TextInputView } from './view/input/standardView';
-export { default as NumberInputView } from './view/input/standardView';
+export { default as NumberInputView } from './view/input/standardNumberView';
 export { default as SwitchView } from './view/switch/standardSwitchView';
 export { default as TimestampDatePickerView } from './view/picker/timestampDatePickerView';
 export { default as ImageUpdatePickerView } from './view/picker/imageUpdatePickerView';

package/mesh/cell/view.js

@@ -25,6 +25,8 @@ Object.defineProperty(exports, "TimestampDatePickerView", {
 
 var _standardSelectView = _interopRequireDefault(require("./view/select/standardSelectView"));
 
+var _standardNumberView = _interopRequireDefault(require("./view/input/standardNumberView"));
+
 var _standardView = _interopRequireDefault(require("./view/input/standardView"));
 
 var _standardSwitchView = _interopRequireDefault(require("./view/switch/standardSwitchView"));
@@ -41,7 +43,7 @@ const SelectView = _standardSelectView.default;
 exports.SelectView = SelectView;
 const TextInputView = _standardView.default;
 exports.TextInputView = TextInputView;
-const NumberInputView = _standardView.default;
+const NumberInputView = _standardNumberView.default;
 exports.NumberInputView = NumberInputView;
 const SwitchView = _standardSwitchView.default;
 exports.SwitchView = SwitchView;

package/mesh/data/reduxSearch.js

@@ -56,9 +56,10 @@ class ReduxSearch {
     this.scribe();
   }
 
-  setValue(label, value) {
+  setValue(label, value, defaultCond) {
     this.search = _objectSpread({}, this.search);
     this.search[label] = value;
+    !this.condition[label] && defaultCond && (this.condition[label] = defaultCond);
     this.scribe();
   }
 

package/mesh/excel/processor.js

@@ -93,7 +93,7 @@ const modifyAbleHeaderRow = collect => {
       });
       indexHeaderRow.push(field.label);
       explainHeaderRow.push(getExplainHeaderColumn(fieldLabelDict, field));
-      displayHeaderRow.push("".concat(field.display));
+      displayHeaderRow.push("".concat(field.required ? '!' : '').concat(field.display));
     }
   }
 
@@ -144,7 +144,7 @@ const addAbleHeaderRow = collect => {
       });
       indexHeaderRow.push(field.label);
       explainHeaderRow.push(getExplainHeaderColumn(fieldLabelDict, field));
-      displayHeaderRow.push("".concat(field.display));
+      displayHeaderRow.push("".concat(field.required ? '!' : '').concat(field.display));
     }
   }
 

package/mesh/excel/standardExcel.js

@@ -45,8 +45,8 @@ const StandardExcel = props => {
     onFileSelect: props.onFileSelect
   }), /*#__PURE__*/_react.default.createElement(ProcessInfo, props.info), /*#__PURE__*/_react.default.createElement(_antd.Divider, {
     orientation: "left"
-  }, "\u8655\u7406\u8A73\u7D30\u4FE1\u606F"), items.map(item => /*#__PURE__*/_react.default.createElement(Line, {
-    key: item.count,
+  }, "\u8655\u7406\u8A73\u7D30\u4FE1\u606F"), items.map((item, index) => /*#__PURE__*/_react.default.createElement(Line, {
+    key: index,
     state: item.state,
     type: item.type,
     from: item.from,

package/mesh/hoc/withReduxSearch.js

@@ -121,8 +121,8 @@ class ReduxSearchItemWrapper extends _react.default.Component {
       }
     });
 
-    _defineProperty(this, "handleSearchChange", (value, label) => {
-      this.props.reduxSearch.setValue(label, value);
+    _defineProperty(this, "handleSearchChange", (value, label, defaultCond) => {
+      this.props.reduxSearch.setValue(label, value, defaultCond);
     });
 
     _defineProperty(this, "handleConditionChange", (value, label) => {

package/package.json

@@ -1,6 +1,6 @@
 {
     "name": "uepay-mesh",
-    "version": "3.0.10",
+    "version": "3.0.14",
     "description": "数据中心数据集设计工具前端",
     "main": "index.js",
     "typings": "index.d.ts",
@@ -20,6 +20,7 @@
     "author": "chkui",
     "license": "MIT",
     "dependencies": {
+        "accounting": "^0.4.1",
         "ali-oss": "^6.10.0",
         "async-notify": "^1.0.0",
         "md5": "^2.2.1",
@@ -43,7 +44,7 @@
         "node-sass": "^4.13.0",
         "react": "^16.12.0",
         "react-dom": "^16.12.0",
-        "uepay-mesh": "^3.0.9",
+        "uepay-mesh": "^3.0.13",
         "uepay-ops2": "^3.0.2"
     }
 }