assui 3.1.38 → 3.1.40

package/es/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/es/label-condition-select-input/style/index.js

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

package/es/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/es/label-customize-range-picker/index.js

@@ -55,6 +55,10 @@ import LabelRangePicker from '../label-range-picker';
 import LocaleContext from '../config-provider/context';
 import formatMessage from '../messages';
 import { formatMaxScope } from './utils';
+/** 1整天的毫秒数 */
+var ONE_DAY_MILLISECOND = 1000 * 60 * 60 * 24;
+/** 1分钟的毫秒数 */
+var ONE_MINUTE_MILLISECOND = 1000 * 60;
 var RangePicker = DatePicker.RangePicker;
 var LabelCustomizeRangePicker = function LabelCustomizeRangePicker(props) {
   var customizeTimeList = props.customizeTimeList,
@@ -151,29 +155,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]);
@@ -193,7 +206,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/lib/condition-select-input/index.d.ts

@@ -25,7 +25,10 @@ export interface ConditionSelectInputProps {
     conditionInputProps?: ConditionInputProps;
     /** 联动selectProps */
     conditionSelectProps?: SelectProps;
+    /** onChange */
     onChange?: (value: ValueType) => void;
+    /** onBlur */
+    onBlur?: (value: ValueType) => void;
     /** 输入框类型 */
     inputType?: InputTypeEnum;
     /** select options */

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

@@ -99,7 +99,8 @@ var ConditionSelectInput = function ConditionSelectInput(props) {
     _b = props.inputType,
     inputType = _b === void 0 ? InputTypeEnum.CONDITION_INPUT : _b,
     _c = props.optionsList,
-    optionsList = _c === void 0 ? [] : _c;
+    optionsList = _c === void 0 ? [] : _c,
+    onBlur = props.onBlur;
   var isInput = inputType === InputTypeEnum.CONDITION_INPUT;
   var _d = __read((0, useControllableValue_1["default"])(props), 2),
     selectInputValue = _d[0],
@@ -148,19 +149,24 @@ var ConditionSelectInput = function ConditionSelectInput(props) {
       inputValue: inputValue
     });
   };
+  var onConditionSelectInputBlur = function onConditionSelectInputBlur() {
+    onBlur === null || onBlur === void 0 ? void 0 : onBlur(selectInputValue);
+  };
   // 是否展示输入框
   var isShowInput = !(0, isNil_1["default"])(selectInputValue === null || selectInputValue === void 0 ? void 0 : selectInputValue.selectValue) && !(hiddenInputKeys === null || hiddenInputKeys === void 0 ? void 0 : hiddenInputKeys.includes(selectInputValue.selectValue));
   var typeInput = isInput ? react_1["default"].createElement("div", {
     className: "condition-select-input"
   }, react_1["default"].createElement(condition_input_1["default"], __assign({}, conditionInputProps, {
     onChange: onInputChange,
-    value: selectInputValue === null || selectInputValue === void 0 ? void 0 : selectInputValue.inputValue
+    value: selectInputValue === null || selectInputValue === void 0 ? void 0 : selectInputValue.inputValue,
+    onBlur: onConditionSelectInputBlur
   }))) : react_1["default"].createElement("div", {
     className: "condition-select-select-input"
   }, react_1["default"].createElement(select_1["default"], __assign({}, conditionSelectProps, {
     onChange: onTypeSelectChange,
     value: selectInputValue === null || selectInputValue === void 0 ? void 0 : selectInputValue.inputValue,
-    options: subSelectOptions
+    options: subSelectOptions,
+    onBlur: onConditionSelectInputBlur
   })));
   return react_1["default"].createElement("div", {
     className: "condition-select-wrap"
@@ -172,7 +178,8 @@ var ConditionSelectInput = function ConditionSelectInput(props) {
   }, react_1["default"].createElement(select_1["default"], __assign({}, selectProps, {
     onChange: onSelectChange,
     value: selectInputValue === null || selectInputValue === void 0 ? void 0 : selectInputValue.selectValue,
-    options: optionsList
+    options: optionsList,
+    onBlur: onConditionSelectInputBlur
   }))), isShowInput && typeInput);
 };
 exports["default"] = ConditionSelectInput;

package/lib/index.d.ts

@@ -78,3 +78,5 @@ export { default as BeautifulDnd } from './beautiful-dnd';
 export { default as Resizable } from './resizable';
 export type { FlexProps } from './flex';
 export { default as Flex } from './flex';
