@king-design/intact 3.5.1 → 3.6.0-beta.0

package/es/components/datepicker/useValue.js

@@ -38,6 +38,7 @@ export function useValue(formats, disabled, panel) {
       multiple = _instance$get3.multiple,
       type = _instance$get3.type,
       range = _instance$get3.range;
+    var activePosition = instance.activePosition.position.value;
     var _value;
     if (range) {
       var oldValue = last(value.value);
@@ -48,9 +49,24 @@ export function useValue(formats, disabled, panel) {
          * #877
          */
         flag = PanelFlags.Start;
-        _value = [fixDatetimeWithMinDate(v)];
+        if ((type === 'datetime' || type === 'date') && (oldValue == null ? void 0 : oldValue.length) === 2) {
+          // Use activePosition instead of Coordinate  
+          _value = activePosition === 'end' ? [oldValue[0], fixDatetimeWithMinDate(v)] : multiple ? [fixDatetimeWithMinDate(v)] : [fixDatetimeWithMinDate(v), oldValue[1]];
+        } else {
+          _value = [fixDatetimeWithMinDate(v)];
+        }
       } else {
-        _value = [oldValue[0], fixDatetimeWithMaxDate(v)];
+        if (type === 'datetime') {
+          if (oldValue.length === 1) {
+            // 如果只有开始日期，根据activePosition决定是替换开始日期还是设置结束日期
+            _value = activePosition === 'end' ? [oldValue[0], fixDatetimeWithMaxDate(v)] : [fixDatetimeWithMaxDate(v)];
+          } else {
+            // oldValue.length === 2的情况
+            _value = activePosition === 'end' ? [oldValue[0], fixDatetimeWithMaxDate(v)] : multiple ? [fixDatetimeWithMaxDate(v)] : [fixDatetimeWithMaxDate(v), oldValue[1]];
+          }
+        } else {
+          _value = [oldValue[0], fixDatetimeWithMaxDate(v)];
+        }
         _sortInstanceProperty(_value).call(_value, function (a, b) {
           return a.isAfter(b) ? 1 : -1;
         });
@@ -70,6 +86,14 @@ export function useValue(formats, disabled, panel) {
       } else {
         panel.changePanel(PanelTypes.Time, flag);
       }
+    } else if (type === 'week') {
+      _value = v.startOf('week');
+      setValue(_value, false);
+      instance.hide();
+    } else if (type === 'quarter') {
+      _value = v.startOf('quarter');
+      setValue(_value, false);
+      instance.hide();
     } else if (!multiple && (!range || _value.length === 2)) {
       instance.hide();
     }

package/es/components/datepicker/useWeeks.d.ts

@@ -0,0 +1,19 @@
+import dayjs, { Dayjs } from 'dayjs';
+import { State } from '../../hooks/useState';
+import type { useStatus } from './useStatus';
+export declare function useWeeks(showDate: State<Dayjs>, status: ReturnType<typeof useStatus>, focusDate: State<Dayjs | null>): {
+    getWeeks: (now: Dayjs) => {
+        week: number;
+        days: {
+            isExceed: boolean;
+            label: number;
+            value: dayjs.Dayjs;
+            isActive: boolean;
+            isToday: boolean;
+            isDisabled: boolean;
+            isHover: boolean;
+            isInRange: boolean;
+        }[];
+    }[];
+    onClick: (day: Dayjs) => void;
+};

package/es/components/datepicker/useWeeks.js

@@ -0,0 +1,48 @@
+import { useInstance } from 'intact';
+export function useWeeks(showDate, status, focusDate) {
+  var instance = useInstance();
+  function getWeeks(now) {
+    var weeks = [];
+    // 从当前显示月份的月初开始，并调整到该周的开始  
+    var startOfMonth = showDate.value.startOf('month');
+    var start = startOfMonth.startOf('week');
+    var current = start;
+    var currentMonth = showDate.value.month();
+    // 遍历6周，以覆盖整个月份  
+    for (var weekIndex = 0; weekIndex < 6; weekIndex++) {
+      var weekNumber = current.week(); // 获取当前周的周数  
+      var days = [];
+      // 遍历一周的7天  
+      for (var i = 0; i < 7; i++) {
+        var day = current.add(i, 'day');
+        var isFirstOrLastDay = i === 0 || i === 6;
+        days.push({
+          isExceed: day.month() !== currentMonth,
+          label: day.date(),
+          value: day,
+          isActive: isFirstOrLastDay && status.isActive(day, 'week'),
+          isToday: day.isSame(now, 'week'),
+          isDisabled: status.isDisabled(day),
+          isHover: day.isSame(focusDate.value, 'week'),
+          isInRange: !isFirstOrLastDay && status.isActive(day, 'week')
+        });
+      }
+      // 每周的数据，包括周数和7天的信息  
+      weeks.push({
+        week: weekNumber,
+        days: days
+      });
+      current = current.add(1, 'week'); // 移动到下一周的开始  
+    }
+    return weeks;
+  }
+  function onClick(day) {
+    var weekStart = day.startOf('week');
+    showDate.set(weekStart); // 设置显示日期为周的开始  
+    instance.triggerChange(weekStart); // 触发日期改变事件  
+  }
+  return {
+    getWeeks: getWeeks,
+    onClick: onClick
+  };
+}

package/es/components/dialog/useFixBody.js

@@ -1,72 +1,20 @@
-import _Set from "@babel/runtime-corejs3/core-js/set";
-import { useInstance, onBeforeUnmount } from 'intact';
-import { scrollbarWidth } from '../position';
+import { useInstance } from 'intact';
+import { useFixBody as useFixBodyHook, setHooks as setFixBodyHooks } from '../../hooks/useFixBody';
 import { SHOW } from './constants';
-var dialogs = new _Set();
-var originalStyle = null;
-var hooks = null;
 export function useFixBody(elementRef) {
   var instance = useInstance();
-  var fixedBody = false;
+  var fixBodyHook = useFixBodyHook();
   instance.on(SHOW, onEnter);
   instance.on('afterClose', onAfterLeave);
-  onBeforeUnmount(function () {
-    // should also remove body style when dialog is removed, #805
-    // if (fixedBody && instance.get('value')) {
-    if (fixedBody) {
-      // maybe HIDE event has not triggered
-      onClosed(instance);
-    }
-  });
   function onEnter() {
     if (instance.get('overlay')) {
-      fixedBody = true;
-      onOpen(instance);
+      fixBodyHook.onOpen();
     }
   }
   function onAfterLeave() {
-    if (fixedBody) {
-      fixedBody = false;
-      onClosed(instance);
-    }
+    fixBodyHook.onClose();
   }
 }
 export function setHooks(h) {
-  hooks = h;
-}
-function onOpen(dialog) {
-  var body = document.body;
-  if (dialogs.size === 0) {
-    var bodyStyle = body.style;
-    originalStyle = body.getAttribute('style');
-    bodyStyle.overflow = 'hidden';
-    var scrollBarWidth = shouldFixBody();
-    if (scrollBarWidth) {
-      bodyStyle.paddingRight = scrollBarWidth + "px";
-    }
-    if (hooks && hooks.onStart) {
-      hooks.onStart(scrollBarWidth);
-    }
-  }
-  dialogs.add(dialog);
-}
-function onClosed(dialog) {
-  var body = document.body;
-  dialogs.delete(dialog);
-  if (dialogs.size === 0) {
-    if (originalStyle) {
-      // console.log(originalStyle);
-      body.setAttribute('style', originalStyle);
-    } else {
-      body.removeAttribute('style');
-    }
-    if (hooks && hooks.onEnd) {
-      hooks.onEnd();
-    }
-  }
-}
-function shouldFixBody() {
-  if (document.body.scrollHeight > (window.innerHeight || document.documentElement.clientHeight)) {
-    return scrollbarWidth();
-  }
+  setFixBodyHooks(h);
 }

package/es/components/ellipsis/styles.js

@@ -6,5 +6,5 @@ setDefault(function () {
   makeStyles == null || makeStyles.clearCache();
 });
 export var makeStyles = cache(function makeStyles(k, maxLines) {
-  return /*#__PURE__*/css("width:100%;&.", k, "-multiline{.k-ellipsis-wrapper{white-space:normal;display:-webkit-box;-webkit-line-clamp:", maxLines, ";-webkit-box-orient:vertical;}}");
+  return /*#__PURE__*/css("width:100%;&.", k, "-multiline{.k-ellipsis-wrapper{white-space:normal;display:-webkit-box;-webkit-line-clamp:", maxLines, ";-webkit-box-orient:vertical;overflow:hidden;text-overflow:ellipsis;line-clamp:", maxLines, ";box-orient:vertical;}}");
 });

package/es/components/form/styles.js

@@ -46,7 +46,7 @@ setDefault(function () {
   makeFormStyles == null || makeFormStyles.clearCache();
 });
 export var makeItemStyles = cache(function makeItemStyles(k) {
-  return /*#__PURE__*/css("display:flex;position:relative;&:not(:last-of-type){margin-bottom:", form.item.gap, ";}&.", k, "-fluid>.", k, "-form-content{flex:1;}.", k, "-form-label{display:flex;align-items:center;justify-content:", form.item.labelTextAlign === 'right' ? 'end' : 'start', ";width:", form.item.labelWidth, ";padding-right:", form.item.labelGap, ";max-height:", form.item.labelHeight, ";flex-shrink:0;}.", k, "-form-star{color:", form.item.starColor, ";margin-right:", form.item.starGap, ";}.", k, "-form-content{position:relative;}.", k, "-form-error{position:absolute;color:", form.item.errorColor, ";font-size:", form.item.errorFontSize, ";left:0;right:0;display:flex;align-items:center;&.", k, "-ellipsis{.", k, "-form-error-more{display:inline-block;}}}.", k, "-form-error-more{line-height:", form.item.errorFontSize, ";display:none;}&.", k, "-invalid{.", k, "-input{.", k, "-input-wrapper{border:", form.item.invalidBorder, ";position:relative;z-index:1;}}.", k, "-select,.", k, "-checkbox-wrapper,.", k, "-radio-wrapper{border:", form.item.invalidBorder, "!important;}.", k, "-select .", k, "-input .", k, "-input-wrapper{border:none;}}.", k, "-form-append{padding:", form.item.appendPadding, ";vertical-align:middle;}");
+  return /*#__PURE__*/css("display:flex;position:relative;&:not(:last-of-type){margin-bottom:", form.item.gap, ";}&.", k, "-fluid>.", k, "-form-content{flex:1;min-width:0;}.", k, "-form-label{display:flex;align-items:center;justify-content:", form.item.labelTextAlign === 'right' ? 'end' : 'start', ";width:", form.item.labelWidth, ";padding-right:", form.item.labelGap, ";max-height:", form.item.labelHeight, ";flex-shrink:0;}.", k, "-form-star{color:", form.item.starColor, ";margin-right:", form.item.starGap, ";}.", k, "-form-content{position:relative;}.", k, "-form-error{position:absolute;color:", form.item.errorColor, ";font-size:", form.item.errorFontSize, ";left:0;right:0;display:flex;align-items:center;&.", k, "-ellipsis{.", k, "-form-error-more{display:inline-block;}}}.", k, "-form-error-more{line-height:", form.item.errorFontSize, ";display:none;}&.", k, "-invalid{.", k, "-input{.", k, "-input-wrapper{border:", form.item.invalidBorder, ";position:relative;z-index:1;}}.", k, "-select,.", k, "-checkbox-wrapper,.", k, "-radio-wrapper{border:", form.item.invalidBorder, "!important;}.", k, "-select .", k, "-input .", k, "-input-wrapper{border:none;}}.", k, "-form-append{padding:", form.item.appendPadding, ";vertical-align:middle;}");
 });
 export var makeFormStyles = cache(function makeFormStyles(k) {
   var _context;

package/es/components/scrollSelect/index.spec.js

@@ -3,14 +3,12 @@ import _asyncToGenerator from "@babel/runtime-corejs3/helpers/asyncToGenerator";
 import _concatInstanceProperty from "@babel/runtime-corejs3/core-js/instance/concat";
 import _mapInstanceProperty from "@babel/runtime-corejs3/core-js/instance/map";
 import _regeneratorRuntime from "@babel/runtime-corejs3/regenerator";
-import { mount, unmount, dispatchEvent, wait } from '../../test/utils';
+import { mount, dispatchEvent, wait } from '../../test/utils';
 import BasicDemo from '~/components/scrollSelect/demos/basic';
 import { ScrollSelect } from './';
 import { Component } from 'intact';
 describe('ScrollSelect', function () {
-  afterEach(function () {
-    return unmount();
-  });
+  // afterEach(() => unmount());
   it('should select by scroll', /*#__PURE__*/_asyncToGenerator( /*#__PURE__*/_regeneratorRuntime.mark(function _callee() {
     var _mount, instance, element;
     return _regeneratorRuntime.wrap(function _callee$(_context) {
@@ -18,14 +16,14 @@ describe('ScrollSelect', function () {
         case 0:
           _mount = mount(BasicDemo), instance = _mount[0], element = _mount[1]; // scroll
           dispatchEvent(element.firstElementChild, 'wheel', {
-            deltaY: 1
+            deltaY: 30
           });
           _context.next = 4;
           return wait(100);
         case 4:
           expect(instance.get('value')).to.eql(1);
           dispatchEvent(element.firstElementChild, 'wheel', {
-            deltaY: -1
+            deltaY: -30
           });
           _context.next = 8;
           return wait(100);

package/es/components/scrollSelect/useMouseEvents.js

@@ -21,11 +21,11 @@ export function useMouseEvents(translate, list) {
         deltaY = meta.deltaY;
       },
       onMove: function onMove(e) {
-        var deltaY = e.clientY - y;
+        var deltaY = (e.clientY - y) * 0.8;
         dragged = !!deltaY;
         y = e.clientY;
         var _deltaY = y - initY;
-        var offsetIndex = Math.floor(Math.abs(_deltaY) / itemHeight);
+        var offsetIndex = Math.floor(Math.abs(_deltaY) / itemHeight * 1.2);
         if (offsetIndex) {
           if (_deltaY < 0) {
             offsetIndex = -offsetIndex;
@@ -60,24 +60,36 @@ export function useMouseEvents(translate, list) {
   function onWheel(e) {
     e.preventDefault();
     itemHeight = getItemHeight();
-    if (e.deltaY > 0) {
-      // down
-      setByRelativeIndex(1, null, true);
-    } else {
-      setByRelativeIndex(-1, null, true);
+    var threshold = itemHeight * 0.6;
+    deltaY = (deltaY || 0) + e.deltaY;
+    if (Math.abs(deltaY) >= threshold) {
+      if (deltaY > 0) {
+        setByRelativeIndex(1, null, true);
+      } else {
+        setByRelativeIndex(-1, null, true);
+      }
+      deltaY = 0;
     }
   }
   // throttle onWheel
-  var _onWheel = throttle(onWheel, 0, function (e) {
+  var _onWheel = throttle(onWheel, 50, function (e) {
     return e.preventDefault();
   });
   function onClick(item, index) {
-    // if _dragged, do not trigger click event, #123
+    var _context2;
+    // if dragged, do not trigger click event
     if (dragged) return;
     var _instance$get = instance.get(),
       count = _instance$get.count;
     var half = Math.floor(count / 2);
     var itemHeight = getItemHeight();
+    var currentIndex = _findIndexInstanceProperty(_context2 = list.data.value).call(_context2, function (v) {
+      return v.value === list.value.value;
+    });
+    var targetOffset = index - half;
+    if (currentIndex + targetOffset < 0 || currentIndex + targetOffset >= list.data.value.length) {
+      return;
+    }
     translate.set(translate.value - itemHeight * (index - half));
     marginTop.set(marginTop.value + itemHeight * (index - half));
     list.setValue(item.value, true);

package/es/components/select/base.vdt.js

@@ -44,7 +44,8 @@ export default function ($props, $blocks, $__proto__) {
     position = _this$get.position,
     flat = _flatInstanceProperty(_this$get),
     nowrap = _this$get.nowrap,
-    draggable = _this$get.draggable;
+    draggable = _this$get.draggable,
+    range = _this$get.range;
   var k = this.config.k;
   var classNameObj = (_classNameObj = {}, _classNameObj[k + "-select"] = true, _classNameObj[k + "-disabled"] = disabled, _classNameObj[k + "-" + size] = size !== 'default', _classNameObj[k + "-fluid"] = fluid, _classNameObj[k + "-inline"] = inline, _classNameObj[k + "-flat"] = flat, _classNameObj[k + "-nowrap"] = nowrap, _classNameObj[className] = className, _classNameObj[$props.className] = $props.className, _classNameObj[makeStyles(k)] = true, _classNameObj);
   var placeholder = this.getPlaceholder();
@@ -122,7 +123,8 @@ export default function ($props, $blocks, $__proto__) {
               'key': 'input',
               'readonly': !show,
               'waveDisabled': true,
-              'flat': flat
+              'flat': flat,
+              'ev-click': $props.onClick
             }, 'input', inputRef) : !filterable && !hasValue ? _$ce(2, 'div', placeholder, 0, _$cn(k + "-select-placeholder c-ellipsis"), null, 'placeholder') : !multiple ? _$ce(2, 'div', (_$blocks['value'] = function ($super) {
               return label;
             }, __$blocks['value'] = function ($super, data) {