@vtx/modals2 5.0.58 → 5.0.60

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

@@ -22,6 +22,6 @@ var VmCustom = function VmCustom(_ref) {
       border: 'none',
       overflowY: 'auto'
     }
-  });
+  }, url);
 };
 export default VmCustom;

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

@@ -106,7 +106,7 @@ var PieCharts = function PieCharts(_ref) {
         var info = dataList[index] || {};
         var value = info.value;
         var percent = getPercentValue(_.map(dataList, 'value'), index, 2);
-        return "{name|".concat(name.slice(0, nameLength)).concat(name.length > nameLength ? '...' : '', "}{number|").concat(value || 0).concat(unit || '', "}{space|}{percent|").concat(percent, "%}");
+        return "{name|".concat(name.slice(0, nameLength)).concat(name.length > nameLength ? '...' : '', "}{number|").concat(value || 0).concat(unit || '', "}{space|}{percent|").concat(percent || 0, "%}");
       },
       tooltip: {
         show: true

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

@@ -21,6 +21,22 @@ import { getTenantById, getUmsConfig } from "./service";
 import "./style";
 import VmTabs from "./Tabs";
 import { jsx as _jsx, jsxs as _jsxs, Fragment as _Fragment } from "react/jsx-runtime";
+var getTabContent = function getTabContent(contents, tabKey) {
+  if (!tabKey) {
+    return undefined;
+  }
+  if (Object.prototype.hasOwnProperty.call(contents, tabKey)) {
+    return contents[tabKey];
+  }
+  var keyParts = "".concat(tabKey).split('-');
+  for (var index = 1; index < keyParts.length; index++) {
+    var suffixKey = keyParts.slice(index).join('-');
+    if (Object.prototype.hasOwnProperty.call(contents, suffixKey)) {
+      return contents[suffixKey];
+    }
+  }
+  return undefined;
+};
 var VmBaseModal = function VmBaseModal(props) {
   var _props$tabs = props.tabs,
     tabs = _props$tabs === void 0 ? [] : _props$tabs,
@@ -100,6 +116,21 @@ var VmBaseModal = function VmBaseModal(props) {
       }
     }
   }, [JSON.stringify(tabs), tabChose]);
+  var activeTabKey = useMemo(function () {
+    var _tabs$;
+    if (currentTabKey && tabs.find(function (item) {
+      return item.key === currentTabKey;
+    })) {
+      return currentTabKey;
+    }
+    if (tabChose && tabs.find(function (item) {
+      return item.key === tabChose;
+    })) {
+      return tabChose;
+    }
+    return ((_tabs$ = tabs[0]) === null || _tabs$ === void 0 ? void 0 : _tabs$.key) || currentTabKey;
+  }, [currentTabKey, JSON.stringify(tabs), tabChose]);
+  var activeContent = getTabContent(contents, activeTabKey);
   var onCancel = function onCancel() {
     if (props.onCancel && typeof props.onCancel === 'function') {
       props.onCancel();
@@ -188,7 +219,7 @@ var VmBaseModal = function VmBaseModal(props) {
             onChange: function onChange(key) {
               setCurrentTabKey(key);
             },
-            active: currentTabKey,
+            active: activeTabKey,
             theme: theme
           }), /*#__PURE__*/_jsx(VtxThemeProvider, {
             value: value,
@@ -196,7 +227,7 @@ var VmBaseModal = function VmBaseModal(props) {
               className: 'vm-base-modal-content-wrap',
               children: /*#__PURE__*/_jsx("div", {
                 className: 'vm-base-modal-content',
-                children: contents[currentTabKey]
+                children: activeContent
               })
             })
           })]
@@ -210,7 +241,7 @@ var VmBaseModal = function VmBaseModal(props) {
           className: 'vm-base-modal-content-wrap',
           children: /*#__PURE__*/_jsx("div", {
             className: 'vm-base-modal-content',
-            children: contents[currentTabKey]
+            children: activeContent
           })
         })
       })

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

@@ -97,7 +97,7 @@ var Info = function Info(_ref) {
   var list = [{
     name: '今日行驶',
     unit: 'km',
-    value: (info === null || info === void 0 ? void 0 : info.mileage) || 0,
+    value: (info === null || info === void 0 ? void 0 : info.accuMileage) || 0,
     img: showListImg ? isDark ? darkRunIcon : runIcon : null,
     fontType: 'blue'
   }, {

package/package.json

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