@pisell/private-materials 3.3.6 → 3.3.8

package/es/components/ticketBooking/components/ticketBooking/index.js

@@ -125,9 +125,16 @@ var TicketBooking = function TicketBooking() {
    * 设置弹窗内的状态
    */
   var _setModalState = function _setModalState(props) {
+    var _newVal$service2;
     console.log('同步state到外层', props);
+    var newVal = _objectSpread({}, props);
+    if (newVal.service) {
+      var _newVal$service;
+      newVal.service.value = (newVal === null || newVal === void 0 || (_newVal$service = newVal.service) === null || _newVal$service === void 0 ? void 0 : _newVal$service.value) || [];
+    }
+    console.log(newVal === null || newVal === void 0 || (_newVal$service2 = newVal.service) === null || _newVal$service2 === void 0 ? void 0 : _newVal$service2.value, 'newVal.service.value');
     setState({
-      modalState: _objectSpread(_objectSpread({}, state.modalState), props)
+      modalState: _objectSpread(_objectSpread({}, state.modalState), newVal)
     });
   };
   var _setDataChange = function _setDataChange(date, dateString, isTimeChange) {
@@ -772,7 +779,8 @@ var TicketBooking = function TicketBooking() {
       }
       _setDataChange.apply(void 0, args.concat([true]));
     },
-    setIntervalTime: _setIntervalTime
+    setIntervalTime: _setIntervalTime,
+    locale: engineProps.locale
   })), /*#__PURE__*/React.createElement("div", {
     style: {
       flexShrink: 0,

package/es/components/ticketBooking/components/timeBar/index.d.ts

@@ -6,6 +6,7 @@ interface ITimeBarProps {
     onDateChange: (date: Dayjs, dateString?: string) => void;
     onDateTimeChange: (date: Dayjs, timeString: string) => void;
     setIntervalTime: (value: boolean) => void;
+    locale: string;
 }
 declare const TimeBar: (props: ITimeBarProps) => JSX.Element;
 export default TimeBar;

package/es/components/ticketBooking/components/timeBar/index.js

@@ -14,7 +14,8 @@ import "./index.less";
 var TimeBar = function TimeBar(props) {
   var _state$modalState4, _state$modalState5;
   var state = props.globalState,
-    setGlobalState = props.setGlobalState;
+    setGlobalState = props.setGlobalState,
+    locale = props.locale;
   var _onClickNext = function _onClickNext() {
     var _state$modalState, _props$onDateChange, _props$setIntervalTim;
     var currentTime = (_state$modalState = state.modalState) === null || _state$modalState === void 0 || (_state$modalState = _state$modalState.date) === null || _state$modalState === void 0 ? void 0 : _state$modalState.value;
@@ -76,7 +77,7 @@ var TimeBar = function TimeBar(props) {
     }
   }, /*#__PURE__*/React.createElement(DatePicker, {
     value: state === null || state === void 0 || (_state$modalState4 = state.modalState) === null || _state$modalState4 === void 0 || (_state$modalState4 = _state$modalState4.date) === null || _state$modalState4 === void 0 ? void 0 : _state$modalState4.value,
-    format: state.locale === 'en' ? 'dddd, DD MMM YYYY' : 'YYYY年MM月DD日',
+    format: locale === 'en' ? 'dddd, DD MMM YYYY' : 'YYYY年MM月DD日',
     onChange: props === null || props === void 0 ? void 0 : props.onDateChange,
     size: "large",
     style: {

package/lib/components/ticketBooking/components/ticketBooking/index.js

@@ -133,11 +133,17 @@ var TicketBooking = () => {
     });
   };
   const _setModalState = (props) => {
+    var _a2, _b;
     console.log("同步state到外层", props);
+    let newVal = { ...props };
+    if (newVal.service) {
+      newVal.service.value = ((_a2 = newVal == null ? void 0 : newVal.service) == null ? void 0 : _a2.value) || [];
+    }
+    console.log((_b = newVal == null ? void 0 : newVal.service) == null ? void 0 : _b.value, "newVal.service.value");
     setState({
       modalState: {
         ...state.modalState,
-        ...props
+        ...newVal
       }
     });
   };
@@ -716,7 +722,8 @@ var TicketBooking = () => {
         onDateTimeChange: (...args) => {
           _setDataChange(...args, true);
         },
-        setIntervalTime: _setIntervalTime
+        setIntervalTime: _setIntervalTime,
+        locale: engineProps.locale
       }
     )
   ), /* @__PURE__ */ import_react.default.createElement(

package/lib/components/ticketBooking/components/timeBar/index.d.ts

@@ -6,6 +6,7 @@ interface ITimeBarProps {
     onDateChange: (date: Dayjs, dateString?: string) => void;
     onDateTimeChange: (date: Dayjs, timeString: string) => void;
     setIntervalTime: (value: boolean) => void;
+    locale: string;
 }
 declare const TimeBar: (props: ITimeBarProps) => JSX.Element;
 export default TimeBar;

package/lib/components/ticketBooking/components/timeBar/index.js

@@ -41,7 +41,7 @@ var import_utils = require("@pisell/utils");
 var import_index = require("./index.less");
 var TimeBar = (props) => {
   var _a, _b, _c, _d;
-  const { globalState: state, setGlobalState } = props;
+  const { globalState: state, setGlobalState, locale } = props;
   const _onClickNext = () => {
     var _a2, _b2, _c2, _d2;
     const currentTime = (_b2 = (_a2 = state.modalState) == null ? void 0 : _a2.date) == null ? void 0 : _b2.value;
@@ -102,7 +102,7 @@ var TimeBar = (props) => {
       import_materials.DatePicker,
       {
         value: (_b = (_a = state == null ? void 0 : state.modalState) == null ? void 0 : _a.date) == null ? void 0 : _b.value,
-        format: state.locale === "en" ? "dddd, DD MMM YYYY" : "YYYY年MM月DD日",
+        format: locale === "en" ? "dddd, DD MMM YYYY" : "YYYY年MM月DD日",
         onChange: props == null ? void 0 : props.onDateChange,
         size: "large",
         style: { width: "100%" }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@pisell/private-materials",
-  "version": "3.3.6",
+  "version": "3.3.8",
   "main": "./lib/index.js",
   "module": "./es/index.js",
   "types": "./lib/index.d.ts",
@@ -60,8 +60,8 @@
     "rc-virtual-list": "^3.11.3",
     "decimal.js": "^10.4.3",
     "@pisell/utils": "1.0.42",
-    "@pisell/materials": "3.3.5",
     "@pisell/date-picker": "3.0.2",
+    "@pisell/materials": "3.3.5",
     "@pisell/icon": "0.0.11"
   },
   "peerDependencies": {