@zgfe/business-lib 1.0.21-cdp.6 → 1.0.21-cdp.9

package/es/assets/styles/chunks.less

@@ -108,8 +108,6 @@
 
 // 下拉框默认样式
 .__select-default {
-  height: @height-lg;
-  line-height: @height-lg;
   background-color: @background-color-base;
   border: 1px solid @background-color-base;
   border-radius: @border-radius-small;

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

@@ -1,2 +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

@@ -1,5 +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(BizCycleTime, null));
+  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/index.d.ts

@@ -1,17 +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"
+export declare enum CycleTimeUnit {
+    day = 1,
+    week = 2,
+    month = 3
 }
 interface Value {
-    unit: Unit;
+    unit: CycleTimeUnit;
     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

@@ -15,26 +15,27 @@ import React, { useEffect, useState } from 'react';
 import { BizSelect } from '..';
 import MonthDay from './month';
 import './styles/index.less';
-var Unit;
+export var CycleTimeUnit;
 
-(function (Unit) {
-  Unit["day"] = "day";
-  Unit["week"] = "week";
-  Unit["month"] = "month";
-})(Unit || (Unit = {}));
+(function (CycleTimeUnit) {
+  CycleTimeUnit[CycleTimeUnit["day"] = 1] = "day";
+  CycleTimeUnit[CycleTimeUnit["week"] = 2] = "week";
+  CycleTimeUnit[CycleTimeUnit["month"] = 3] = "month";
+})(CycleTimeUnit || (CycleTimeUnit = {}));
 
 var BizCycleTime = function BizCycleTime(props) {
-  var multiple = props.multiple;
+  var multiple = props.multiple,
+      size = props.size;
   var classPrefix = 'biz-cycle-time';
   var unitList = [{
     label: '每日',
-    value: Unit.day
+    value: CycleTimeUnit.day
   }, {
     label: '每周',
-    value: Unit.week
+    value: CycleTimeUnit.week
   }, {
     label: '每月',
-    value: Unit.month
+    value: CycleTimeUnit.month
   }];
   var days = [];
 
@@ -61,7 +62,7 @@ var BizCycleTime = function BizCycleTime(props) {
   useEffect(function () {
     var res = {
       unit: unit.value,
-      day: unit.value === Unit.month ? dayList === null || dayList === void 0 ? void 0 : dayList.map(function (item) {
+      day: unit.value === CycleTimeUnit.month ? dayList === null || dayList === void 0 ? void 0 : dayList.map(function (item) {
         return item.value;
       }) : multiple ? day.map(function (item) {
         return item.value;
@@ -69,7 +70,7 @@ var BizCycleTime = function BizCycleTime(props) {
       time: time
     };
 
-    if (unit.value === Unit.day) {
+    if (unit.value === CycleTimeUnit.day) {
       delete res.day;
     } else {
       delete res.time;
@@ -94,29 +95,33 @@ var BizCycleTime = function BizCycleTime(props) {
     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, {
+  }), unit.value === CycleTimeUnit.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, {
+  }), unit.value === CycleTimeUnit.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, {
+  }), unit.value === CycleTimeUnit.month && /*#__PURE__*/React.createElement(MonthDay, {
     onChange: setDayList
   }));
 };
 
 BizCycleTime.defaultProps = {
-  multiple: false
+  multiple: false,
+  size: 'middle'
 };
 export default BizCycleTime;

package/es/cycleTime/month.d.ts

@@ -1,8 +1,9 @@
 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?: 'large' | 'normal' | 'small';
+    size?: SizeType;
     className?: string;
     onChange?: (days: BaseOption<number>[]) => void;
 }>;

package/es/cycleTime/month.js

@@ -95,6 +95,6 @@ var MonthDay = function MonthDay(props) {
 };
 
 MonthDay.defaultProps = {
-  size: 'normal'
+  size: 'middle'
 };
 export default MonthDay;

package/es/cycleTime/styles/month.less

@@ -1,18 +1,16 @@
 @import '../../assets//styles/inner.less';
 .biz-month-day {
   &-handle {
-    .__select-handle();
+    .__select-default();
     display: flex;
     flex-direction: row;
     width: 280px;
-    &:hover,
-    &:active {
-      .__default-focused();
-    }
+    padding: @padding-xss - 1 @padding-xss 0 @padding-xss;
+    white-space: break-spaces;
     &.large {
       min-height: @height-lg;
     }
-    &.normal {
+    &.middle {
       min-height: @height-base;
     }
     &.small {

package/es/select/index.js

@@ -197,6 +197,6 @@ BizSelect.defaultProps = {
   keyField: 'id',
   popupContainer: true,
   destroyPopupOnHide: true,
-  size: 'base'
+  size: 'middle'
 };
 export default BizSelect;

package/es/select/styles/handle.less

@@ -20,18 +20,18 @@
       border: none;
     }
 
-    &.lg {
+    &.large {
       height: @height-lg;
       font-size: @font-size-lg;
       line-height: @height-lg;
     }
 
-    &.sm {
+    &.small {
       height: @height-sm;
       line-height: @height-sm;
     }
 
-    &.base {
+    &.middle {
       height: @height-base;
       line-height: @height-base;
     }
@@ -45,12 +45,12 @@
     height: auto;
     overflow: visible;
     line-height: 1;
-    &.sm {
+    &.small {
       height: auto;
       min-height: @height-sm;
     }
 
-    &.base {
+    &.middle {
       height: auto;
       min-height: @height-base;
     }

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/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@zgfe/business-lib",
-  "version": "1.0.21-cdp.6",
+  "version": "1.0.21-cdp.9",
   "scripts": {
     "start": "dumi dev",
     "docs:build": "dumi build",
@@ -58,5 +58,5 @@
     "react": "^16.12.0 || ^17.0.0",
     "yorkie": "^2.0.0"
   },
-  "gitHead": "678ee4c35972fecb35fe80d13259a69e651f8b6d"
+  "gitHead": "dab7c9facdadd1dbab45ef27728d93f9558b6334"
 }