@zgfe/business-lib 1.0.21-cdp.4 → 1.0.21-cdp.7

package/es/assets/styles/chunks.less

@@ -28,6 +28,7 @@
   padding: @padding-xss;
   border: 1px solid @border-color-base;
   border-radius: @border-radius-small;
+  cursor: pointer;
 }
 
 // 下拉组件展开panel样式
@@ -44,6 +45,7 @@
   padding: 0 @padding-sm;
   line-height: @option-height;
   border-radius: @border-radius-normal;
+  cursor: pointer;
   .__default-overflow();
 
   &:not(.disabled, .active):hover {

package/es/attrConditions/components/stringList.js

@@ -165,7 +165,7 @@ var StringList = function StringList(props) {
       multiple: true,
       enableCreate: true,
       theme: props.theme,
-      size: "base",
+      size: "middle",
       className: "".concat(classPrefix, "-multi-select"),
       options: [],
       disable: true
@@ -178,7 +178,7 @@ var StringList = function StringList(props) {
     multiple: true,
     enableCreate: true,
     theme: props.theme,
-    size: "base",
+    size: "middle",
     disable: props.operate === OperateTypes.IsNull || props.operate === OperateTypes.IsNotNull,
     labelField: "name",
     keyField: "value",

package/es/cycleTime/demo/index.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/cycleTime/demo/index.js

@@ -0,0 +1,7 @@
+import React from 'react';
+import { BizCycleTime } from '@zgfe/business-lib';
+import '@zgfe/business-lib/es/assets/styles/resetAntd.less';
+import { Form } from 'antd';
+export default (function () {
+  return /*#__PURE__*/React.createElement("div", null, /*#__PURE__*/React.createElement(Form, null, /*#__PURE__*/React.createElement(Form.Item, null, /*#__PURE__*/React.createElement(BizCycleTime, null))));
+});

package/es/cycleTime/demo/multi.d.ts

@@ -0,0 +1,2 @@
+declare const _default: () => JSX.Element;
+export default _default;

package/es/cycleTime/demo/multi.js

@@ -0,0 +1,7 @@
+import React from 'react';
+import { BizCycleTime } from '@zgfe/business-lib';
+export default (function () {
+  return /*#__PURE__*/React.createElement("div", null, /*#__PURE__*/React.createElement(BizCycleTime, {
+    multiple: true
+  }));
+});

package/es/cycleTime/index.d.ts

@@ -0,0 +1,19 @@
+import { SizeType } from 'antd/es/config-provider/SizeContext';
+import React from 'react';
+import './styles/index.less';
+declare enum Unit {
+    day = "day",
+    week = "week",
+    month = "month"
+}
+interface Value {
+    unit: Unit;
+    day?: number[];
+    time?: string;
+}
+declare const BizCycleTime: React.FC<{
+    multiple?: boolean;
+    onChange?: (val: Value) => void;
+    size?: SizeType;
+}>;
+export default BizCycleTime;

package/es/cycleTime/index.js

@@ -0,0 +1,127 @@
+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 { DatePicker } from 'antd';
+import React, { useEffect, useState } from 'react';
+import { BizSelect } from '..';
+import MonthDay from './month';
+import './styles/index.less';
+var Unit;
+
+(function (Unit) {
+  Unit["day"] = "day";
+  Unit["week"] = "week";
+  Unit["month"] = "month";
+})(Unit || (Unit = {}));
+
+var BizCycleTime = function BizCycleTime(props) {
+  var multiple = props.multiple,
+      size = props.size;
+  var classPrefix = 'biz-cycle-time';
+  var unitList = [{
+    label: '每日',
+    value: Unit.day
+  }, {
+    label: '每周',
+    value: Unit.week
+  }, {
+    label: '每月',
+    value: Unit.month
+  }];
+  var days = [];
+
+  var _useState = useState(unitList[0]),
+      _useState2 = _slicedToArray(_useState, 2),
+      unit = _useState2[0],
+      setUnit = _useState2[1];
+
+  var _useState3 = useState([]),
+      _useState4 = _slicedToArray(_useState3, 2),
+      day = _useState4[0],
+      setDay = _useState4[1];
+
+  var _useState5 = useState(),
+      _useState6 = _slicedToArray(_useState5, 2),
+      dayList = _useState6[0],
+      setDayList = _useState6[1];
+
+  var _useState7 = useState(),
+      _useState8 = _slicedToArray(_useState7, 2),
+      time = _useState8[0],
+      setTime = _useState8[1];
+
+  useEffect(function () {
+    var res = {
+      unit: unit.value,
+      day: unit.value === Unit.month ? dayList === null || dayList === void 0 ? void 0 : dayList.map(function (item) {
+        return item.value;
+      }) : multiple ? day.map(function (item) {
+        return item.value;
+      }) : [day.value],
+      time: time
+    };
+
+    if (unit.value === Unit.day) {
+      delete res.day;
+    } else {
+      delete res.time;
+    }
+
+    if (props.onChange) props.onChange(res);
+  }, [unit, day, dayList, time]);
+  var nums = ['一', '二', '三', '四', '五', '六', '日'];
+
+  for (var i = 1; i < 8; i++) {
+    days.push({
+      label: "\u661F\u671F".concat(nums[i - 1]),
+      value: i
+    });
+  }
+
+  return /*#__PURE__*/React.createElement("span", {
+    className: classPrefix
+  }, /*#__PURE__*/React.createElement(BizSelect, {
+    options: unitList,
+    labelField: "label",
+    keyField: "value",
+    className: "".concat(classPrefix, "-unit"),
+    defaultValue: unit,
+    size: size,
+    onChange: function onChange(v) {
+      setUnit(v);
+    }
+  }), unit.value === Unit.day && /*#__PURE__*/React.createElement(DatePicker.TimePicker, {
+    className: "".concat(classPrefix, "-hour"),
+    size: size,
+    onChange: function onChange(time) {
+      setTime(time === null || time === void 0 ? void 0 : time.format('hh:mm:ss'));
+    }
+  }), unit.value === Unit.week && /*#__PURE__*/React.createElement(BizSelect, {
+    options: days,
+    labelField: "label",
+    keyField: "value",
+    size: size,
+    multiple: multiple,
+    className: "".concat(classPrefix, "-day"),
+    onChange: function onChange(v) {
+      setDay(v);
+    }
+  }), unit.value === Unit.month && /*#__PURE__*/React.createElement(MonthDay, {
+    onChange: setDayList
+  }));
+};
+
+BizCycleTime.defaultProps = {
+  multiple: false,
+  size: 'middle'
+};
+export default BizCycleTime;

package/es/cycleTime/month.d.ts

@@ -0,0 +1,10 @@
+import React from 'react';
+import './styles/month.less';
+import { BaseOption } from '../utils/type';
+import { SizeType } from 'antd/es/config-provider/SizeContext';
+declare const MonthDay: React.FC<{
+    size?: SizeType;
+    className?: string;
+    onChange?: (days: BaseOption<number>[]) => void;
+}>;
+export default MonthDay;

package/es/cycleTime/month.js

@@ -0,0 +1,100 @@
+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 { Dropdown, Tag } from 'antd';
+import React, { useEffect, useState } from 'react';
+import { IconFont } from '..';
+import './styles/month.less';
+import _ from 'lodash';
+
+var MonthDay = function MonthDay(props) {
+  var classPrefix = 'biz-month-day';
+
+  var _useState = useState([]),
+      _useState2 = _slicedToArray(_useState, 2),
+      chosenDayList = _useState2[0],
+      setChosenDayList = _useState2[1];
+
+  var _useState3 = useState(false),
+      _useState4 = _slicedToArray(_useState3, 2),
+      visible = _useState4[0],
+      setVisible = _useState4[1];
+
+  useEffect(function () {
+    if (props.onChange) props.onChange(chosenDayList);
+  }, [chosenDayList]);
+
+  function onClickMonthDay(day) {
+    setChosenDayList(function (list) {
+      var res = _.cloneDeep(list);
+
+      var daySelected = false;
+      res.forEach(function (item, i) {
+        if (day === item.value) {
+          res.splice(i, 1);
+          daySelected = true;
+        }
+      });
+      if (!daySelected) res.push({
+        label: String(day === 32 ? '月末' : day),
+        value: day
+      });
+      return res;
+    });
+  }
+
+  var dayList = [];
+
+  for (var i = 1; i < 33; i++) {
+    dayList.push({
+      label: String(i === 32 ? '月末' : i),
+      value: i
+    });
+  }
+
+  return /*#__PURE__*/React.createElement(Dropdown, {
+    overlay: /*#__PURE__*/React.createElement("div", {
+      className: "".concat(classPrefix, "-overlay")
+    }, dayList.map(function (item) {
+      return /*#__PURE__*/React.createElement("span", {
+        key: item.value,
+        className: "".concat(classPrefix, "-day ").concat(chosenDayList.map(function (v) {
+          return v.value;
+        }).indexOf(item.value) > -1 ? 'active' : '', " ").concat(item.value === 32 ? 'lastday' : ''),
+        onClick: function onClick() {
+          onClickMonthDay(item.value);
+        }
+      }, item.label);
+    })),
+    visible: visible,
+    onVisibleChange: setVisible,
+    trigger: ['click']
+  }, /*#__PURE__*/React.createElement("div", {
+    className: "".concat(classPrefix, "-wrapper")
+  }, /*#__PURE__*/React.createElement("div", {
+    className: "".concat(classPrefix, "-handle ").concat(props.size)
+  }, /*#__PURE__*/React.createElement("div", {
+    className: "".concat(classPrefix, "-val")
+  }, chosenDayList.map(function (item) {
+    return /*#__PURE__*/React.createElement(Tag, {
+      closable: true,
+      key: item.value
+    }, item.label);
+  })), /*#__PURE__*/React.createElement(IconFont, {
+    type: "xiangxia"
+  }))));
+};
+
+MonthDay.defaultProps = {
+  size: 'middle'
+};
+export default MonthDay;

package/es/cycleTime/styles/index.less

@@ -0,0 +1,24 @@
+@import '../../assets//styles/inner.less';
+.biz-cycle-time {
+  display: inline-block;
+  &-unit {
+    width: 129px;
+  }
+  &-day {
+    width: 210px;
+    vertical-align: top;
+    &.multi {
+      width: 470px;
+    }
+  }
+  &-unit,
+  &-day,
+  &-hour {
+    display: inline-block;
+    margin-right: @margin-xs;
+  }
+  &-hour {
+    width: 220px;
+    vertical-align: top;
+  }
+}

package/es/cycleTime/styles/month.less

@@ -0,0 +1,58 @@
+@import '../../assets//styles/inner.less';
+.biz-month-day {
+  &-handle {
+    .__select-handle();
+    display: flex;
+    flex-direction: row;
+    width: 280px;
+    &:hover,
+    &:active {
+      .__default-focused();
+    }
+    &.large {
+      min-height: @height-lg;
+    }
+    &.middle {
+      min-height: @height-base;
+    }
+    &.small {
+      min-height: @height-sm;
+    }
+    .bsicon {
+      flex: none;
+    }
+  }
+  &-val {
+    flex: 1;
+    .ant-tag {
+      margin-bottom: @margin-xss;
+    }
+  }
+  &-wrapper {
+    display: inline-block;
+    vertical-align: top;
+    &.ant-dropdown-open > .biz-month-day-handle {
+      .__default-focused();
+    }
+  }
+  &-overlay {
+    .__select-panel();
+    width: 280px;
+    padding: @padding-xss @padding-md;
+    word-break: break-all;
+  }
+  &-day {
+    .__select-option();
+    display: inline-block;
+    width: 30px;
+    height: 30px;
+    margin: 0 @margin-xss + 1 @margin-xss 0;
+    padding: 0;
+    line-height: 30px;
+    text-align: center;
+    border-radius: 100%;
+    &.lastday {
+      .__default-hover();
+    }
+  }
+}

package/es/index.d.ts

@@ -23,7 +23,8 @@ import BizUserTagsSelect from './userTagsSelector';
 import BizAddToScene from './addToScene';
 import BizAddToPanel from './addToPanel';
 import setGlobalConfig from './config';
-export { BizSearchInput, BizSelect, BizDialog, BizChart, BizTable, BizAnalysisLayout, BizUserGroup, IconFont, BizTargetSelector, BizEventSelector, BizAttributeSelector, BizGlobalDataContext, BizTargetCondition, BizDatePicker, BizConditionItem, BizConditionGroup, BizUserCondition, BizAddToScene, BizAddToPanel, ajax, util, theme, convertAttributeData, BizUserTagsSelect, setGlobalConfig, };
+import BizCycleTime from './cycleTime';
+export { BizSearchInput, BizSelect, BizDialog, BizChart, BizTable, BizAnalysisLayout, BizUserGroup, IconFont, BizTargetSelector, BizEventSelector, BizAttributeSelector, BizGlobalDataContext, BizTargetCondition, BizDatePicker, BizConditionItem, BizConditionGroup, BizUserCondition, BizAddToScene, BizAddToPanel, BizCycleTime, ajax, util, theme, convertAttributeData, BizUserTagsSelect, setGlobalConfig, };
 export type { UserGroupTypes } from './userGroup/types';
 export type { BizSelectTypes } from './select/types';
 export type { AttributeSelect } from './attributeSelector/types';

package/es/index.js

@@ -22,4 +22,5 @@ import BizUserTagsSelect from './userTagsSelector';
 import BizAddToScene from './addToScene';
 import BizAddToPanel from './addToPanel';
 import setGlobalConfig from './config';
-export { BizSearchInput, BizSelect, BizDialog, BizChart, BizTable, BizAnalysisLayout, BizUserGroup, IconFont, BizTargetSelector, BizEventSelector, BizAttributeSelector, BizGlobalDataContext, BizTargetCondition, BizDatePicker, BizConditionItem, BizConditionGroup, BizUserCondition, BizAddToScene, BizAddToPanel, ajax, util, theme, convertAttributeData, BizUserTagsSelect, setGlobalConfig };
+import BizCycleTime from './cycleTime';
+export { BizSearchInput, BizSelect, BizDialog, BizChart, BizTable, BizAnalysisLayout, BizUserGroup, IconFont, BizTargetSelector, BizEventSelector, BizAttributeSelector, BizGlobalDataContext, BizTargetCondition, BizDatePicker, BizConditionItem, BizConditionGroup, BizUserCondition, BizAddToScene, BizAddToPanel, BizCycleTime, ajax, util, theme, convertAttributeData, BizUserTagsSelect, setGlobalConfig };

package/es/select/index.js

@@ -87,20 +87,9 @@ var BizSelect = function BizSelect(props) {
     };
   }, []);
   useEffect(function () {
-    if (!props.value) {
-      setCurrent(undefined);
-      return;
-    }
-
+    if (!props.value) return;
     setCurrent(getValue(props.value));
   }, [props.value]);
-  useEffect(function () {
-    var valid = false;
-    props.options.forEach(function (item) {
-      if (current && item[props.keyField] === current[props.keyField]) valid = true;
-    });
-    if (!valid) setCurrent(undefined);
-  }, [props.options]);
 
   var getValue = function getValue(data) {
     if (props.multiple) {
@@ -208,6 +197,6 @@ BizSelect.defaultProps = {
   keyField: 'id',
   popupContainer: true,
   destroyPopupOnHide: true,
-  size: 'base'
+  size: 'middle'
 };
 export default BizSelect;

package/es/select/types.d.ts

@@ -1,3 +1,4 @@
+import { SizeType } from 'antd/es/config-provider/SizeContext';
 import { ReactNode } from 'react';
 export declare namespace BizSelectTypes {
     interface Group {
@@ -16,7 +17,7 @@ export declare namespace BizSelectTypes {
         className?: string;
         type?: 'group' | 'normal';
         theme?: string;
-        size?: 'lg' | 'base' | 'sm';
+        size?: SizeType;
         border?: boolean;
         multiple?: boolean;
         minDropdownWidth?: number;
@@ -65,7 +66,7 @@ export interface HandlerTypes {
     keyField?: string | number;
     disable?: boolean;
     theme?: string;
-    size?: 'lg' | 'base' | 'sm';
+    size?: SizeType;
     border?: boolean;
     onDelete?: (data: BizSelectTypes.Option) => void;
     onSearch?: (val: string) => void;

package/es/utils/type.d.ts

@@ -5,6 +5,10 @@ export interface Event {
     label?: string | number;
     [prop: string]: any;
 }
+export interface BaseOption<T> {
+    label: string;
+    value: T;
+}
 export interface EventType {
     aliasName?: string;
     option?: string | number | Event;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@zgfe/business-lib",
-  "version": "1.0.21-cdp.4",
+  "version": "1.0.21-cdp.7",
   "scripts": {
     "start": "dumi dev",
     "docs:build": "dumi build",
@@ -58,5 +58,5 @@
     "react": "^16.12.0 || ^17.0.0",
     "yorkie": "^2.0.0"
   },
-  "gitHead": "8e93c85ca8036cffd2fa7ec3562ae142214ecc4c"
+  "gitHead": "00a9093d07cfe74ca4f8c8bf379400a86f5601c7"
 }