shineout 2.0.5-beta.5 → 2.0.5-beta.7

package/css/Cascader/Props.d.ts

@@ -307,6 +307,7 @@ export interface ResultItemProps<DataItem> {
     singleRemove?: boolean;
     click: (data: DataItem, isPopover: boolean) => void;
     only: boolean;
+    isDisabled: boolean;
 }
 /** ------ CascaderProps ------ * */
 declare type CascaderPropsWithTableConsumber<Item, Value extends CascaderBaseValue> = GetTableConsumerProps<OriginCascaderProps<Item, Value>>;

package/css/Cascader/Result.js

@@ -55,7 +55,8 @@ function Item(_ref) {
       isPopover = _ref.isPopover,
       singleRemove = _ref.singleRemove,
       click = _ref.click,
-      only = _ref.only;
+      only = _ref.only,
+      isDisabled = _ref.isDisabled;
   var onClose = close ? function (e) {
     close(data, isPopover, e);
   } : undefined;
@@ -64,9 +65,9 @@ function Item(_ref) {
   } : undefined;
   return _react.default.createElement("a", {
     tabIndex: -1,
-    className: (0, _classnames.default)((0, _styles3.cascaderClass)((0, _classname.getDirectionClass)('item'), only && 'item-only'), className),
+    className: (0, _classnames.default)((0, _styles3.cascaderClass)((0, _classname.getDirectionClass)('item'), only && 'item-only', isDisabled && 'item-disabled'), className),
     onClick: onClick
-  }, children, singleRemove && _react.default.createElement("span", {
+  }, children, singleRemove && !isDisabled && _react.default.createElement("span", {
     className: (0, _styles3.cascaderClass)((0, _classname.getDirectionClass)('single-remove')),
     onClick: onClose
   }, _icons.default.Close));
@@ -278,6 +279,7 @@ function (_PureComponent) {
       singleRemove: singleRemove,
       close: this.removeTargetNode,
       isPopover: true,
+      isDisabled: datum.isDisabled(datum.getKey(data)),
       click: this.handleNodeClick
     }), res);
   };

package/css/Cascader/styles/cascader.css

@@ -126,6 +126,10 @@
   font-size: var(--font-size-base, 14px);
   color: var(--gray-700, #495057);
 }
