@zgfe/business-lib 1.0.21-cdp.21 → 1.0.21-cdp.24

package/es/cycleTime/demo/index.js

@@ -40,7 +40,7 @@ export default (function () {
   }, /*#__PURE__*/React.createElement(Form, {
     initialValues: {
       time: {
-        day: [4, 8, 29, 32],
+        day: [],
         time: '02:19:33',
         unit: 3
       }

package/es/cycleTime/index.d.ts

@@ -14,6 +14,7 @@ interface Value {
 declare const BizCycleTime: React.FC<{
     value?: Value;
     multiple?: boolean;
+    placeholder?: string;
     onChange?: (val: Value) => void;
     size?: SizeType;
 }>;

package/es/cycleTime/index.js

@@ -165,6 +165,7 @@ var BizCycleTime = function BizCycleTime(props) {
   }), unit.value === CycleTimeUnit.day && /*#__PURE__*/React.createElement(DatePicker.TimePicker, {
     className: "".concat(classPrefix, "-hour"),
     size: size,
+    placeholder: props.placeholder,
     defaultValue: time ? moment(time, 'hh:mm:ss') : undefined,
     onChange: function onChange(time) {
       setTime(time === null || time === void 0 ? void 0 : time.format('hh:mm:ss'));
@@ -177,10 +178,12 @@ var BizCycleTime = function BizCycleTime(props) {
     multiple: multiple,
     className: "".concat(classPrefix, "-day"),
     defaultValue: day,
+    placeholder: props.placeholder,
     onChange: function onChange(v) {
       setDay(v);
     }
   }), unit.value === CycleTimeUnit.month && /*#__PURE__*/React.createElement(MonthDay, {
+    placeholder: props.placeholder,
     defaultValue: day,
     onChange: setDayList
   }));

package/es/cycleTime/month.d.ts

@@ -6,6 +6,7 @@ declare const MonthDay: React.FC<{
     size?: SizeType;
     className?: string;
     defaultValue?: BaseOption<number>[];
+    placeholder?: string;
     onChange?: (days: BaseOption<number>[]) => void;
 }>;
 export default MonthDay;

package/es/cycleTime/month.js

@@ -73,6 +73,17 @@ var MonthDay = function MonthDay(props) {
     });
   }
 
+  function onDelMonthDay(day) {
+    setChosenDayList(function (list) {
+      var res = _.cloneDeep(list);
+
+      res.forEach(function (item, i) {
+        if (item.value === day.value) res.splice(i, 1);
+      });
+      return res;
+    });
+  }
+
   return /*#__PURE__*/React.createElement(Dropdown, {
     overlay: /*#__PURE__*/React.createElement("div", {
       className: "".concat(classPrefix, "-overlay")
@@ -99,9 +110,14 @@ var MonthDay = function MonthDay(props) {
   }, chosenDayList.map(function (item) {
     return /*#__PURE__*/React.createElement(Tag, {
       closable: true,
-      key: item.value
+      key: item.value,
+      onClose: function onClose() {
+        onDelMonthDay(item);
+      }
     }, item.label);
-  })), /*#__PURE__*/React.createElement(IconFont, {
+  }), !chosenDayList.length && /*#__PURE__*/React.createElement("span", {
+    className: "".concat(classPrefix, "-holder")
+  }, props.placeholder || '请选择')), /*#__PURE__*/React.createElement(IconFont, {
     type: "xiangxia"
   }))));
 };

package/es/cycleTime/styles/month.less

@@ -20,6 +20,9 @@
       flex: none;
     }
   }
+  &-holder {
+    color: @input-placeholder-color;
+  }
   &-val {
     flex: 1;
     .ant-tag {

package/es/select/index.js

@@ -67,6 +67,7 @@ var BizSelect = function BizSelect(props) {
     setWidth((boxRef === null || boxRef === void 0 ? void 0 : (_boxRef$current = boxRef.current) === null || _boxRef$current === void 0 ? void 0 : _boxRef$current.width) || 200);
 
     if (props.defaultValue) {
+      console.log('>>>>>>初始化参数', props.defaultValue, getValue(props.defaultValue));
       setCurrent(getValue(props.defaultValue));
     }
 
@@ -87,11 +88,7 @@ var BizSelect = function BizSelect(props) {
     };
   }, []);
   useEffect(function () {
-    if (!props.value) {
-      setCurrent(undefined);
-      return;
-    }
-
+    if (!props.value) return;
     setCurrent(getValue(props.value));
   }, [props.value]);
 

package/es/select/overlay.js

@@ -28,7 +28,8 @@ var SelectOverlay = function SelectOverlay(props) {
       disableItemList = props.disableItemList,
       dropdownExtra = props.dropdownExtra,
       loading = props.loading,
-      customLabel = props.customLabel;
+      customLabel = props.customLabel,
+      overlayClassName = props.overlayClassName;
 
   var _useState = useState(),
       _useState2 = _slicedToArray(_useState, 2),
@@ -198,7 +199,7 @@ var SelectOverlay = function SelectOverlay(props) {
   }
 
   return /*#__PURE__*/React.createElement("div", {
-    className: "".concat(classPrefix, "-overlay")
+    className: "".concat(classPrefix, "-overlay ").concat(overlayClassName)
   }, props.enableSearch && !props.multiple && /*#__PURE__*/React.createElement(BizSearchInput, {
     className: "".concat(classPrefix, "-search"),
     onChange: onSearch

package/es/select/types.d.ts

@@ -28,6 +28,7 @@ export declare namespace BizSelectTypes {
         enableCreate?: boolean;
         popupContainer?: boolean;
         overlayWidth?: number;
+        overlayClassName?: string;
         labelField?: string;
         keyField?: string;
         disableItemList?: Option[];

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@zgfe/business-lib",
-  "version": "1.0.21-cdp.21",
+  "version": "1.0.21-cdp.24",
   "scripts": {
     "start": "dumi dev",
     "docs:build": "dumi build",
@@ -58,5 +58,5 @@
     "react": "^16.12.0 || ^17.0.0",
     "yorkie": "^2.0.0"
   },
-  "gitHead": "2807db872ccdfe515814d006494fcef325b4c846"
+  "gitHead": "d35d99669e5706ea5350dd60113e8bfb3ecf2a11"
 }