@vtx/modals2 6.0.0-beta.17 → 6.0.0-beta.19

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

@@ -144,7 +144,7 @@ var VtxCarModal = function VtxCarModal(props) {
     showFields = _BaseService$useField.showFields;
   var code = useMemo(function () {
     var code = '';
-    var actionType = 'ACTION_LJZY' || (info === null || info === void 0 ? void 0 : info.actionType);
+    var actionType = info === null || info === void 0 ? void 0 : info.actionType;
     if (defaultCode) {
       code = defaultCode;
     } else if (actionType && !defaultCode) {
@@ -166,8 +166,9 @@ var VtxCarModal = function VtxCarModal(props) {
   }, [defaultCode, info === null || info === void 0 ? void 0 : info.actionType]);
   var tabs = useMemo(function () {
     var tabs = [];
-    // const { actionType = '' } = info || {};
-    var actionType = 'ACTION_LJZY';
+    var _ref = info || {},
+      _ref$actionType = _ref.actionType,
+      actionType = _ref$actionType === void 0 ? '' : _ref$actionType;
     if (!actionType) {
       return [];
     }

package/lib/vtx-df-modal/components/Calendar/zd-reborn.js

@@ -25,7 +25,8 @@ import { jsx as _jsx, jsxs as _jsxs, Fragment as _Fragment } from "react/jsx-run
 var Charts = function Charts(_ref) {
   var code = _ref.code,
     deviceId = _ref.deviceId,
-    handleAbility = _ref.handleAbility;
+    handleAbility = _ref.handleAbility,
+    hasWorkCondition = _ref.hasWorkCondition;
   var _useSettings = useSettings(),
     isDark = _useSettings.isDark;
   var _useSetState = useSetState({
@@ -112,20 +113,26 @@ var Charts = function Charts(_ref) {
       children: [/*#__PURE__*/_jsx("div", {
         className: "df-calendar-head",
         children: [{
+          visible: true,
           name: translateLocaleText("t('vtxdfmodal.tons')"),
           img: jcl,
           type: 'blue'
         }, {
+          visible: true,
           name: translateLocaleText("t('vtxjzljdftpdmodal.times')"),
           img: car,
           type: 'green'
         }, {
+          visible: hasWorkCondition,
           name: translateLocaleText("t('vtxdfmodal.workConditionNormal')"),
           imgType: 'normal'
         }, {
+          visible: hasWorkCondition,
           name: translateLocaleText("t('vtxdfmodal.workConditionAbnormal')"),
           imgType: 'alarm'
-        }].map(function (item, index) {
+        }].filter(function (ele) {
+          return ele.visible;
+        }).map(function (item, index) {
           return /*#__PURE__*/_jsx(VmCalendarInner, _objectSpread(_objectSpread({}, item), {}, {
             value: item.name
           }), index);

package/package.json

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