@vtx/modals2 5.0.20 → 5.0.22

package/lib/_components/vm-calendar/style/index.js

@@ -1 +1,2 @@
+import 'antd/lib/calendar/style';
 import "./index.less";

package/lib/_components/vm-calendar/style/index.less

@@ -3,7 +3,10 @@
 .vm-calendar {
   width: 100%;
   height: 100%;
-
+  .ant-picker-date-panel,
+  .ant-picker-content {
+    width: 100% !important;
+  }
   .ant-picker-calendar,
   .ant-picker-calendar-full {
     background-color: var(--vm-calendar-bg-color) !important;

package/lib/_components/vm-line-charts/index.js

@@ -6,7 +6,9 @@ function _toPropertyKey(t) { var i = _toPrimitive(t, "string"); return "symbol"
 function _toPrimitive(t, r) { if ("object" != _typeof(t) || !t) return t; var e = t[Symbol.toPrimitive]; if (void 0 !== e) { var i = e.call(t, r || "default"); if ("object" != _typeof(i)) return i; throw new TypeError("@@toPrimitive must return a primitive value."); } return ("string" === r ? String : Number)(t); }
 import { Row, Spin } from 'antd';
 import ReactEcharts from 'echarts-for-react';
+import { isEmpty } from 'lodash';
 import useSettings from "../../_hooks/useSettings";
+import VmEmpty from "../vm-empty";
 import { jsx as _jsx } from "react/jsx-runtime";
 var LineCharts = function LineCharts(_ref) {
   var _ref$dataList = _ref.dataList,
@@ -138,6 +140,15 @@ var LineCharts = function LineCharts(_ref) {
     align: 'middle',
     justify: 'center',
     children: /*#__PURE__*/_jsx(Spin, {})
+  }) : isEmpty(dataList) ? /*#__PURE__*/_jsx(Row, {
+    style: {
+      height: height
+    },
+    align: 'middle',
+    justify: 'center',
+    children: /*#__PURE__*/_jsx(VmEmpty, {
+      type: "NO_CHART"
+    })
   }) : /*#__PURE__*/_jsx(ReactEcharts, {
     option: option,
     notMerge: true,

package/lib/style/index.less

@@ -1,3 +1,4 @@
+@import "~antd/dist/antd.css";
 .vm-modal-dark {
   --modal-mask-bg-color: rgba(0, 0, 0, 0.4);
   --modal-title-color: #fff;

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

@@ -39,6 +39,9 @@ var StaticInfo = function StaticInfo(_ref) {
     },
     children: [/*#__PURE__*/_jsx(Col, {
       span: 12,
+      style: {
+        height: '100%'
+      },
       children: /*#__PURE__*/_jsx(VmWrapper, {
         title: '报警汇总',
         children: /*#__PURE__*/_jsx(VmPieCharts, {
@@ -58,6 +61,9 @@ var StaticInfo = function StaticInfo(_ref) {
       })
     }), /*#__PURE__*/_jsx(Col, {
       span: 12,
+      style: {
+        height: '100%'
+      },
       children: /*#__PURE__*/_jsx(VmWrapper, {
         title: '报警趋势分析',
         children: /*#__PURE__*/_jsx(VmLineCharts, {

package/lib/vtx-cp-modal/index.js

@@ -47,9 +47,9 @@ var VtxCpModal = function VtxCpModal(props) {
     info = _BaseService$useBaseD.info,
     baseInfo = _BaseService$useBaseD.baseInfo,
     rules = _BaseService$useBaseD.rules;
-  var _facilityService$useG = facilityService.useGetFacConfig((info === null || info === void 0 ? void 0 : info.collectPointTypeCode) || 'cp'),
+  var _facilityService$useG = facilityService.useGetFacConfig('cp'),
     facConfig = _facilityService$useG.facConfig;
-  var _useGetConfig = useGetConfig((info === null || info === void 0 ? void 0 : info.collectPointTypeCode) || 'cp', tabs),
+  var _useGetConfig = useGetConfig('cp', tabs),
     tabsData = _useGetConfig.tabsData;
   var _useGetChannels = useGetChannels("".concat(info === null || info === void 0 ? void 0 : info.collectPointTypeCode, "_").concat(info === null || info === void 0 ? void 0 : info.code), !!(info !== null && info !== void 0 && info.collectPointTypeCode)),
     channels = _useGetChannels.channels;

package/lib/vtx-staff-modal/components/BaseInfo/ListZymx.js

@@ -120,19 +120,9 @@ var ListZymx = function ListZymx(props) {
       onChange: pageChange
     })
   };
-  return /*#__PURE__*/_jsx(VmTable, _objectSpread(_objectSpread({
+  return /*#__PURE__*/_jsx(VmTable, _objectSpread({
     columns: columns,
     rowKey: "id"
-  }, tableProps), {}, {
-    dataSource: [{
-      shiftDate: '2312313',
-      shiftName: 'sdfgdfgd',
-      completionRate: 20
-    }, {
-      shiftDate: '2312313',
-      shiftName: 'sdfgdfgd',
-      completionRate: 20
-    }]
-  }));
+  }, tableProps));
 };
 export default ListZymx;

package/package.json

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