+.so-cascader-result .so-cascader-item-disabled {
+  cursor: not-allowed;
+  color: var(--input-disabled-color, #999DA8);
+}
 .so-cascader-result .so-cascader-input {
   display: -webkit-inline-box;
   display: -ms-inline-flexbox;
@@ -246,7 +250,7 @@ div.so-cascader-options {
 }
 .so-input-rtl .so-cascader-no-data,
 .so-list-rtl .so-cascader-no-data {
-  padding: 6px 12px 6px 12px 12;
+  padding: 6px 12px 6px 24px;
 }
 .so-cascader-no-data:hover {
   color: var(--select-item-active-color, #292d32);

package/css/DatePicker/Day.js

@@ -185,7 +185,8 @@ function (_PureComponent) {
         range = _this$props6.range,
         rangeTemp = _this$props6.rangeTemp,
         min = _this$props6.min,
-        max = _this$props6.max;
+        max = _this$props6.max,
+        type = _this$props6.type;
 
     var minD = minDate || min && _utils.default.toDate(_utils.default.format(min, minStr, this.getOptions()), this.getOptions());
 
@@ -194,18 +195,29 @@ function (_PureComponent) {
     var isDisabled = disabled && typeof disabled === 'function' ? disabled(date) : false; // only for single, single picker don't has index
 
     if (index === undefined && !isDisabled) {
-      if (minD && _utils.default.compareAsc(date, minD) < 0 || maxD && _utils.default.compareAsc(date, maxD) > 0) isDisabled = true;
+      if (type === 'week') {
+        if (minD && _utils.default.compareWeek(date, minD, 0, this.getOptions()) < 0) isDisabled = true;
+        if (maxD && _utils.default.compareWeek(date, maxD, 0, this.getOptions()) > 0) isDisabled = true;
+      } else if (minD && _utils.default.compareAsc(date, minD) < 0 || maxD && _utils.default.compareAsc(date, maxD) > 0) isDisabled = true;
     }
 
     if (!isDisabled && index === 1 && rangeTemp) {
-      if (typeof range === 'number' && _utils.default.compareAsc(date, _utils.default.addSeconds(rangeTemp, range, this.getOptions())) > 0 || _utils.default.compareAsc(date, _utils.default.clearHMS(rangeTemp, this.getOptions())) < 0 || min && _utils.default.compareAsc(date, _utils.default.clearHMS(min, this.getOptions())) < 0 || _utils.default.compareAsc(date, max) > 0) {
+      if (type === 'week') {
+        if (typeof range === 'number' && _utils.default.compareWeek(date, _utils.default.addSeconds(rangeTemp, range, this.getOptions()), 0, this.getOptions()) > 0 || _utils.default.compareWeek(date, _utils.default.clearHMS(rangeTemp, this.getOptions()), 0, this.getOptions()) < 0) {
+          isDisabled = true;
+        }
+      } else if (typeof range === 'number' && _utils.default.compareAsc(date, _utils.default.addSeconds(rangeTemp, range, this.getOptions())) > 0 || _utils.default.compareAsc(date, _utils.default.clearHMS(rangeTemp, this.getOptions())) < 0 || min && _utils.default.compareAsc(date, _utils.default.clearHMS(min, this.getOptions())) < 0 || _utils.default.compareAsc(date, max) > 0) {
         isDisabled = true;
       } // if (utils.compareAsc(date, min) < 0) isDisabled = true
 
     }
 
     if (!isDisabled && index === 0) {
-      if (min && _utils.default.compareAsc(date, _utils.default.clearHMS(min, this.getOptions())) < 0 || _utils.default.compareAsc(date, max) > 0) {
+      if (type === 'week') {
+        if (min && _utils.default.compareWeek(date, _utils.default.clearHMS(min, this.getOptions()), 0, this.getOptions()) < 0 || max && _utils.default.compareWeek(date, max, 0, this.getOptions()) > 0) {
+          isDisabled = true;
+        }
+      } else if (min && _utils.default.compareAsc(date, _utils.default.clearHMS(min, this.getOptions())) < 0 || _utils.default.compareAsc(date, max) > 0) {
         isDisabled = true;
       }
     }

package/css/DatePicker/styles/datepicker.css

@@ -280,12 +280,19 @@ label.so-datepicker-r-year {
   display: -ms-flexbox;
   display: flex;
 }
+.so-datepicker-range-picker > div:nth-child(2) {
+  padding-left: 6px;
+}
+.so-datepicker-rtl .so-datepicker-range-picker > div:nth-child(2) {
+  padding-left: 0;
+  padding-right: 6px;
+}
 .so-datepicker-range-picker > div:nth-last-child(2) {
-  margin-right: 12px;
+  padding-right: 6px;
 }
 .so-datepicker-rtl .so-datepicker-range-picker > div:nth-last-child(2) {
-  margin-right: 0;
-  margin-left: 12px;
+  padding-left: 6px;
+  padding-right: 0;
 }
 .so-datepicker-range-picker > div:last-child {
   position: relative;
@@ -293,7 +300,7 @@ label.so-datepicker-r-year {
 .so-datepicker-range-picker > div:last-child:before {
   content: ' ';
   position: absolute;
-  left: -6px;
+  left: 0px;
   height: 100%;
   border-left: 1px solid var(--divider-color, #f0f0f0);
 }

package/css/DatePicker/utils.d.ts

@@ -25,6 +25,7 @@ declare function isInvalid(date: unknown): boolean;
 declare function toDateWithFormat(dirtyDate: DateTimeType, fmt?: string, def?: Date, options?: DateOptions): Date;
 declare function compareDay(dateLeft: Date, dateRight: Date, pad: number | undefined, options: DateOptions): number;
 declare function compareMonth(dateLeft: Date, dateRight: Date, pad: number | undefined, options: DateOptions): number;
+declare function compareWeek(dateLeft: Date, dateRight: Date, pad: number | undefined, options: DateOptions): number;
 declare function compareYear(dateLeft: Date, dateRight: Date, pad: number | undefined, options: DateOptions): number;
 declare function compareQuarter(dateLeft: Date, dateRight: Date, pad: number | undefined, options: DateOptions): number;
 declare function newDate(defaultDate?: Date | DateTimeType, options?: DateOptions): Date;
@@ -44,6 +45,7 @@ declare const _default: {
     cloneTime: typeof cloneTime;
     compareAsc: typeof compareAsc;
     compareMonth: typeof compareMonth;
+    compareWeek: typeof compareWeek;
     compareDay: typeof compareDay;
     compareQuarter: typeof compareQuarter;
     getDaysOfMonth: typeof getDaysOfMonth;

package/css/DatePicker/utils.js

@@ -318,6 +318,17 @@ function compareMonth(dateLeft, dateRight, pad, options) {
   return compareAsc(left, right);
 }
 
+function compareWeek(dateLeft, dateRight, pad, options) {
+  if (pad === void 0) {
+    pad = 0;
+  }
+
+  if (!dateLeft || !dateRight) return 0;
+  var left = (0, _dayjs.default)(transDateWithZone(dateLeft, options)).startOf('isoWeek').toDate();
+  var right = (0, _dayjs.default)(transDateWithZone(dateRight, options)).startOf('isoWeek').add(pad, 'week').toDate();
+  return compareAsc(left, right);
+}
+
 function compareYear(dateLeft, dateRight, pad, options) {
   if (pad === void 0) {
     pad = 0;
@@ -431,6 +442,7 @@ var _default = {
   cloneTime: cloneTime,
   compareAsc: compareAsc,
   compareMonth: compareMonth,
+  compareWeek: compareWeek,
   compareDay: compareDay,
   compareQuarter: compareQuarter,
   getDaysOfMonth: getDaysOfMonth,

package/css/index.js

@@ -220,6 +220,6 @@ exports.Upload = _Upload.default;
 // Created by scripts/src-index.js.
 var _default = {
   utils: utils,
-  version: '2.0.5-beta.5'
+  version: '2.0.5-beta.7'
 };
 exports.default = _default;