@vtx/modals2 5.0.30 → 5.0.32

package/lib/_components/index.js

@@ -19,4 +19,5 @@ export { default as VmTabs } from "./vm-tabs";
 export { default as VmTag } from "./vm-tag";
 export { default as VmTitle } from "./vm-title";
 export { default as VmVideo } from "./vm-video";
-export { default as VmWrapper } from "./vm-wrapper";
+export { default as VmWrapper } from "./vm-wrapper";
+export { default as VmPopover } from "./vm-popover";

package/lib/_components/vm-card-statistics/index.less

@@ -1,27 +1,27 @@
-.vm-car-statistics {
-  width: 208px;
-  height: 84px;
-  display: flex;
-  flex-direction: column;
-  justify-content: space-between;
-  padding: 20px;
-  background-size: 100% 100%;
-  &-label {
-    color: var(--img-text-color);
-  }
-  &-value, &-unit {
-    color: #1f1f1f;
-  }
-  &.vm-car-statistics-dark {
-    .vm-car-statistics-value,.vm-car-statistics-unit {
-      background: linear-gradient(180deg, #ffffff 0%, #119FFB 100%);
-      background-clip: text;
-      -webkit-text-fill-color: transparent;
-    }
-  }
-  &-value {
-    font-size: 20px;
-    font-weight: bold;
-    margin-right: 4px;
-  }
-}
+.vm-car-statistics {
+  width: 208px;
+  height: 84px;
+  display: flex;
+  flex-direction: column;
+  justify-content: space-between;
+  padding: 20px;
+  background-size: 100% 100%;
+  &-label {
+    color: var(--img-text-color);
+  }
+  &-value, &-unit {
+    color: #1f1f1f;
+  }
+  &.vm-car-statistics-dark {
+    .vm-car-statistics-value,.vm-car-statistics-unit {
+      background: linear-gradient(180deg, #ffffff 0%, #119FFB 100%);
+      background-clip: text;
+      -webkit-text-fill-color: transparent;
+    }
+  }
+  &-value {
+    font-size: 20px;
+    font-weight: bold;
+    margin-right: 4px;
+  }
+}

package/lib/_components/vm-factor-list/index.less

@@ -1,11 +1,11 @@
-.vm-factor-list-wrap {
-  display: flex;
-  padding: 12px 16px;
-  height: 68px;
-  background: #F3F8FF;
-  border-radius: 8px;
-  gap: 26px;
-  &.dark {
-    background: rgba(0,136,240,0.15);
-  }
-}
+.vm-factor-list-wrap {
+  display: flex;
+  padding: 12px 16px;
+  height: 68px;
+  background: #F3F8FF;
+  border-radius: 8px;
+  gap: 26px;
+  &.dark {
+    background: rgba(0,136,240,0.15);
+  }
+}

package/lib/_components/vm-info-collection/style/index.js

@@ -1 +1,2 @@
+import '@vtx/components/lib/vtx-image/style/index';
 import "./index.less";

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

@@ -39,7 +39,9 @@ var PieCharts = function PieCharts(_ref) {
     _ref$colors2 = _ref.colors2,
     colors2 = _ref$colors2 === void 0 ? null : _ref$colors2,
     _ref$subTitle = _ref.subTitle,
-    subTitle = _ref$subTitle === void 0 ? null : _ref$subTitle;
+    subTitle = _ref$subTitle === void 0 ? null : _ref$subTitle,
+    _ref$tooltipFormatter = _ref.tooltipFormatter,
+    tooltipFormatter = _ref$tooltipFormatter === void 0 ? null : _ref$tooltipFormatter;
   var _useSettings = useSettings(),
     chartFontColor = _useSettings.chartFontColor,
     isDark = _useSettings.isDark;
@@ -51,7 +53,7 @@ var PieCharts = function PieCharts(_ref) {
   var option = {
     tooltip: {
       trigger: 'item',
-      formatter: "{a} <br/>{b}: {c}".concat(unit, " ({d}%)"),
+      formatter: tooltipFormatter || "{a} <br/>{b}: {c}".concat(unit, " ({d}%)"),
       position: function position(point, _params, _dom, _rect, size) {
         // 固定在顶部
         var leftSize = point[0] - size.contentSize[0];

package/lib/_components/vm-popover/index.js

@@ -0,0 +1,19 @@
+function _typeof(o) { "@babel/helpers - typeof"; return _typeof = "function" == typeof Symbol && "symbol" == typeof Symbol.iterator ? function (o) { return typeof o; } : function (o) { return o && "function" == typeof Symbol && o.constructor === Symbol && o !== Symbol.prototype ? "symbol" : typeof o; }, _typeof(o); }
+function ownKeys(e, r) { var t = Object.keys(e); if (Object.getOwnPropertySymbols) { var o = Object.getOwnPropertySymbols(e); r && (o = o.filter(function (r) { return Object.getOwnPropertyDescriptor(e, r).enumerable; })), t.push.apply(t, o); } return t; }
+function _objectSpread(e) { for (var r = 1; r < arguments.length; r++) { var t = null != arguments[r] ? arguments[r] : {}; r % 2 ? ownKeys(Object(t), !0).forEach(function (r) { _defineProperty(e, r, t[r]); }) : Object.getOwnPropertyDescriptors ? Object.defineProperties(e, Object.getOwnPropertyDescriptors(t)) : ownKeys(Object(t)).forEach(function (r) { Object.defineProperty(e, r, Object.getOwnPropertyDescriptor(t, r)); }); } return e; }
+function _defineProperty(obj, key, value) { key = _toPropertyKey(key); if (key in obj) { Object.defineProperty(obj, key, { value: value, enumerable: true, configurable: true, writable: true }); } else { obj[key] = value; } return obj; }
+function _toPropertyKey(t) { var i = _toPrimitive(t, "string"); return "symbol" == _typeof(i) ? i : String(i); }
+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 { Popover } from 'antd';
+import useSettings from "../../_hooks/useSettings";
+import "./index.less";
+import { jsx as _jsx } from "react/jsx-runtime";
+var VmPopover = function VmPopover(props) {
+  var _useSettings = useSettings(),
+    isDark = _useSettings.isDark;
+  return /*#__PURE__*/_jsx(Popover, _objectSpread(_objectSpread({}, props), {}, {
+    overlayClassName: "vm-popover ".concat(isDark ? 'dark' : ''),
+    children: props.children
+  }));
+};
+export default VmPopover;

package/lib/_components/vm-popover/index.less

@@ -0,0 +1,7 @@
+.vm-popover {
+  &.dark {
+    .ant-popover-inner-content, .ant-popover-arrow-content, .ant-popover-arrow-content::before {
+      background: rgb(51 95 135);
+    }
+  }
+}

package/lib/_components/vm-table/index.js

@@ -173,10 +173,10 @@ var VMTable = function VMTable(props) {
   });
 };
 
-/**
- * 表格导出按钮
- * @param props
- * @returns
+/**
+ * 表格导出按钮
+ * @param props
+ * @returns
  */
 
 export var ExportBtn = function ExportBtn(props) {

package/lib/style/index.less

@@ -89,7 +89,7 @@
   --modal-head-line-bg: transparent;
   --modal-head-split-line-color: rgba(89, 89, 89, 0.2);
   --modal-head-line-shadow: transparent;
-  --modal-content-bg: #ecf0f5;
+  --modal-content-bg: rgba(236, 240, 245, 0.8);
   --modal-content-box-shadow: #ecf0f5;
   --modal-close-color: #595959;
   --modal-content-border-color: linear-gradient(

package/lib/vtx-base-modal/Header/index.less

@@ -1,98 +1,98 @@
-.vm-modal-header-container {
-  width: 100%;
-  height: 116px;
-  border-radius: 8px 8px 0 0;
-  background: var(--modal-head-bg);
-  padding: 0 16px;
-  margin-top: 1px;
-}
-
-.vm-modal-header-wrap {
-  width: 100%;
-  height: 56px;
-  display: flex;
-  align-items: center;
-  justify-content: space-between;
-  position: relative;
-  &::after {
-    position: absolute;
-    top: 54px;
-    left: 0;
-    content: '';
-    width: 180px;
-    height: 1px;
-    background: var(--modal-head-line-bg);
-    box-shadow: var(--modal-head-line-shadow);
-    border-radius: 8px;
-    animation: move 6s linear infinite;
-
-    @keyframes move {
-      0% {
-        left: 0;
-      }
-
-      100% {
-        left: calc(100% - 180px);
-      }
-    }
-  }
-
-  &-left {
-    display: flex;
-    align-items: center;
-    gap: 8px;
-
-    &-title {
-      font-weight: bold;
-      font-size: 20px;
-      color: var(--modal-title-color);
-    }
-
-    &-tag {
-      display: flex;
-      align-items: center;
-      justify-content: center;
-      gap: 4px;
-      height: 24px;
-      border-radius: 16px;
-      font-size: 12px;
-      padding: 0 8px;
-      border: 1px solid;
-    }
-  }
-
-  &-right {
-    display: flex;
-    align-items: center;
-    gap: 16px;
-
-    &-close {
-      display: flex;
-      align-items: center;
-      justify-content: center;
-      color: var(--modal-close-color);
-      width: 28px;
-      height: 28px;
-      cursor: pointer;
-      font-size: 16px;
-    }
-
-    &-line {
-      width: 1px;
-      height: 14px;
-      background-color: var(--modal-head-split-line-color);
-    }
-
-    &-collect {
-      width: 28px;
-      height: 28px;
-      border-radius: 8px;
-      text-align: center;
-      cursor: pointer;
-
-      &.active {
-        background: var(--collect-bg);
-      }
-    }
-  }
-}
+.vm-modal-header-container {
+  width: 100%;
+  height: 116px;
+  border-radius: 8px 8px 0 0;
+  background: var(--modal-head-bg);
+  padding: 0 16px;
+  margin-top: 1px;
+}
+
+.vm-modal-header-wrap {
+  width: 100%;
+  height: 56px;
+  display: flex;
+  align-items: center;
+  justify-content: space-between;
+  position: relative;
+  &::after {
+    position: absolute;
+    top: 54px;
+    left: 0;
+    content: '';
+    width: 180px;
+    height: 1px;
+    background: var(--modal-head-line-bg);
+    box-shadow: var(--modal-head-line-shadow);
+    border-radius: 8px;
+    animation: move 6s linear infinite;
+
+    @keyframes move {
+      0% {
+        left: 0;
+      }
+
+      100% {
+        left: calc(100% - 180px);
+      }
+    }
+  }
+
+  &-left {
+    display: flex;
+    align-items: center;
+    gap: 8px;
+
+    &-title {
+      font-weight: bold;
+      font-size: 20px;
+      color: var(--modal-title-color);
+    }
+
+    &-tag {
+      display: flex;
+      align-items: center;
+      justify-content: center;
+      gap: 4px;
+      height: 24px;
+      border-radius: 16px;
+      font-size: 12px;
+      padding: 0 8px;
+      border: 1px solid;
+    }
+  }
+
+  &-right {
+    display: flex;
+    align-items: center;
+    gap: 16px;
+
+    &-close {
+      display: flex;
+      align-items: center;
+      justify-content: center;
+      color: var(--modal-close-color);
+      width: 28px;
+      height: 28px;
+      cursor: pointer;
+      font-size: 16px;
+    }
+
+    &-line {
+      width: 1px;
+      height: 14px;
+      background-color: var(--modal-head-split-line-color);
+    }
+
+    &-collect {
+      width: 28px;
+      height: 28px;
+      border-radius: 8px;
+      text-align: center;
+      cursor: pointer;
+
+      &.active {
+        background: var(--collect-bg);
+      }
+    }
+  }
+}

package/lib/vtx-base-modal/Tabs/index.less

@@ -1,54 +1,54 @@
-.vm-modal-tabs {
-  width: 100%;
-  height: 60px;
-  background: var(--vm-tabs-bg);
-  border-radius: 8px 8px 0 0;
-  border: none;
-  // border: 2px solid var(--vm-tab-border-color);
-  display: flex;
-  justify-content: center;
-  gap: 16px;
-  align-items: center;
-
-  &-item {
-    display: flex;
-    height: 36px;
-    padding: 0 14px;
-    font-size: 16px;
-    gap: 8px;
-    color: var(--vm-tabs-font-color);
-    cursor: pointer;
-    align-items: center;
-    justify-content: center;
-
-    &-active {
-      background: var(--vm-tab-item-active-bg-color);
-      border-radius: 26px;
-      color: var(--vm-tab-item-active-color);
-      box-shadow: var(--vm-tab-item-active-box-shadow);
-      &.vm-modal-tabs-item-dark {
-        position: relative;
-        &::before {
-          content: '';
-          position: absolute;
-          top: 0;
-          left: 0;
-          right: 0;
-          bottom: 0;
-          background: linear-gradient(
-            180deg,
-            rgba(255, 255, 255, 1),
-            rgba(54, 161, 255, 1)
-          );
-          border-radius: 26px;
-          padding: 1px;
-          -webkit-mask: linear-gradient(#fff 0 0) content-box,
-            linear-gradient(#fff 0 0);
-          -webkit-mask-composite: xor;
-          mask-composite: exclude;
-          z-index: -1;
-        }
-      }
-    }
-  }
-}
+.vm-modal-tabs {
+  width: 100%;
+  height: 60px;
+  background: var(--vm-tabs-bg);
+  border-radius: 8px 8px 0 0;
+  border: none;
+  // border: 2px solid var(--vm-tab-border-color);
+  display: flex;
+  justify-content: center;
+  gap: 16px;
+  align-items: center;
+
+  &-item {
+    display: flex;
+    height: 36px;
+    padding: 0 14px;
+    font-size: 16px;
+    gap: 8px;
+    color: var(--vm-tabs-font-color);
+    cursor: pointer;
+    align-items: center;
+    justify-content: center;
+
+    &-active {
+      background: var(--vm-tab-item-active-bg-color);
+      border-radius: 26px;
+      color: var(--vm-tab-item-active-color);
+      box-shadow: var(--vm-tab-item-active-box-shadow);
+      &.vm-modal-tabs-item-dark {
+        position: relative;
+        &::before {
+          content: '';
+          position: absolute;
+          top: 0;
+          left: 0;
+          right: 0;
+          bottom: 0;
+          background: linear-gradient(
+            180deg,
+            rgba(255, 255, 255, 1),
+            rgba(54, 161, 255, 1)
+          );
+          border-radius: 26px;
+          padding: 1px;
+          -webkit-mask: linear-gradient(#fff 0 0) content-box,
+            linear-gradient(#fff 0 0);
+          -webkit-mask-composite: xor;
+          mask-composite: exclude;
+          z-index: -1;
+        }
+      }
+    }
+  }
+}

package/lib/vtx-base-modal/style/index.less

@@ -44,7 +44,6 @@
     width: 100%;
     background: var(--modal-content-bg);
     border-radius: 8px;
-    opacity: 0.8;
   }
   .vm-base-modal-content-wrap {
     flex: 1;

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

@@ -1145,6 +1145,19 @@ export var JzljService = {
       data = _useRequest46$data === void 0 ? {} : _useRequest46$data;
     return (data === null || data === void 0 ? void 0 : data.data) || [];
   },
+  // 字段配置
+  fieldConfig: function fieldConfig() {
+    var _useRequest47 = useRequest(function () {
+        return http.get("/cloud/jzlj/web/field/config/list?ledgerType=CZHZBA", {
+          body: {}
+        });
+      }, {
+        refreshDeps: []
+      }),
+      _useRequest47$data = _useRequest47.data,
+      data = _useRequest47$data === void 0 ? {} : _useRequest47$data;
+    return (data === null || data === void 0 ? void 0 : data.data) || [];
+  },
   // 联单-分页
   ldPage: function ldPage(_ref27) {
     var carId = _ref27.carId,
@@ -1226,7 +1239,7 @@ export var JzljService = {
     var carId = _ref32.carId,
       startDate = _ref32.startDate,
       endDate = _ref32.endDate;
-    var _useRequest47 = useRequest(function () {
+    var _useRequest48 = useRequest(function () {
         return http.get("/cloud/jzlj/web/dz/kanban/carAlarmTypeCountSummaryInfo", {
           body: {
             carId: carId,
@@ -1238,7 +1251,7 @@ export var JzljService = {
       }, {
         refreshDeps: [carId, startDate, endDate]
       }),
-      alarmSummaryRes = _useRequest47.data;
+      alarmSummaryRes = _useRequest48.data;
     return {
       alarmSummaryData: (alarmSummaryRes === null || alarmSummaryRes === void 0 ? void 0 : alarmSummaryRes.data) || {}
     };
@@ -1248,7 +1261,7 @@ export var JzljService = {
     var id = _ref33.id,
       startDate = _ref33.startDate,
       endDate = _ref33.endDate;
-    var _useRequest48 = useRequest(function () {
+    var _useRequest49 = useRequest(function () {
         return http.get("/cloud/jzlj/web/api/gis/real/time/carOrderAlarmAnalyse", {
           body: {
             id: id,
@@ -1259,9 +1272,39 @@ export var JzljService = {
       }, {
         refreshDeps: [id, startDate, endDate]
       }),
-      alarmTrendRes = _useRequest48.data;
+      alarmTrendRes = _useRequest49.data;
     return {
       alarmTrendData: (alarmTrendRes === null || alarmTrendRes === void 0 ? void 0 : alarmTrendRes.data) || []
     };
+  },
+  // 单位
+  useUnit: function useUnit() {
+    var _data$data3, _unitStr;
+    var groupCode = arguments.length > 0 && arguments[0] !== undefined ? arguments[0] : 'XTPZ';
+    var _useRequest50 = useRequest(function () {
+        return http.get("/cloud/jzlj/web/api/tenant/system/config/getConfig", {
+          body: {}
+        });
+      }, {
+        refreshDeps: [groupCode]
+      }),
+      data = _useRequest50.data;
+    var obj = {};
+    var originalData = data === null || data === void 0 || (_data$data3 = data.data) === null || _data$data3 === void 0 ? void 0 : _data$data3[groupCode];
+    for (var group in originalData) {
+      if (originalData.hasOwnProperty(group)) {
+        for (var item in originalData[group]) {
+          var _originalData$group;
+          obj[item] = (_originalData$group = originalData[group]) === null || _originalData$group === void 0 ? void 0 : _originalData$group[item];
+        }
+      }
+    }
+    var jointOrderWeightUnitTypeName = obj === null || obj === void 0 ? void 0 : obj.jointOrderWeightUnitTypeName;
+    var nameSplitArr = jointOrderWeightUnitTypeName === null || jointOrderWeightUnitTypeName === void 0 ? void 0 : jointOrderWeightUnitTypeName.split('（');
+    var unitStr = (nameSplitArr === null || nameSplitArr === void 0 ? void 0 : nameSplitArr[1]) || '吨）';
+    unitStr = (_unitStr = unitStr) === null || _unitStr === void 0 ? void 0 : _unitStr.replace('）', '');
+    return {
+      unitStr: unitStr
+    };
   }
 };

package/lib/vtx-car-modal/components/Info/index.less

@@ -1,6 +1,6 @@
-.vm-car-map-wrap {
-  flex: 1;
-  min-height: 0;
-  width: 100%;
-  margin-top: 10px;
-}
+.vm-car-map-wrap {
+  flex: 1;
+  min-height: 0;
+  width: 100%;
+  margin-top: 10px;
+}

package/lib/vtx-car-modal/content/Common/OilConsumption/index.less

@@ -1,6 +1,6 @@
-.vtx-car-oil-wrap {
-  height: 100%;
-  display: flex;
-  gap: 16px;
-  flex-direction: column;
-}
+.vtx-car-oil-wrap {
+  height: 100%;
+  display: flex;
+  gap: 16px;
+  flex-direction: column;
+}

package/lib/vtx-car-modal/content/Common/WaterConsumption/index.less

@@ -1,6 +1,6 @@
-.vtx-car-water-wrap {
-  height: 100%;
-  display: flex;
-  gap: 16px;
-  flex-direction: column;
-}
+.vtx-car-water-wrap {
+  height: 100%;
+  display: flex;
+  gap: 16px;
+  flex-direction: column;
+}

package/lib/vtx-car-modal/content/Jzlj/Alarm/Bottom.js

@@ -93,11 +93,11 @@ export default function Bottom(_ref) {
     width: 150,
     ellipsis: true
   }], ['报警开始时间', 'alarmStartTime', {
-    width: 180
+    width: 160
   }], ['报警结束时间', 'alarmEndTime', {
-    width: 180
+    width: 160
   }], ['处置状态', 'processStatusChs', {
-    width: 150,
+    width: 100,
     render: function render(text, record) {
       return text ? /*#__PURE__*/_jsx("span", {
         style: {
@@ -107,7 +107,7 @@ export default function Bottom(_ref) {
       }) : '-';
     }
   }], ['处置结果', 'processResultChs', {
-    width: 150,
+    width: 120,
     render: function render(text, record) {
       return text ? /*#__PURE__*/_jsx("span", {
         style: {
@@ -170,7 +170,7 @@ export default function Bottom(_ref) {
       }) : '-';
     }
   }], ['处置状态', 'processStatusChs', {
-    width: 150,
+    width: 100,
     render: function render(text, record) {
       return text ? /*#__PURE__*/_jsx("span", {
         style: {
@@ -180,7 +180,7 @@ export default function Bottom(_ref) {
       }) : '-';
     }
   }], ['处置结果', 'processResultChs', {
-    width: 150,
+    width: 120,
     render: function render(text, record) {
       return text ? /*#__PURE__*/_jsx("span", {
         style: {