@zgfe/business-lib 1.2.66-hxd.2 → 1.2.70-hxd.1

package/es/datePickerV2/shortcut.js

@@ -15,7 +15,8 @@ import moment from 'moment';
 var PickerShortcut = function PickerShortcut(_ref) {
   var selectRange = _ref.selectRange,
     selectRangeUnit = _ref.selectRangeUnit,
-    timeRangeOpen = _ref.timeRangeOpen;
+    timeRangeOpen = _ref.timeRangeOpen,
+    shortcuts = _ref.shortcuts;
   var _useContext = useContext(DatePickerContext),
     currentType = _useContext.currentType,
     includeToday = _useContext.includeToday,
@@ -25,7 +26,7 @@ var PickerShortcut = function PickerShortcut(_ref) {
     setOpen = _useContext.setOpen;
   var _useContext2 = useContext(BizGlobalDataContext),
     envs = _useContext2.envs;
-  var list = getTypeList(currentType, includeToday);
+  var list = getTypeList(currentType, includeToday, shortcuts);
   var _useState = useState(),
     _useState2 = _slicedToArray(_useState, 2),
     active = _useState2[0],
@@ -39,7 +40,7 @@ var PickerShortcut = function PickerShortcut(_ref) {
     isError = _useState6[0],
     setIsError = _useState6[1];
   useEffect(function () {
-    list = getTypeList(currentType, includeToday);
+    list = getTypeList(currentType, includeToday, shortcuts);
     if (relative) {
       setActive(relative[0]);
       setNumbers(relative[0]);

package/es/datePickerV2/styles/index.less

@@ -1,194 +1,194 @@
-@import '../../assets/styles/inner.less';
-
-.biz-date-picker-old-wrap {
-  display: flex;
-
-  &-type {
-    width: 88px;
-  }
-
-  &-shortcut {
-    display: flex;
-  }
-
-  &-list {
-    display: flex;
-    // margin: 0 16px 0 0;
-
-    &-relative {
-      display: flex;
-      gap: 24px;
-      align-items: center;
-      margin-left: 16px;
-
-      &-content {
-        display: flex;
-        align-items: center;
-        span {
-          margin: 0 8px;
-        }
-
-        .ant-input-number {
-          background-color: #fff !important;
-          border: 1px solid var(---, #ecedf0);
-          border-radius: 4px;
-        }
-      }
-    }
-  }
-
-  .biz-select-handle {
-    margin-right: 8px;
-    padding: 0;
-  }
-
-  &-item {
-    display: flex;
-    align-items: center;
-    justify-content: center;
-    width: 58px;
-    height: @height-base;
-    color: @text-color-secondary;
-    border: 1px solid @border-color-base;
-    cursor: pointer;
-
-    &:first-child {
-      border-radius: @border-radius-small 0px 0px @border-radius-small;
-    }
-
-    &:last-child {
-      border-radius: 0px @border-radius-small @border-radius-small 0px;
-    }
-
-    &:not(:last-child) {
-      border-right: none;
-    }
-
-    &:hover {
-      .__default-hover();
-      border-color: @border-color-base;
-    }
-
-    &.active {
-      color: @primary-color;
-      background: @primary-color-hover;
-      border: 1px solid @primary-color;
-    }
-  }
-
-  &-input {
-    display: flex;
-    flex-shrink: 0;
-    gap: 4px;
-    align-items: center;
-    justify-content: space-between;
-    width: 262px;
-    padding: 0px 12px;
-    font-size: 14px;
-    background: #fff;
-    border: 1px solid var(---, #ecedf0);
-    border-radius: 4px;
-
-    &-label {
-      display: flex;
-      gap: 4px;
-      align-items: center;
-    }
-
-    &:hover {
-      // color: #165dff;
-      border-color: @primary-color;
-      cursor: pointer;
-    }
-
-    &:focus {
-      border-color: @primary-color;
-    }
-
-    &:active {
-      border-color: @primary-color;
-    }
-
-    &-active {
-      border-color: @primary-color;
-      box-shadow: 0 0 0 4px #f0f7ff;
-    }
-
-    &-popover {
-      padding-top: 0 !important;
-      .ant-popover-arrow {
-        display: none;
-      }
-
-      .ant-popover-inner-content {
-        padding: 0 16px 16px;
-      }
-
-      .ant-picker-dropdown {
-        padding-top: 0;
-
-        .ant-picker-range-arrow {
-          display: none;
-        }
-      }
-
-      .ant-tabs-top > .ant-tabs-nav::before {
-        border-bottom: 1px solid #fafafb;
-      }
-
-      .ant-tabs-tab {
-        padding: 12px 0 !important;
-        font-size: 14px !important;
-      }
-
-      .ant-popover-inner {
-        background: #fff;
-        border-radius: 8px;
-        box-shadow: 0px 4px 10px 0px rgba(0, 0, 0, 0.1);
-      }
-    }
-
-    &-error {
-      position: relative;
-      border: 1px solid var(--io-Error-E-, #fb5547) !important;
-
-      &::after {
-        position: absolute;
-        width: 67px;
-        color: red;
-        font-size: 12px;
-        content: '请输入内容';
-      }
-    }
-  }
-
-  &-panel {
-    & div:last-of-type {
-      position: relative !important;
-    }
-    .biz-date-picker-old-wrap-drop {
-      top: 0 !important;
-      margin-top: 12px;
-      padding: 0;
-    }
-    .ant-picker-panel-container {
-      background: #fff;
-      border: 1px solid var(--io-n-02, #f2f3f4);
-      border-radius: 10px;
-      box-shadow: none;
-    }
-
-    .ant-picker-panel-container .ant-picker-panel-focused {
-      border-color: var(--io-n-02, #f2f3f4);
-    }
-  }
-
-  &-popoverContent-btns {
-    position: absolute;
-    top: 0;
-    right: 0;
-    display: flex;
-    gap: 16px;
-    justify-content: flex-end;
-  }
-}
+@import '../../assets/styles/inner.less';
+
+.biz-date-picker-old-wrap {
+  display: flex;
+
+  &-type {
+    width: 88px;
+  }
+
+  &-shortcut {
+    display: flex;
+  }
+
+  &-list {
+    display: flex;
+    // margin: 0 16px 0 0;
+
+    &-relative {
+      display: flex;
+      gap: 24px;
+      align-items: center;
+      margin-left: 16px;
+
+      &-content {
+        display: flex;
+        align-items: center;
+        span {
+          margin: 0 8px;
+        }
+
+        .ant-input-number {
+          background-color: #fff !important;
+          border: 1px solid var(---, #ecedf0);
+          border-radius: 4px;
+        }
+      }
+    }
+  }
+
+  .biz-select-handle {
+    margin-right: 8px;
+    padding: 0;
+  }
+
+  &-item {
+    display: flex;
+    align-items: center;
+    justify-content: center;
+    width: 58px;
+    height: @height-base;
+    color: @text-color-secondary;
+    border: 1px solid @border-color-base;
+    cursor: pointer;
+
+    &:first-child {
+      border-radius: @border-radius-small 0px 0px @border-radius-small;
+    }
+
+    &:last-child {
+      border-radius: 0px @border-radius-small @border-radius-small 0px;
+    }
+
+    &:not(:last-child) {
+      border-right: none;
+    }
+
+    &:hover {
+      .__default-hover();
+      border-color: @border-color-base;
+    }
+
+    &.active {
+      color: @primary-color;
+      background: @primary-color-hover;
+      border: 1px solid @primary-color;
+    }
+  }
+
+  &-input {
+    display: flex;
+    flex-shrink: 0;
+    gap: 4px;
+    align-items: center;
+    justify-content: space-between;
+    width: 262px;
+    padding: 0px 12px;
+    font-size: 14px;
+    background: #fff;
+    border: 1px solid var(---, #ecedf0);
+    border-radius: 4px;
+
+    &-label {
+      display: flex;
+      gap: 4px;
+      align-items: center;
+    }
+
+    &:hover {
+      // color: #165dff;
+      border-color: @primary-color;
+      cursor: pointer;
+    }
+
+    &:focus {
+      border-color: @primary-color;
+    }
+
+    &:active {
+      border-color: @primary-color;
+    }
+
+    &-active {
+      border-color: @primary-color;
+      box-shadow: 0 0 0 4px #f0f7ff;
+    }
+
+    &-popover {
+      padding-top: 0 !important;
+      .ant-popover-arrow {
+        display: none;
+      }
+
+      .ant-popover-inner-content {
+        padding: 0 16px 16px;
+      }
+
+      .ant-picker-dropdown {
+        padding-top: 0;
+
+        .ant-picker-range-arrow {
+          display: none;
+        }
+      }
+
+      .ant-tabs-top > .ant-tabs-nav::before {
+        border-bottom: 1px solid #fafafb;
+      }
+
+      .ant-tabs-tab {
+        padding: 12px 0 !important;
+        font-size: 14px !important;
+      }
+
+      .ant-popover-inner {
+        background: #fff;
+        border-radius: 8px;
+        box-shadow: 0px 4px 10px 0px rgba(0, 0, 0, 0.1);
+      }
+    }
+
+    &-error {
+      position: relative;
+      border: 1px solid var(--io-Error-E-, #fb5547) !important;
+
+      &::after {
+        position: absolute;
+        width: 67px;
+        color: red;
+        font-size: 12px;
+        content: '请输入内容';
+      }
+    }
+  }
+
+  &-panel {
+    & div:last-of-type {
+      position: relative !important;
+    }
+    .biz-date-picker-old-wrap-drop {
+      top: 0 !important;
+      margin-top: 12px;
+      padding: 0;
+    }
+    .ant-picker-panel-container {
+      background: #fff;
+      border: 1px solid var(--io-n-02, #f2f3f4);
+      border-radius: 10px;
+      box-shadow: none;
+    }
+
+    .ant-picker-panel-container .ant-picker-panel-focused {
+      border-color: var(--io-n-02, #f2f3f4);
+    }
+  }
+
+  &-popoverContent-btns {
+    position: absolute;
+    top: 0;
+    right: 0;
+    display: flex;
+    gap: 16px;
+    justify-content: flex-end;
+  }
+}

package/es/datePickerV2/types.d.ts

@@ -25,6 +25,8 @@ export declare namespace DatePickerTypes {
         onChange?: (data: Value) => void;
         onOpenChange?: (data: boolean) => void;
         dateTypeList?: Unit[];
+        hiddenUnitType?: boolean;
+        shortcuts?: DatePickerTypes.Option[];
     }
     interface Option {
         label: string;

package/es/datePickerV2/utils.d.ts

@@ -5,7 +5,7 @@ export declare const getDateRange: (type: DatePickerTypes.Unit, count: number, i
     end: string;
 };
 export declare const isTodayInRange: (_startDate: moment.Moment, _endDate: moment.Moment) => boolean;
-export declare const getTypeList: (currentType: DatePickerTypes.Unit, includeToday: boolean) => DatePickerTypes.ListOption[];
+export declare const getTypeList: (currentType: DatePickerTypes.Unit, includeToday: boolean, shortcuts?: DatePickerTypes.Option[]) => DatePickerTypes.ListOption[];
 export declare const DateOptionMap: {
     day: string;
     week: string;

package/es/datePickerV2/utils.js

@@ -39,9 +39,9 @@ export var isTodayInRange = function isTodayInRange(_startDate, _endDate) {
   var dateToCheck = moment(new Date()).format('x');
   return dateToCheck >= startDate && dateToCheck <= endDate;
 };
-export var getTypeList = function getTypeList(currentType, includeToday) {
-  var _shortcuts$find;
-  var shortcuts = [{
+export var getTypeList = function getTypeList(currentType, includeToday, shortcuts) {
+  var _find;
+  var defaultShortcuts = [{
     label: '按小时',
     value: DatePickerTypes.Unit.hour,
     children: [{
@@ -104,9 +104,9 @@ export var getTypeList = function getTypeList(currentType, includeToday) {
       count: 4
     }]
   }];
-  var list = (((_shortcuts$find = shortcuts.find(function (item) {
+  var list = (((_find = (shortcuts ? shortcuts : defaultShortcuts).find(function (item) {
     return item.value === currentType;
-  })) === null || _shortcuts$find === void 0 ? void 0 : _shortcuts$find.children) || []).filter(function (item) {
+  })) === null || _find === void 0 ? void 0 : _find.children) || []).filter(function (item) {
     if (currentType === 'day') {
       if (!includeToday && (item.count === 0 || item.count === 1)) return false;
       return true;

package/es/demoWrapper/index.less

@@ -1,3 +1,3 @@
-@import '~antd/dist/antd.less';
-@import '../assets/iconfont/iconfont.css';
-@import '../assets/styles/resetAntd.less';
+@import '~antd/dist/antd.less';
+@import '../assets/iconfont/iconfont.css';
+@import '../assets/styles/resetAntd.less';

package/es/dialog/styles/index.less

@@ -1,22 +1,22 @@
-@import '../../assets/styles/inner.less';
-
-.biz-dialog {
-  &-input.ant-input-affix-wrapper {
-    border-radius: @border-radius-small;
-  }
-
-  .ant-form-item-label > label {
-    height: @height-lg;
-  }
-}
-.biz-dialog-wrap {
-  .ant-modal-close {
-    top: 5px;
-    right: 5px;
-
-    .bsicon {
-      color: @text-color;
-      font-size: 24px !important;
-    }
-  }
-}
+@import '../../assets/styles/inner.less';
+
+.biz-dialog {
+  &-input.ant-input-affix-wrapper {
+    border-radius: @border-radius-small;
+  }
+
+  .ant-form-item-label > label {
+    height: @height-lg;
+  }
+}
+.biz-dialog-wrap {
+  .ant-modal-close {
+    top: 5px;
+    right: 5px;
+
+    .bsicon {
+      color: @text-color;
+      font-size: 24px !important;
+    }
+  }
+}

package/es/dnd/styles/index.less

@@ -1,19 +1,19 @@
-@import '../../assets/styles/inner.less';
-.biz-dnd {
-  &-item {
-    cursor: move;
-    user-select: none;
-    &.disable,
-    &.handle {
-      cursor: inherit;
-      user-select: inherit;
-    }
-  }
-  &-handle {
-    cursor: move;
-    user-select: none;
-  }
-  &-temp {
-    pointer-events: none;
-  }
-}
+@import '../../assets/styles/inner.less';
+.biz-dnd {
+  &-item {
+    cursor: move;
+    user-select: none;
+    &.disable,
+    &.handle {
+      cursor: inherit;
+      user-select: inherit;
+    }
+  }
+  &-handle {
+    cursor: move;
+    user-select: none;
+  }
+  &-temp {
+    pointer-events: none;
+  }
+}