+export type { LabelConditionSelectInputProps } from './label-condition-select-input';
+export { default as LabelConditionSelectInput } from './label-condition-select-input';

package/lib/index.js

@@ -8,7 +8,7 @@ var __importDefault = this && this.__importDefault || function (mod) {
 Object.defineProperty(exports, "__esModule", {
   value: true
 });
-exports.Flex = exports.Resizable = exports.BeautifulDnd = exports.RichTextEditor = exports.LabelCustomizeRangePicker = exports.TableCol = exports.LabelTreeSelect = exports.LabelConditionInput = exports.LabelNumberInput = exports.LabelAutoComplete = exports.LabelDatePicker = exports.LabelRangePicker = exports.JsonEditor = exports.AreaText = exports.LabelTextArea = exports.ASelect = exports.LabelSelect = exports.ColorSelect = exports.LabelInput = exports.TextInput = exports.TextArea = exports.SplitPane = exports.sortableHoc = exports.SingleImgUpload = exports.RcTransitionGroup = exports.RcQRcode = exports.RcEcharts = exports.StepNumberInput = exports.LabelRangeNumber = exports.NumberInput = exports.RcMotion = exports.KeepTab = exports.ImgCrop = exports.HighlightWords = exports.HighlightTextarea = exports.CopyToClipboard = exports.NumberFormatInput = exports.ConfigProvider = exports.ConditionSelectInput = exports.ConditionInput = exports.ButtonModal = exports.ButtonDrawer = void 0;
+exports.LabelConditionSelectInput = exports.Flex = exports.Resizable = exports.BeautifulDnd = exports.RichTextEditor = exports.LabelCustomizeRangePicker = exports.TableCol = exports.LabelTreeSelect = exports.LabelConditionInput = exports.LabelNumberInput = exports.LabelAutoComplete = exports.LabelDatePicker = exports.LabelRangePicker = exports.JsonEditor = exports.AreaText = exports.LabelTextArea = exports.ASelect = exports.LabelSelect = exports.ColorSelect = exports.LabelInput = exports.TextInput = exports.TextArea = exports.SplitPane = exports.sortableHoc = exports.SingleImgUpload = exports.RcTransitionGroup = exports.RcQRcode = exports.RcEcharts = exports.StepNumberInput = exports.LabelRangeNumber = exports.NumberInput = exports.RcMotion = exports.KeepTab = exports.ImgCrop = exports.HighlightWords = exports.HighlightTextarea = exports.CopyToClipboard = exports.NumberFormatInput = exports.ConfigProvider = exports.ConditionSelectInput = exports.ConditionInput = exports.ButtonModal = exports.ButtonDrawer = void 0;
 var button_drawer_1 = require("./button-drawer");
 Object.defineProperty(exports, "ButtonDrawer", {
   enumerable: true,
@@ -302,4 +302,11 @@ Object.defineProperty(exports, "Flex", {
   get: function get() {
     return __importDefault(flex_1)["default"];
   }
+});
+var label_condition_select_input_1 = require("./label-condition-select-input");
+Object.defineProperty(exports, "LabelConditionSelectInput", {
+  enumerable: true,
+  get: function get() {
+    return __importDefault(label_condition_select_input_1)["default"];
+  }
 });

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

@@ -0,0 +1,43 @@
+import React from 'react';
+import type { LabelConditionInputProps } from '../label-condition-input';
+import type { LabelSelectProps } from '../label-select';
+export declare enum InputTypeEnum {
+    CONDITION_INPUT = "conditionInput",
+    SELECT = "select"
+}
+declare type SelectOptionsType = {
+    value: number;
+    label: string;
+};
+export interface MainSelectOptionsType extends SelectOptionsType {
+    children?: SelectOptionsType[];
+}
+export interface ValueType {
+    selectValue?: number | string | null;
+    inputValue?: LabelSelectProps['value'] | LabelConditionInputProps['value'];
+}
+export interface LabelConditionSelectInputProps {
+    value?: ValueType;
+    /** 不需要展示联动输入框的字段值 */
+    hiddenInputKeys?: ValueType['selectValue'][];
+    /** selectProps */
+    selectProps?: LabelSelectProps;
+    /** 联动inputProps */
+    conditionInputProps?: LabelConditionInputProps;
+    /** 联动selectProps */
+    conditionSelectProps?: LabelSelectProps;
+    /** onChange */
+    onChange?: (value: ValueType) => void;
+    /** onBlur */
+    onBlur?: (value: ValueType) => void;
+    /** 输入框类型 */
+    inputType?: InputTypeEnum;
+    /** select options */
+    optionsList: MainSelectOptionsType[];
+    /** label */
+    label?: React.ReactNode;
+    /** 样式 */
+    className?: string;
+}
+declare const LabelConditionSelect: (props: LabelConditionSelectInputProps) => JSX.Element;
+export default LabelConditionSelect;

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

@@ -0,0 +1,188 @@
+"use strict";
+
+var __assign = this && this.__assign || function () {
+  __assign = Object.assign || function (t) {
+    for (var s, i = 1, n = arguments.length; i < n; i++) {
+      s = arguments[i];
+      for (var p in s) {
+        if (Object.prototype.hasOwnProperty.call(s, p)) t[p] = s[p];
+      }
+    }
+    return t;
+  };
+  return __assign.apply(this, arguments);
+};
+var __createBinding = this && this.__createBinding || (Object.create ? function (o, m, k, k2) {
+  if (k2 === undefined) k2 = k;
+  var desc = Object.getOwnPropertyDescriptor(m, k);
+  if (!desc || ("get" in desc ? !m.__esModule : desc.writable || desc.configurable)) {
+    desc = {
+      enumerable: true,
+      get: function get() {
+        return m[k];
+      }
+    };
+  }
+  Object.defineProperty(o, k2, desc);
+} : function (o, m, k, k2) {
+  if (k2 === undefined) k2 = k;
+  o[k2] = m[k];
+});
+var __setModuleDefault = this && this.__setModuleDefault || (Object.create ? function (o, v) {
+  Object.defineProperty(o, "default", {
+    enumerable: true,
+    value: v
+  });
+} : function (o, v) {
+  o["default"] = v;
+});
+var __importStar = this && this.__importStar || function (mod) {
+  if (mod && mod.__esModule) return mod;
+  var result = {};
+  if (mod != null) for (var k in mod) {
+    if (k !== "default" && Object.prototype.hasOwnProperty.call(mod, k)) __createBinding(result, mod, k);
+  }
+  __setModuleDefault(result, mod);
+  return result;
+};
+var __read = this && this.__read || function (o, n) {
+  var m = typeof Symbol === "function" && o[Symbol.iterator];
+  if (!m) return o;
+  var i = m.call(o),
+    r,
+    ar = [],
+    e;
+  try {
+    while ((n === void 0 || n-- > 0) && !(r = i.next()).done) {
+      ar.push(r.value);
+    }
+  } catch (error) {
+    e = {
+      error: error
+    };
+  } finally {
+    try {
+      if (r && !r.done && (m = i["return"])) m.call(i);
+    } finally {
+      if (e) throw e.error;
+    }
+  }
+  return ar;
+};
+var __importDefault = this && this.__importDefault || function (mod) {
+  return mod && mod.__esModule ? mod : {
+    "default": mod
+  };
+};
+Object.defineProperty(exports, "__esModule", {
+  value: true
+});
+exports.InputTypeEnum = void 0;
+var isNil_1 = __importDefault(require("lodash/isNil"));
+var classnames_1 = __importDefault(require("classnames"));
+var react_1 = __importStar(require("react"));
+var useControllableValue_1 = __importDefault(require("ahooks/lib/useControllableValue"));
+var label_condition_input_1 = __importDefault(require("../label-condition-input"));
+var label_select_1 = __importDefault(require("../label-select"));
+var InputTypeEnum;
+(function (InputTypeEnum) {
+  InputTypeEnum["CONDITION_INPUT"] = "conditionInput";
+  InputTypeEnum["SELECT"] = "select";
+})(InputTypeEnum = exports.InputTypeEnum || (exports.InputTypeEnum = {}));
+var LabelConditionSelect = function LabelConditionSelect(props) {
+  var value = props.value,
+    _a = props.hiddenInputKeys,
+    hiddenInputKeys = _a === void 0 ? [] : _a,
+    selectProps = props.selectProps,
+    conditionInputProps = props.conditionInputProps,
+    conditionSelectProps = props.conditionSelectProps,
+    _b = props.inputType,
+    inputType = _b === void 0 ? InputTypeEnum.CONDITION_INPUT : _b,
+    _c = props.optionsList,
+    optionsList = _c === void 0 ? [] : _c,
+    label = props.label,
+    className = props.className,
+    onBlur = props.onBlur;
+  var isInput = inputType === InputTypeEnum.CONDITION_INPUT;
+  var _d = __read((0, useControllableValue_1["default"])(props), 2),
+    selectInputValue = _d[0],
+    setSelectInputValue = _d[1];
+  var _e = __read((0, react_1.useState)([]), 2),
+    subSelectOptions = _e[0],
+    setSubSelectOptions = _e[1];
+  (0, react_1.useEffect)(function () {
+    if (value && value.selectValue && optionsList.length) {
+      var _a = __read(optionsList.filter(function (item) {
+          return item.value === value.selectValue;
+        }), 1),
+        selectValueItem = _a[0];
+      if (selectValueItem && selectValueItem.children) {
+        setSubSelectOptions(selectValueItem.children);
+      }
+    }
+  }, [value, optionsList]);
+  var onSelectChange = function onSelectChange(selectValue) {
+    var inputValue = isInput ? '' : undefined;
+    setSelectInputValue({
+      selectValue: selectValue,
+      inputValue: inputValue
+    });
+    if (isInput || (0, isNil_1["default"])(selectValue)) {
+      setSubSelectOptions([]);
+      return;
+    }
+    var _a = __read(optionsList.filter(function (item) {
+        return item.value === selectValue;
+      }), 1),
+      selectValueItem = _a[0];
+    if (selectValueItem.children) {
+      setSubSelectOptions(selectValueItem.children);
+    }
+  };
+  var onInputChange = function onInputChange(inputValue) {
+    setSelectInputValue({
+      selectValue: selectInputValue === null || selectInputValue === void 0 ? void 0 : selectInputValue.selectValue,
+      inputValue: inputValue
+    });
+  };
+  var onTypeSelectChange = function onTypeSelectChange(inputValue) {
+    setSelectInputValue({
+      selectValue: selectInputValue === null || selectInputValue === void 0 ? void 0 : selectInputValue.selectValue,
+      inputValue: inputValue
+    });
+  };
+  var onLabelConditionSelectInputBlur = function onLabelConditionSelectInputBlur() {
+    onBlur === null || onBlur === void 0 ? void 0 : onBlur(selectInputValue);
+  };
+  // 是否展示输入框
+  var isShowInput = !(0, isNil_1["default"])(selectInputValue === null || selectInputValue === void 0 ? void 0 : selectInputValue.selectValue) && !(hiddenInputKeys === null || hiddenInputKeys === void 0 ? void 0 : hiddenInputKeys.includes(selectInputValue.selectValue));
+  var typeInput = isInput ? react_1["default"].createElement(label_condition_input_1["default"], __assign({}, conditionInputProps, {
+    onChange: onInputChange,
+    className: "label-condition-select-second-input",
+    value: selectInputValue === null || selectInputValue === void 0 ? void 0 : selectInputValue.inputValue,
+    onBlur: onLabelConditionSelectInputBlur
+  })) : react_1["default"].createElement("div", {
+    className: "label-condition-select-second-select"
+  }, react_1["default"].createElement(label_select_1["default"], __assign({}, conditionSelectProps, {
+    onChange: onTypeSelectChange,
+    value: selectInputValue === null || selectInputValue === void 0 ? void 0 : selectInputValue.inputValue,
+    options: subSelectOptions,
+    onBlur: onLabelConditionSelectInputBlur
+  })));
+  return react_1["default"].createElement("div", {
+    className: (0, classnames_1["default"])('label-condition-select', className)
+  }, react_1["default"].createElement("div", {
+    className: (0, classnames_1["default"])('label-condition-select-selector', {
+      'label-condition-select-two-select-selector': !isInput,
+      'label-condition-select-only-selector': !isShowInput
+    })
+  }, react_1["default"].createElement(label_select_1["default"], __assign({
+    label: label
+  }, selectProps, {
+    onChange: onSelectChange,
+    value: selectInputValue === null || selectInputValue === void 0 ? void 0 : selectInputValue.selectValue,
+    options: optionsList,
+    onBlur: onLabelConditionSelectInputBlur
+  }))), isShowInput && typeInput);
+};
+exports["default"] = LabelConditionSelect;