uepay-mesh 3.0.11 → 3.0.12

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

@@ -30,8 +30,8 @@ const {
 } = _antd.DatePicker;
 
 function subtractNatural(subNum) {
-  const begin = (0, _moment.default)().hour(0).minute(0).second(0),
-        end = begin.clone().subtract(subNum, 'days').hour(23).minute(59).second(59);
+  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
@@ -114,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 => {
@@ -134,7 +134,7 @@ 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
@@ -199,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/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/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.11",
+    "version": "3.0.12",
     "description": "数据中心数据集设计工具前端",
     "main": "index.js",
     "typings": "index.d.ts",
@@ -44,7 +44,7 @@
         "node-sass": "^4.13.0",
         "react": "^16.12.0",
         "react-dom": "^16.12.0",
-        "uepay-mesh": "^3.0.10",
+        "uepay-mesh": "^3.0.12",
         "uepay-ops2": "^3.0.2"
     }
 }