@zgfe/business-lib 1.0.24 → 1.0.25-1.0.27-adanalysis.0

package/es/assets/styles/resetAntd.less

@@ -303,13 +303,15 @@
   .ant-modal-body {
     max-height: 400px;
     max-height: 400px !important;
-    padding-top: @padding-xs !important;
-    // padding-bottom: 0 !important;
     overflow: auto !important;
     &:not(:last-child) {
       padding-bottom: 0 !important;
     }
   }
+  //只有当有header的时候才修改body的间距
+  .ant-modal-header + .ant-modal-body {
+    padding-top: @padding-xs !important;
+  }
 }
 
 // 分页

package/es/datePicker/datePicker.js

@@ -35,9 +35,7 @@ var BizDate = function BizDate(props) {
     setDateRange(props.value ? props.value : initValue);
   }, []);
   useEffect(function () {
-    var _props$dateCount;
-
-    if (!((_props$dateCount = props.dateCount) === null || _props$dateCount === void 0 ? void 0 : _props$dateCount.count)) return;
+    if (!props.dateCount) return;
     var date = getDateRange(props.type, props.dateCount.count, !!includeToday);
     setDateRange(date);
     if (props.onChange) props.onChange(date, true);

package/es/datePicker/demo/day.d.ts

@@ -0,0 +1,3 @@
+import '@zgfe/business-lib/es/assets/styles/resetAntd.less';
+declare const _default: () => JSX.Element;
+export default _default;

package/es/datePicker/demo/day.js

@@ -0,0 +1,49 @@
+function _slicedToArray(arr, i) { return _arrayWithHoles(arr) || _iterableToArrayLimit(arr, i) || _unsupportedIterableToArray(arr, i) || _nonIterableRest(); }
+
+function _nonIterableRest() { throw new TypeError("Invalid attempt to destructure non-iterable instance.\nIn order to be iterable, non-array objects must have a [Symbol.iterator]() method."); }
+
+function _unsupportedIterableToArray(o, minLen) { if (!o) return; if (typeof o === "string") return _arrayLikeToArray(o, minLen); var n = Object.prototype.toString.call(o).slice(8, -1); if (n === "Object" && o.constructor) n = o.constructor.name; if (n === "Map" || n === "Set") return Array.from(o); if (n === "Arguments" || /^(?:Ui|I)nt(?:8|16|32)(?:Clamped)?Array$/.test(n)) return _arrayLikeToArray(o, minLen); }
+
+function _arrayLikeToArray(arr, len) { if (len == null || len > arr.length) len = arr.length; for (var i = 0, arr2 = new Array(len); i < len; i++) { arr2[i] = arr[i]; } return arr2; }
+
+function _iterableToArrayLimit(arr, i) { var _i = arr == null ? null : typeof Symbol !== "undefined" && arr[Symbol.iterator] || arr["@@iterator"]; if (_i == null) return; var _arr = []; var _n = true; var _d = false; var _s, _e; try { for (_i = _i.call(arr); !(_n = (_s = _i.next()).done); _n = true) { _arr.push(_s.value); if (i && _arr.length === i) break; } } catch (err) { _d = true; _e = err; } finally { try { if (!_n && _i["return"] != null) _i["return"](); } finally { if (_d) throw _e; } } return _arr; }
+
+function _arrayWithHoles(arr) { if (Array.isArray(arr)) return arr; }
+
+import { BizDatePicker } from '@zgfe/business-lib';
+import React, { useState } from 'react';
+import '@zgfe/business-lib/es/assets/styles/resetAntd.less';
+import { Divider, Switch } from 'antd';
+export default (function () {
+  var _useState = useState({
+    unit: 'day',
+    begin: '2022-05-03',
+    end: '2022-05-30',
+    relative: [0, 1]
+  }),
+      _useState2 = _slicedToArray(_useState, 2),
+      time = _useState2[0],
+      setTime = _useState2[1];
+
+  var _useState3 = useState(false),
+      _useState4 = _slicedToArray(_useState3, 2),
+      includeToday = _useState4[0],
+      setIncludeToday = _useState4[1];
+
+  var handleChange = function handleChange(data) {
+    setTime(function () {
+      return data;
+    });
+  };
+
+  return /*#__PURE__*/React.createElement("div", null, /*#__PURE__*/React.createElement("div", null, "\u5305\u542B\u300C\u4ECA\u5929\u300D: ", /*#__PURE__*/React.createElement(Switch, {
+    defaultChecked: includeToday,
+    onChange: setIncludeToday
+  })), /*#__PURE__*/React.createElement(Divider, null), /*#__PURE__*/React.createElement(BizDatePicker, {
+    hideSelector: true,
+    includeTodayAndYesterday: true,
+    onChange: handleChange,
+    includeToday: includeToday,
+    defaultValue: time
+  }), /*#__PURE__*/React.createElement("br", null), /*#__PURE__*/React.createElement("p", null, "\u5F53\u524D\u503C\uFF1A", JSON.stringify(time)));
+});

package/es/datePicker/index.js

@@ -17,7 +17,7 @@ function _iterableToArrayLimit(arr, i) { var _i = arr == null ? null : typeof Sy
 function _arrayWithHoles(arr) { if (Array.isArray(arr)) return arr; }
 
 import React, { useEffect, useState } from 'react';
-import { dateList } from './utils';
+import { getDateList } from './utils';
 import BizSelect from '../select';
 import BizDate from './datePicker';
 import './styles/index.less';
@@ -25,6 +25,8 @@ import { Skeleton } from 'antd';
 export var classPrefix = 'biz-date-picker';
 
 var BizDatePicker = function BizDatePicker(props) {
+  var dateList = getDateList(props.includeTodayAndYesterday || false);
+
   var _useState = useState(dateList[0]),
       _useState2 = _slicedToArray(_useState, 2),
       currentType = _useState2[0],
@@ -108,7 +110,7 @@ var BizDatePicker = function BizDatePicker(props) {
     paragraph: {
       rows: 1
     }
-  }, /*#__PURE__*/React.createElement(BizSelect, {
+  }, !props.hideSelector ? /*#__PURE__*/React.createElement(BizSelect, {
     className: "".concat(classPrefix, "-type"),
     value: currentType,
     labelField: "label",
@@ -116,7 +118,7 @@ var BizDatePicker = function BizDatePicker(props) {
     theme: "secondary",
     options: dateList,
     onChange: onChangeDateType
-  }), /*#__PURE__*/React.createElement("div", {
+  }) : '', /*#__PURE__*/React.createElement("div", {
     className: "".concat(classPrefix, "-list")
   }, currentType.children.map(function (item, index) {
     return /*#__PURE__*/React.createElement("div", {

package/es/datePicker/styles/index.less

@@ -9,10 +9,11 @@
 
   &-list {
     display: flex;
-    margin: 0 16px;
+    margin: 0 16px 0 0;
   }
 
   .biz-select-handle {
+    margin-right: 16px;
     padding: 0;
   }
 

package/es/datePicker/types.d.ts

@@ -12,6 +12,8 @@ export declare namespace DatePickerTypes {
         value?: Value;
         includeToday?: boolean;
         onChange?: (data: Value) => void;
+        includeTodayAndYesterday?: boolean;
+        hideSelector?: boolean;
     }
     interface Option {
         label: string;

package/es/datePicker/utils.d.ts

@@ -1,5 +1,6 @@
 import { DatePickerTypes } from './types';
 export declare const dateList: DatePickerTypes.Option[];
+export declare function getDateList(lastTwoDays: boolean): DatePickerTypes.Option[];
 export declare const getDateRange: (type: 'hour' | 'day' | 'week' | 'month', count: number, includeToday: boolean) => {
     begin: string;
     end: string;

package/es/datePicker/utils.js

@@ -1,4 +1,17 @@
+function _toConsumableArray(arr) { return _arrayWithoutHoles(arr) || _iterableToArray(arr) || _unsupportedIterableToArray(arr) || _nonIterableSpread(); }
+
+function _nonIterableSpread() { throw new TypeError("Invalid attempt to spread non-iterable instance.\nIn order to be iterable, non-array objects must have a [Symbol.iterator]() method."); }
+
+function _unsupportedIterableToArray(o, minLen) { if (!o) return; if (typeof o === "string") return _arrayLikeToArray(o, minLen); var n = Object.prototype.toString.call(o).slice(8, -1); if (n === "Object" && o.constructor) n = o.constructor.name; if (n === "Map" || n === "Set") return Array.from(o); if (n === "Arguments" || /^(?:Ui|I)nt(?:8|16|32)(?:Clamped)?Array$/.test(n)) return _arrayLikeToArray(o, minLen); }
+
+function _iterableToArray(iter) { if (typeof Symbol !== "undefined" && iter[Symbol.iterator] != null || iter["@@iterator"] != null) return Array.from(iter); }
+
+function _arrayWithoutHoles(arr) { if (Array.isArray(arr)) return _arrayLikeToArray(arr); }
+
+function _arrayLikeToArray(arr, len) { if (len == null || len > arr.length) len = arr.length; for (var i = 0, arr2 = new Array(len); i < len; i++) { arr2[i] = arr[i]; } return arr2; }
+
 import moment from 'moment';
+import _ from 'lodash';
 export var dateList = [{
   label: '按小时',
   value: 'hour',
@@ -49,8 +62,31 @@ export var dateList = [{
     count: 3
   }]
 }];
+export function getDateList(lastTwoDays) {
+  var list = _.cloneDeep(dateList);
+
+  if (lastTwoDays) {
+    var dayData = list.find(function (item) {
+      return item.value == 'day';
+    });
+
+    if (!dayData.children.find(function (item) {
+      return item.value == '今天';
+    })) {
+      dayData.children = [{
+        value: '今天',
+        count: 0
+      }, {
+        value: '昨天',
+        count: 1
+      }].concat(_toConsumableArray(dayData.children));
+    }
+  }
+
+  return list;
+}
 export var getDateRange = function getDateRange(type, count, includeToday) {
-  var endDate = moment().subtract(includeToday ? 0 : 1, 'days').format('YYYY-MM-DD'),
+  var endDate = moment().subtract(includeToday || count == 0 ? 0 : 1, 'days').format('YYYY-MM-DD'),
       startDate = '';
 
   if (type === 'month') {

package/es/select/handle.js

@@ -105,11 +105,13 @@ var SelectHandle = /*#__PURE__*/React.forwardRef(function (props, ref) {
 
   return /*#__PURE__*/React.createElement("div", {
     ref: handleRef,
-    className: "".concat(classPrefix, "-input ").concat(classPrefix, "-single-input ").concat(props.theme ? props.theme : '', "\n      ").concat(props.disable ? 'disable' : '', " ").concat(focus ? 'active' : '', " \n      ").concat(border ? '' : 'borderless', " ").concat(props.size ? props.size : 'middle'),
+    className: "".concat(classPrefix, "-input ").concat(props.theme ? props.theme : '', "\n      ").concat(props.disable ? 'disable' : '', " ").concat(focus ? 'active' : '', " \n      ").concat(border ? '' : 'borderless', " ").concat(props.size ? props.size : 'middle'),
     title: props.label || props.value && props.value[labelField]
+  }, /*#__PURE__*/React.createElement("span", {
+    className: "".concat(classPrefix, "-content")
   }, props.label || props.value && props.value[labelField] || /*#__PURE__*/React.createElement("span", {
     className: "".concat(classPrefix, "-holder")
-  }, placeholder || '请选择'), /*#__PURE__*/React.createElement(IconFont, {
+  }, placeholder || '请选择')), /*#__PURE__*/React.createElement(IconFont, {
     className: "".concat(classPrefix, "-expand-icon"),
     type: 'xiangxia'
   }));

package/es/select/styles/handle.less

@@ -4,8 +4,7 @@
   &-input {
     position: relative;
     flex: 1;
-    padding: 0px 8px;
-
+    padding: 0px 6px 0 8px;
     &.disable {
       .__disable();
       .bsicon {
@@ -78,24 +77,19 @@
     font-size: @font-size-base;
   }
 
-  &-single-input {
-    .__default-overflow();
-  }
-
   &-holder {
     color: @input-placeholder-color;
   }
-
+  &-content {
+    flex: 1;
+    .__default-overflow();
+  }
   &-expand-icon {
-    position: absolute;
-    top: 50%;
-    right: 8px;
-    flex: none;
-    color: @text-color-secondary;
-    font-size: @font-size-lg;
-    transform: translateY(-50%);
+    width: 14px;
+    margin-left: 5px;
   }
   &-input {
+    display: flex;
     #biz-select-handle-tag {
       display: flex;
       align-items: center;

package/es/targetSelector/styles/index.less

@@ -7,6 +7,7 @@
 
   .biz-event-select {
     flex: 1;
+    width: 0;
   }
 
   .biz-event-select-handle {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@zgfe/business-lib",
-  "version": "1.0.24",
+  "version": "1.0.25-1.0.27-adanalysis.0",
   "scripts": {
     "start": "dumi dev",
     "docs:build": "dumi build",
@@ -58,5 +58,5 @@
     "react": "^16.12.0 || ^17.0.0",
     "yorkie": "^2.0.0"
   },
-  "gitHead": "ac0ce337e692e43ec70d2ae2fadb4a4927904478"
+  "gitHead": "69898635f2e044895a788358c6c0230aa25891c8"
 }