assui 3.1.37 → 3.1.39

package/lib/label-condition-select-input/style/index.d.ts

@@ -0,0 +1,3 @@
+import './index.less';
+import '../../label-condition-input/style';
+import '../../label-select/style';

package/lib/label-condition-select-input/style/index.js

@@ -0,0 +1,8 @@
+"use strict";
+
+Object.defineProperty(exports, "__esModule", {
+  value: true
+});
+require("./index.less");
+require("../../label-condition-input/style");
+require("../../label-select/style");

package/lib/label-condition-select-input/style/index.less

@@ -0,0 +1,32 @@
+@import '~antd/lib/style/index.less';
+@import '../../style/themes/default.less';
+@import '../../style/variables.less';
+
+.label-condition-select {
+  display: flex;
+  align-items: center;
+  width: 100%;
+
+  &-selector {
+    width: 30%;
+    margin-right: 8px;
+  }
+
+  &-second-input {
+    width: 70%;
+  }
+
+  &-two-select-selector {
+    width: 50%;
+    margin-right: 8px;
+  }
+
+  &-only-selector {
+    width: 100%;
+    margin-right: 0;
+  }
+
+  &-second-select {
+    width: 50%;
+  }
+}

package/lib/label-customize-range-picker/index.js

@@ -98,6 +98,10 @@ var label_range_picker_1 = __importDefault(require("../label-range-picker"));
 var context_1 = __importDefault(require("../config-provider/context"));
 var messages_1 = __importDefault(require("../messages"));
 var utils_1 = require("./utils");
+/** 1整天的毫秒数 */
+var ONE_DAY_MILLISECOND = 1000 * 60 * 60 * 24;
+/** 1分钟的毫秒数 */
+var ONE_MINUTE_MILLISECOND = 1000 * 60;
 var RangePicker = date_picker_1["default"].RangePicker;
 var LabelCustomizeRangePicker = function LabelCustomizeRangePicker(props) {
   var customizeTimeList = props.customizeTimeList,
@@ -194,29 +198,38 @@ var LabelCustomizeRangePicker = function LabelCustomizeRangePicker(props) {
     var _c = __read(nextValue || [], 2),
       start = _c[0],
       end = _c[1];
-    var nextStartDate = (_a = showTime ? start === null || start === void 0 ? void 0 : start.clone() : start === null || start === void 0 ? void 0 : start.clone().startOf('day')) !== null && _a !== void 0 ? _a : null;
-    var nextEndDate = (_b = showTime ? end === null || end === void 0 ? void 0 : end.clone() : end === null || end === void 0 ? void 0 : end.clone().endOf('day')) !== null && _b !== void 0 ? _b : null;
+    var nextStartDate = (_a = showTime ? start === null || start === void 0 ? void 0 : start.clone().startOf('minute') : start === null || start === void 0 ? void 0 : start.clone().startOf('day')) !== null && _a !== void 0 ? _a : null;
+    var nextEndDate = (_b = showTime ? end === null || end === void 0 ? void 0 : end.clone().endOf('minute') : end === null || end === void 0 ? void 0 : end.clone().endOf('day')) !== null && _b !== void 0 ? _b : null;
     if (!nextStartDate && !nextEndDate) {
       return setDate(undefined);
     }
     if (!maxScope) {
       return setDate([nextStartDate, nextEndDate]);
     }
+    var timeDiffOfShowTime = maxScope * ONE_DAY_MILLISECOND - ONE_MINUTE_MILLISECOND;
     var _d = __read(date || [], 1),
       startDate = _d[0];
+    // 1. start和end都存在时
     if (nextStartDate && nextEndDate) {
-      var isChangeStartData = !(startDate === null || startDate === void 0 ? void 0 : startDate.clone().isSame(nextStartDate, 'day'));
+      var isChangeStartData = !(startDate === null || startDate === void 0 ? void 0 : startDate.clone().isSame(nextStartDate));
+      var momentDiffDay = nextEndDate.diff(nextStartDate) / ONE_DAY_MILLISECOND;
+      // 更改start
       if (isChangeStartData) {
-        if (nextEndDate.diff(nextStartDate, 'day') > maxScope) {
-          nextEndDate = nextStartDate.clone().add(maxScope - 1, 'day').endOf('day');
+        // 时间差大于maxScope，则将end调整到期望范围
+        if (momentDiffDay > maxScope) {
+          nextEndDate = showTime ? nextStartDate.clone().add(timeDiffOfShowTime, 'milliseconds').endOf('minute') : nextStartDate.clone().add(maxScope - 1, 'day').endOf('day');
         }
-      } else if (nextEndDate.diff(nextStartDate, 'day') > maxScope) {
-        nextStartDate = nextEndDate.clone().subtract(maxScope - 1, 'day').startOf('day');
+        // 更改end
+        // 时间差大于maxScope，则将结start调整到期望范围
+      } else if (momentDiffDay > maxScope) {
+        nextStartDate = showTime ? nextEndDate.clone().subtract(timeDiffOfShowTime, 'milliseconds').startOf('minute') : nextEndDate.clone().subtract(maxScope - 1, 'day').startOf('day');
       }
+      // 2. 仅end存在时，自动填入start
     } else if (!nextStartDate && nextEndDate) {
-      nextStartDate = nextEndDate.clone().subtract(maxScope - 1, 'day').startOf('day');
+      nextStartDate = showTime ? nextEndDate.clone().subtract(timeDiffOfShowTime, 'milliseconds').startOf('minute') : nextEndDate.clone().subtract(maxScope - 1, 'day').startOf('day');
+      // 3. 仅start存在时，自动填入end
     } else if (nextStartDate && !nextEndDate) {
-      nextEndDate = nextStartDate.clone().add(maxScope - 1, 'day').endOf('day');
+      nextEndDate = showTime ? nextStartDate.clone().add(timeDiffOfShowTime, 'milliseconds').endOf('minute') : nextStartDate.clone().add(maxScope - 1, 'day').endOf('day');
     }
     if (nextStartDate && nextEndDate) {
       return setDate([nextStartDate, nextEndDate]);
@@ -236,7 +249,7 @@ var LabelCustomizeRangePicker = function LabelCustomizeRangePicker(props) {
     var _a = __read(item.value, 2),
       startTime = _a[0],
       entTime = _a[1];
-    var space = entTime.diff(startTime, 'days');
+    var space = entTime.diff(startTime) / ONE_DAY_MILLISECOND;
     return space <= maxScope;
   }) : dataSource;
   var panelRender = function panelRender(panel) {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "assui",
-  "version": "3.1.37",
+  "version": "3.1.39",
   "description": "react ui library",
   "author": "jason <usochen@gmail.com>",
   "main": "./lib/index.js",
@@ -35,7 +35,7 @@
     "@types/react-beautiful-dnd": "^13.1.2",
     "@types/react-color": "^3.0.6",
     "@types/react-resizable": "^3.0.0",
-    "a-icons": "^1.1.59",
+    "a-icons": "^1.1.60",
     "aa-utils": "^2.1.20",
     "ahooks": "^3.0.8",
     "bignumber.js": "^9.0.1",
@@ -80,5 +80,5 @@
     "node": ">=10.0.0"
   },
   "license": "MIT",
-  "gitHead": "67cf5a4b6cecda4b1b35735aad2b375da9eaf9c7"
+  "gitHead": "4afcd51627b4018b8ce4786236c590e28692f58e"
 }