@vtx/modals2 6.0.0-beta.30 → 6.0.0-beta.32

package/lib/vtx-car-modal/api.js

@@ -504,7 +504,7 @@ export var JxhService = {
       loading = _useRequest20.loading;
     return {
       dailyData: ((dailyDataRes === null || dailyDataRes === void 0 ? void 0 : dailyDataRes.data) || []).map(function (item) {
-        var percent = item.workMileage / item.driveMileage * 100;
+        var percent = item.workMileage / (item.driveMileage || 1) * 100;
         return _objectSpread(_objectSpread({}, item), {}, {
           percent: (percent > 100 ? 100 : percent).toFixed(2)
         });
@@ -778,7 +778,7 @@ export var LjsyService = {
       loading: loading
     };
   },
-  useGetWorkInfoNew: function useGetWorkInfoNew(_ref13) {
+  useGetWorkInfoAnalysisNew: function useGetWorkInfoAnalysisNew(_ref13) {
     var carId = _ref13.carId,
       startDate = _ref13.startDate,
       endDate = _ref13.endDate;
@@ -796,7 +796,7 @@ export var LjsyService = {
       data = _useRequest34.data,
       loading = _useRequest34.loading;
     return {
-      taskDaySummary: (data === null || data === void 0 ? void 0 : data.data) || [],
+      workInfoAnalysis: (data === null || data === void 0 ? void 0 : data.data) || {},
       loading: loading
     };
   },

package/lib/vtx-car-modal/content/JXH/Hw2StaticInfo/index.js

@@ -106,7 +106,7 @@ function RateLegend() {
         background: 'var(--blue-color)'
       }
     }), /*#__PURE__*/_jsx("div", {
-      children: "(80%-100%]"
+      children: "(80%-100%)"
     }), /*#__PURE__*/_jsx("div", {
       className: 'vtx-car-calendar-complete-legend',
       style: {

package/lib/vtx-car-modal/content/JXH/StaticInfo/index.js

@@ -95,7 +95,7 @@ function RateLegend() {
         background: 'var(--blue-color)'
       }
     }), /*#__PURE__*/_jsx("div", {
-      children: "(80%-100%]"
+      children: "(80%-100%)"
     }), /*#__PURE__*/_jsx("div", {
       className: 'vtx-car-calendar-complete-legend',
       style: {
@@ -258,7 +258,7 @@ function Calendar(_ref) {
       }), /*#__PURE__*/_jsx(VmCalendarInner, {
         type: "green",
         img: workMileageIcon,
-        value: (workMileage / 1000).toFixed(2),
+        value: workMileage ? (workMileage / 1000).toFixed(2) : 0,
         style: {
           width: '139px',
           justifyContent: 'space-between'

package/lib/vtx-car-modal/content/Ljsy/BaseInfo/index.js

@@ -48,13 +48,13 @@ var BaseInfo = function BaseInfo() {
     _useState2 = _slicedToArray(_useState, 2),
     date = _useState2[0],
     setDate = _useState2[1];
-  var _LjsyService$useGetWo = LjsyService.useGetWorkInfoNew({
+  var _LjsyService$useGetWo = LjsyService.useGetWorkInfo({
       carId: id,
       startDate: dayjs(date).subtract(6, 'day').format('YYYY-MM-DD'),
       endDate: dayjs(date).format('YYYY-MM-DD')
     }),
     taskDaySummary = _LjsyService$useGetWo.taskDaySummary;
-  var _LjsyService$useGetWo2 = LjsyService.useGetWorkInfoAnalysis({
+  var _LjsyService$useGetWo2 = LjsyService.useGetWorkInfoAnalysisNew({
       carId: id,
       startDate: dayjs(date).subtract(6, 'day').format('YYYY-MM-DD'),
       endDate: dayjs(date).format('YYYY-MM-DD')

package/lib/vtx-road-modal/components/Calendar/index.js

@@ -62,7 +62,7 @@ var Calendar = function Calendar(_ref) {
       }), /*#__PURE__*/_jsx(VmCalendarInner, {
         type: "blue",
         img: mileageIcon,
-        value: (planMileage / 1000).toFixed(2),
+        value: planMileage ? (planMileage / 1000).toFixed(2) : 0,
         style: {
           width: '139px',
           justifyContent: 'space-between',
@@ -71,7 +71,7 @@ var Calendar = function Calendar(_ref) {
       }), /*#__PURE__*/_jsx(VmCalendarInner, {
         type: "green",
         img: workMileageIcon,
-        value: (workMileage / 1000).toFixed(2),
+        value: workMileage ? (workMileage / 1000).toFixed(2) : 0,
         style: {
           width: '139px',
           justifyContent: 'space-between'
@@ -131,7 +131,7 @@ var Calendar = function Calendar(_ref) {
             background: 'var(--blue-color)'
           }
         }), /*#__PURE__*/_jsx("div", {
-          children: "(80%-100%]"
+          children: "(80%-100%)"
         }), /*#__PURE__*/_jsx("div", {
           className: 'vtx-road-calendar-complete-legend',
           style: {

package/lib/vtx-road-modal/components/LaneCalendar/index.js

@@ -173,7 +173,7 @@ var Calendar = function Calendar(_ref) {
             background: 'var(--blue-color)'
           }
         }), /*#__PURE__*/_jsx("div", {
-          children: "(80%-100%]"
+          children: "(80%-100%)"
         }), /*#__PURE__*/_jsx("div", {
           className: 'vtx-road-calendar-complete-legend',
           style: {

package/lib/vtx-zf-modal/components/Base/index.less

@@ -32,6 +32,15 @@
   padding: 16px 18px;
   overflow: hidden;
   overflow-y: auto;
+  .zf-base-item {
+    .zf-base-label {
+      flex-shrink: 0;
+    }
+    & > span:last-child {
+      word-wrap: break-word;
+      white-space: normal;
+    }
+  }
   .zf-base-list {
     display: flex;
     flex-wrap: wrap;

package/lib/vtx-zf-modal/components/Process/index.less

@@ -62,6 +62,13 @@
             border-radius: 8px;
             display: flex;
             flex-wrap: wrap;
+            .zf-process-label {
+              flex-shrink: 0;
+            }
+            & > span:last-child {
+              word-wrap: break-word;
+              white-space: normal;
+            }
           }
         }
       }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@vtx/modals2",
-  "version": "6.0.0-beta.30",
+  "version": "6.0.0-beta.32",
   "description": "弹窗组件",
   "license": "MIT",
   "module": "lib/index.js",