@vtx/modals2 6.0.0-beta.1 → 6.0.0-beta.10

package/lib/vtx-zf-modal/components/CkEditorCustom/widgets/radio/checkbox.js

@@ -22,6 +22,7 @@ function _assertThisInitialized(self) { if (self === void 0) { throw new Referen
 function _isNativeReflectConstruct() { if (typeof Reflect === "undefined" || !Reflect.construct) return false; if (Reflect.construct.sham) return false; if (typeof Proxy === "function") return true; try { Boolean.prototype.valueOf.call(Reflect.construct(Boolean, [], function () {})); return true; } catch (e) { return false; } }
 function _getPrototypeOf(o) { _getPrototypeOf = Object.setPrototypeOf ? Object.getPrototypeOf.bind() : function _getPrototypeOf(o) { return o.__proto__ || Object.getPrototypeOf(o); }; return _getPrototypeOf(o); }
 import { Plugin, Widget, ButtonView, ContextualBalloon, Command, clickOutsideHandler, toWidget } from "../../ckeditor/ckeditor";
+import { translateLocaleText } from "../../../../../hooks/useTranslation.js";
 import OpenPanelCommand from "../OpenPanelCommand";
 import FormView from "./FormView";
 import "./index.less";
@@ -51,7 +52,7 @@ var CheckboxEditing = /*#__PURE__*/function (_Plugin2) {
   _createClass(CheckboxEditing, [{
     key: "init",
     value: function init() {
-      console.log('自定义Checkbox内容被调用');
+      console.log('custom checkbox editing initialized');
       this._defineSchema();
       this._defineConverters();
       this.editor.commands.add('insertCustomCheckbox', new InsertCustomCheckboxCommand(this.editor));
@@ -118,7 +119,9 @@ var CheckboxEditing = /*#__PURE__*/function (_Plugin2) {
           style += "width: ".concat(config[key], "px;");
         } else {
           if (key == 'label') {
-            obj.placeholder = "\u8BF7\u8F93\u5165".concat(config[key] || '');
+            obj.placeholder = translateLocaleText("t('common.placeholder.inputWithLabel')", {
+              label: config[key] || ''
+            });
           }
           obj[key] = config[key];
         }
@@ -161,7 +164,9 @@ function renderView(modelElement, props) {
         key = _step$value[0],
         value = _step$value[1];
       if (key == 'label') {
-        obj.placeholder = "\u8BF7\u8F93\u5165".concat(value || '');
+        obj.placeholder = translateLocaleText("t('common.placeholder.inputWithLabel')", {
+          label: value || ''
+        });
       }
       obj[key] = value;
     }
@@ -196,7 +201,7 @@ var CheckboxUI = /*#__PURE__*/function (_Plugin3) {
     key: "init",
     value: function init() {
       var _this = this;
-      console.log('自定义CheckboxUI被调用');
+      console.log('custom checkbox UI initialized');
       var editor = this.editor;
       var t = editor.t;
       this._balloon = this.editor.plugins.get(ContextualBalloon);
@@ -205,7 +210,7 @@ var CheckboxUI = /*#__PURE__*/function (_Plugin3) {
       editor.ui.componentFactory.add('customCheckbox', function (locale) {
         var buttonView = new ButtonView(locale);
         buttonView.set({
-          label: t('复选框'),
+          label: translateLocaleText("t('vtxzfmodal.ck.checkbox')"),
           withText: true,
           tooltip: false
         });

package/lib/vtx-zf-modal/components/CkEditorCustom/widgets/radio/index.js

@@ -22,6 +22,7 @@ function _assertThisInitialized(self) { if (self === void 0) { throw new Referen
 function _isNativeReflectConstruct() { if (typeof Reflect === "undefined" || !Reflect.construct) return false; if (Reflect.construct.sham) return false; if (typeof Proxy === "function") return true; try { Boolean.prototype.valueOf.call(Reflect.construct(Boolean, [], function () {})); return true; } catch (e) { return false; } }
 function _getPrototypeOf(o) { _getPrototypeOf = Object.setPrototypeOf ? Object.getPrototypeOf.bind() : function _getPrototypeOf(o) { return o.__proto__ || Object.getPrototypeOf(o); }; return _getPrototypeOf(o); }
 import { Plugin, Widget, ButtonView, ContextualBalloon, Command, clickOutsideHandler, toWidget } from "../../ckeditor/ckeditor";
+import { translateLocaleText } from "../../../../../hooks/useTranslation.js";
 import OpenPanelCommand from "../OpenPanelCommand";
 import FormView from "./FormView";
 import "./index.less";
@@ -51,7 +52,7 @@ var RadioEditing = /*#__PURE__*/function (_Plugin2) {
   _createClass(RadioEditing, [{
     key: "init",
     value: function init() {
-      console.log('自定义Radio内容被调用');
+      console.log('custom radio editing initialized');
       this._defineSchema();
       this._defineConverters();
       this.editor.commands.add('insertCustomRadio', new InsertCustomRadioCommand(this.editor));
@@ -118,7 +119,9 @@ var RadioEditing = /*#__PURE__*/function (_Plugin2) {
           style += "width: ".concat(config[key], "px;");
         } else {
           if (key == 'label') {
-            obj.placeholder = "\u8BF7\u8F93\u5165".concat(config[key] || '');
+            obj.placeholder = translateLocaleText("t('common.placeholder.inputWithLabel')", {
+              label: config[key] || ''
+            });
           }
           obj[key] = config[key];
         }
@@ -161,7 +164,9 @@ function renderView(modelElement, props) {
         key = _step$value[0],
         value = _step$value[1];
       if (key == 'label') {
-        obj.placeholder = "\u8BF7\u8F93\u5165".concat(value || '');
+        obj.placeholder = translateLocaleText("t('common.placeholder.inputWithLabel')", {
+          label: value || ''
+        });
       }
       obj[key] = value;
     }
@@ -196,7 +201,7 @@ var RadioUI = /*#__PURE__*/function (_Plugin3) {
     key: "init",
     value: function init() {
       var _this = this;
-      console.log('自定义RadioUI被调用');
+      console.log('custom radio UI initialized');
       var editor = this.editor;
       var t = editor.t;
       this._balloon = this.editor.plugins.get(ContextualBalloon);
@@ -205,7 +210,7 @@ var RadioUI = /*#__PURE__*/function (_Plugin3) {
       editor.ui.componentFactory.add('customRadio', function (locale) {
         var buttonView = new ButtonView(locale);
         buttonView.set({
-          label: t('单选框'),
+          label: translateLocaleText("t('vtxzfmodal.ck.radio')"),
           withText: true,
           tooltip: false
         });

package/lib/vtx-zf-modal/components/CkEditorCustom/widgets/sign/FormView.js

@@ -14,6 +14,7 @@ function _assertThisInitialized(self) { if (self === void 0) { throw new Referen
 function _isNativeReflectConstruct() { if (typeof Reflect === "undefined" || !Reflect.construct) return false; if (Reflect.construct.sham) return false; if (typeof Proxy === "function") return true; try { Boolean.prototype.valueOf.call(Reflect.construct(Boolean, [], function () {})); return true; } catch (e) { return false; } }
 function _getPrototypeOf(o) { _getPrototypeOf = Object.setPrototypeOf ? Object.getPrototypeOf.bind() : function _getPrototypeOf(o) { return o.__proto__ || Object.getPrototypeOf(o); }; return _getPrototypeOf(o); }
 import { View, LabeledFieldView, createLabeledInputText, ButtonView, submitHandler, icons, LabelView } from "../../ckeditor/ckeditor";
+import { translateLocaleText } from "../../../../../hooks/useTranslation.js";
 var FormView = /*#__PURE__*/function (_View) {
   _inherits(FormView, _View);
   var _super = _createSuper(FormView);
@@ -21,12 +22,12 @@ var FormView = /*#__PURE__*/function (_View) {
     var _this;
     _classCallCheck(this, FormView);
     _this = _super.call(this, locale);
-    _this.attrLabel = _this._createLabel("属性");
-    _this.styleLabel = _this._createLabel("样式");
-    _this.labelInputView = _this._createInput('字段名');
-    _this.nameInputView = _this._createInput('字段');
-    _this.wordInputView = _this._createInput('文字');
-    _this.orderInputView = _this._createInput('排序号');
+    _this.attrLabel = _this._createLabel(translateLocaleText("t('vtxzfmodal.ck.attribute')"));
+    _this.styleLabel = _this._createLabel(translateLocaleText("t('vtxzfmodal.ck.style')"));
+    _this.labelInputView = _this._createInput(translateLocaleText("t('vtxzfmodal.ck.fieldName')"));
+    _this.nameInputView = _this._createInput(translateLocaleText("t('vtxzfmodal.ck.field')"));
+    _this.wordInputView = _this._createInput(translateLocaleText("t('vtxzfmodal.ck.text')"));
+    _this.orderInputView = _this._createInput(translateLocaleText("t('vtxzfmodal.ck.orderNo')"));
 
     // Create the save and cancel buttons.
     _this.saveButtonView = _this._createButton('Save', icons.check, 'ck-button-save');

package/lib/vtx-zf-modal/components/CkEditorCustom/widgets/sign/index.js

@@ -22,6 +22,7 @@ function _assertThisInitialized(self) { if (self === void 0) { throw new Referen
 function _isNativeReflectConstruct() { if (typeof Reflect === "undefined" || !Reflect.construct) return false; if (Reflect.construct.sham) return false; if (typeof Proxy === "function") return true; try { Boolean.prototype.valueOf.call(Reflect.construct(Boolean, [], function () {})); return true; } catch (e) { return false; } }
 function _getPrototypeOf(o) { _getPrototypeOf = Object.setPrototypeOf ? Object.getPrototypeOf.bind() : function _getPrototypeOf(o) { return o.__proto__ || Object.getPrototypeOf(o); }; return _getPrototypeOf(o); }
 import { Plugin, Widget, ButtonView, ContextualBalloon, Command, clickOutsideHandler, viewToModelPositionOutsideModelElement, toWidget } from "../../ckeditor/ckeditor";
+import { translateLocaleText } from "../../../../../hooks/useTranslation.js";
 import OpenPanelCommand from "../OpenPanelCommand";
 import FormView from "./FormView";
 import "./index.less";
@@ -51,7 +52,7 @@ var InputEditing = /*#__PURE__*/function (_Plugin2) {
   _createClass(InputEditing, [{
     key: "init",
     value: function init() {
-      console.log('自定义签名图片内容被调用');
+      console.log('custom signature image editing initialized');
       this._defineSchema();
       this._defineConverters();
       this.editor.commands.add('insertCustomSign', new InsertCustomSignCommand(this.editor));
@@ -121,7 +122,9 @@ var InputEditing = /*#__PURE__*/function (_Plugin2) {
           style += "width: ".concat(config[key], "px;");
         } else {
           if (key == 'label') {
-            obj.placeholder = "\u8BF7\u8F93\u5165".concat(config[key] || '');
+            obj.placeholder = translateLocaleText("t('common.placeholder.inputWithLabel')", {
+              label: config[key] || ''
+            });
           }
           obj[key] = config[key];
         }
@@ -133,7 +136,7 @@ var InputEditing = /*#__PURE__*/function (_Plugin2) {
         element = writer.createContainerElement('span', _objectSpread(_objectSpread({}, obj), {}, {
           class: 'custom-sign vtx_ck_widgets'
         }));
-        innerText = writer.createText("".concat(obj.word || '签'));
+        innerText = writer.createText("".concat(obj.word || translateLocaleText("t('vtxzfmodal.ck.signDefaultWord')")));
         writer.insert(writer.createPositionAt(element, 0), innerText);
       }
       // return element;
@@ -166,7 +169,9 @@ function renderView(modelElement, props) {
         style += "width: ".concat(value, ";");
       } else {
         if (key == 'label') {
-          obj.placeholder = "\u8BF7\u8F93\u5165".concat(value || '');
+          obj.placeholder = translateLocaleText("t('common.placeholder.inputWithLabel')", {
+            label: value || ''
+          });
         }
         obj[key] = value;
       }
@@ -183,7 +188,7 @@ function renderView(modelElement, props) {
     element = writer.createContainerElement('span', _objectSpread(_objectSpread({}, obj), {}, {
       class: 'custom-sign'
     }));
-    innerText = writer.createText("".concat(obj.word || '签'));
+    innerText = writer.createText("".concat(obj.word || translateLocaleText("t('vtxzfmodal.ck.signDefaultWord')")));
     writer.insert(writer.createPositionAt(element, 0), innerText);
   }
   return element;
@@ -199,7 +204,7 @@ var InputUI = /*#__PURE__*/function (_Plugin3) {
     key: "init",
     value: function init() {
       var _this = this;
-      console.log('自定义签名图片UI被调用');
+      console.log('custom signature image UI initialized');
       var editor = this.editor;
       var t = editor.t;
       this._balloon = this.editor.plugins.get(ContextualBalloon);
@@ -208,7 +213,7 @@ var InputUI = /*#__PURE__*/function (_Plugin3) {
       editor.ui.componentFactory.add('customSign', function (locale) {
         var buttonView = new ButtonView(locale);
         buttonView.set({
-          label: t('签名图片'),
+          label: translateLocaleText("t('vtxzfmodal.ck.signatureImage')"),
           withText: true,
           tooltip: false
         });

package/lib/vtx-zf-modal/components/CkEditorCustom/widgets/textarea/FormView.js

@@ -14,6 +14,7 @@ function _assertThisInitialized(self) { if (self === void 0) { throw new Referen
 function _isNativeReflectConstruct() { if (typeof Reflect === "undefined" || !Reflect.construct) return false; if (Reflect.construct.sham) return false; if (typeof Proxy === "function") return true; try { Boolean.prototype.valueOf.call(Reflect.construct(Boolean, [], function () {})); return true; } catch (e) { return false; } }
 function _getPrototypeOf(o) { _getPrototypeOf = Object.setPrototypeOf ? Object.getPrototypeOf.bind() : function _getPrototypeOf(o) { return o.__proto__ || Object.getPrototypeOf(o); }; return _getPrototypeOf(o); }
 import { View, LabeledFieldView, createLabeledInputText, ButtonView, submitHandler, icons, LabelView } from "../../ckeditor/ckeditor";
+import { translateLocaleText } from "../../../../../hooks/useTranslation.js";
 var FormView = /*#__PURE__*/function (_View) {
   _inherits(FormView, _View);
   var _super = _createSuper(FormView);
@@ -21,12 +22,12 @@ var FormView = /*#__PURE__*/function (_View) {
     var _this;
     _classCallCheck(this, FormView);
     _this = _super.call(this, locale);
-    _this.attrLabel = _this._createLabel("属性");
-    _this.styleLabel = _this._createLabel("样式");
-    _this.labelInputView = _this._createInput('字段名');
-    _this.nameInputView = _this._createInput('字段');
+    _this.attrLabel = _this._createLabel(translateLocaleText("t('vtxzfmodal.ck.attribute')"));
+    _this.styleLabel = _this._createLabel(translateLocaleText("t('vtxzfmodal.ck.style')"));
+    _this.labelInputView = _this._createInput(translateLocaleText("t('vtxzfmodal.ck.fieldName')"));
+    _this.nameInputView = _this._createInput(translateLocaleText("t('vtxzfmodal.ck.field')"));
     _this.rowsInputView = _this._createInput('Rows');
-    _this.orderInputView = _this._createInput('排序号');
+    _this.orderInputView = _this._createInput(translateLocaleText("t('vtxzfmodal.ck.orderNo')"));
 
     // Create the save and cancel buttons.
     _this.saveButtonView = _this._createButton('Save', icons.check, 'ck-button-save');

package/lib/vtx-zf-modal/components/CkEditorCustom/widgets/textarea/index.js

@@ -22,6 +22,7 @@ function _assertThisInitialized(self) { if (self === void 0) { throw new Referen
 function _isNativeReflectConstruct() { if (typeof Reflect === "undefined" || !Reflect.construct) return false; if (Reflect.construct.sham) return false; if (typeof Proxy === "function") return true; try { Boolean.prototype.valueOf.call(Reflect.construct(Boolean, [], function () {})); return true; } catch (e) { return false; } }
 function _getPrototypeOf(o) { _getPrototypeOf = Object.setPrototypeOf ? Object.getPrototypeOf.bind() : function _getPrototypeOf(o) { return o.__proto__ || Object.getPrototypeOf(o); }; return _getPrototypeOf(o); }
 import { Plugin, Widget, ButtonView, ContextualBalloon, Command, clickOutsideHandler, toWidget } from "../../ckeditor/ckeditor";
+import { translateLocaleText } from "../../../../../hooks/useTranslation.js";
 import OpenPanelCommand from "../OpenPanelCommand";
 import FormView from "./FormView";
 import "./index.less";
@@ -51,7 +52,7 @@ var InputEditing = /*#__PURE__*/function (_Plugin2) {
   _createClass(InputEditing, [{
     key: "init",
     value: function init() {
-      console.log('自定义文本域内容被调用');
+      console.log('custom textarea editing initialized');
       this._defineSchema();
       this._defineConverters();
       this.editor.commands.add('insertCustomTextarea', new InsertCustomTextareaCommand(this.editor));
@@ -118,7 +119,9 @@ var InputEditing = /*#__PURE__*/function (_Plugin2) {
           style += "width: ".concat(config[key], "px;");
         } else {
           if (key == 'label') {
-            obj.placeholder = "\u8BF7\u8F93\u5165".concat(config[key] || '');
+            obj.placeholder = translateLocaleText("t('common.placeholder.inputWithLabel')", {
+              label: config[key] || ''
+            });
           }
           obj[key] = config[key];
         }
@@ -159,7 +162,9 @@ function renderView(modelElement, props) {
         style += "width: ".concat(value, ";");
       } else {
         if (key == 'label') {
-          obj.placeholder = "\u8BF7\u8F93\u5165".concat(value || '');
+          obj.placeholder = translateLocaleText("t('common.placeholder.inputWithLabel')", {
+            label: value || ''
+          });
         }
         obj[key] = value;
       }
@@ -189,7 +194,7 @@ var InputUI = /*#__PURE__*/function (_Plugin3) {
     key: "init",
     value: function init() {
       var _this = this;
-      console.log('自定义文本域UI被调用');
+      console.log('custom textarea UI initialized');
       var editor = this.editor;
       var t = editor.t;
       this._balloon = this.editor.plugins.get(ContextualBalloon);
@@ -198,7 +203,7 @@ var InputUI = /*#__PURE__*/function (_Plugin3) {
       editor.ui.componentFactory.add('customTextarea', function (locale) {
         var buttonView = new ButtonView(locale);
         buttonView.set({
-          label: t('文本域'),
+          label: translateLocaleText("t('vtxzfmodal.ck.textarea')"),
           withText: true,
           tooltip: false
         });

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

@@ -3,14 +3,15 @@ function _defineProperty(obj, key, value) { key = _toPropertyKey(key); if (key i
 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 { useMemo } from 'react';
+import Appraisal from "../_components/vm-appraisal-info";
 import VmRepairMaintain from "../_components/vm-repair-maintain";
 import useGetChannels from "../_hooks/useGetChannels";
 import { BaseInfo as DefaultBaseInfo } from "../vtx-default-modal/components";
-import { BaseInfo, Calendar, Metering, WorkCondition } from "../vtx-df-modal/components";
+import { BaseInfo, BaseInfoZdReborn, Calendar, CalendarZdReborn, Metering, MeteringZdReborn, WorkCondition } from "../vtx-df-modal/components";
 import { translateLocaleText } from "./../hooks/useTranslation.js";
 // import Appraisal from '../vm-appraisal-info';
 import VmCustom from "../_components/vm-custom";
-import VmVideo from "../_components/vm-video";
+import VmVideo, { insertVideoTab } from "../_components/vm-video";
 import useGetConfig from "../_hooks/useGetConfig";
 import { CommonService } from "../_service";
 import VtxBaseModal from "../vtx-base-modal";
@@ -38,7 +39,9 @@ var VtxDfModal = function VtxDfModal(props) {
     customMapInfo = props.customMapInfo,
     tabChose = props.tabChose,
     _props$showCollect = props.showCollect,
-    showCollect = _props$showCollect === void 0 ? true : _props$showCollect;
+    showCollect = _props$showCollect === void 0 ? true : _props$showCollect,
+    _props$zdReborn = props.zdReborn,
+    zdReborn = _props$zdReborn === void 0 ? false : _props$zdReborn;
   var _CommonService$useBas = CommonService.useBaseInfo(id, (customMapInfo === null || customMapInfo === void 0 ? void 0 : customMapInfo.coordinate) || 'wgs84'),
     info = _CommonService$useBas.info,
     photos = _CommonService$useBas.photos;
@@ -47,18 +50,20 @@ var VtxDfModal = function VtxDfModal(props) {
     title: translateLocaleText("t('vtxdefaultmodal.overviewInformation')")
   }, {
     key: TABS_METERING,
-    title: '计量信息'
+    title: translateLocaleText("t('vtxdfmodal.meteringInformation')")
   }, {
     key: TABS_WC,
-    title: '工况信息'
+    title: translateLocaleText("t('vtxdfmodal.workConditionInformation')")
   }];
   var _useGetConfig = useGetConfig(info === null || info === void 0 ? void 0 : info.typeCode, tabs),
     tabsData = _useGetConfig.tabsData;
-  var _CommonService$useLmD = CommonService.useLmDetail(id),
-    detail = _CommonService$useLmD.detail;
+  var _CommonService = CommonService[zdReborn ? 'useLmDetailZdReborn' : 'useLmDetail'](id),
+    detail = _CommonService.detail;
   var _BaseService$useRealt = BaseService.useRealtimeMonitor(info === null || info === void 0 ? void 0 : info.code),
     realtimeMonitor = _BaseService$useRealt.realtimeMonitor;
-  var _useGetChannels = useGetChannels("".concat(info === null || info === void 0 ? void 0 : info.typeCode, "_").concat(info === null || info === void 0 ? void 0 : info.code), !!(info !== null && info !== void 0 && info.typeCode)),
+  var _useGetChannels = useGetChannels("".concat(info === null || info === void 0 ? void 0 : info.typeCode, "_").concat(info === null || info === void 0 ? void 0 : info.code), !!(info !== null && info !== void 0 && info.typeCode) && (tabsData === null || tabsData === void 0 ? void 0 : tabsData.findIndex(function (ele) {
+      return ele.key === 'video';
+    })) > -1),
     channels = _useGetChannels.channels;
   // realtimeRes为空则无工况，beenWeigh为false则无计量
   var tabsList = useMemo(function () {
@@ -68,36 +73,37 @@ var VtxDfModal = function VtxDfModal(props) {
         return ele.key !== 'metering';
       });
     }
-    if (tabsList.findIndex(function (ele) {
-      return ele.key === 'video';
-    }) > -1) {
-      if ((channels === null || channels === void 0 ? void 0 : channels.length) < 1) {
-        tabsList = tabsList.filter(function (ele) {
-          return ele.key !== 'video';
-        });
-      }
-    }
-    return tabsList;
+    return insertVideoTab(tabsList, channels);
   }, [JSON.stringify(tabsData), JSON.stringify(channels), JSON.stringify(detail)]);
-  var contents = _defineProperty(_defineProperty(_defineProperty(_defineProperty(_defineProperty(_defineProperty({}, TABS_BASE, !(detail !== null && detail !== void 0 && detail.beenWeigh) && !(realtimeMonitor !== null && realtimeMonitor !== void 0 && realtimeMonitor.length) ? /*#__PURE__*/_jsx(DefaultBaseInfo, {
+  var ZLBase = zdReborn ? BaseInfoZdReborn : BaseInfo;
+  var contents = _defineProperty(_defineProperty(_defineProperty(_defineProperty(_defineProperty(_defineProperty(_defineProperty({}, TABS_BASE, !(detail !== null && detail !== void 0 && detail.beenWeigh) && !(realtimeMonitor !== null && realtimeMonitor !== void 0 && realtimeMonitor.length) ? /*#__PURE__*/_jsx(DefaultBaseInfo, {
     id: id,
     info: info,
     photos: photos,
     mapCenter: mapCenter,
     customMapInfo: customMapInfo
-  }) : /*#__PURE__*/_jsx(BaseInfo, {
+  }) : /*#__PURE__*/_jsx(ZLBase, {
     code: info === null || info === void 0 ? void 0 : info.code,
     hasLm: detail === null || detail === void 0 ? void 0 : detail.beenWeigh,
     realtimeMonitor: realtimeMonitor,
     info: info,
     photos: photos
-  })), TABS_METERING, /*#__PURE__*/_jsx(Metering, {
+  })), TABS_METERING, zdReborn ? /*#__PURE__*/_jsx(MeteringZdReborn, {
+    id: id,
+    deviceId: detail === null || detail === void 0 ? void 0 : detail.deviceId
+  }) : /*#__PURE__*/_jsx(Metering, {
     id: id
   })), TABS_WC, /*#__PURE__*/_jsx(WorkCondition, {
     id: id,
     code: info === null || info === void 0 ? void 0 : info.code
-  })), TABS_Calendar, /*#__PURE__*/_jsx(Calendar, {
+  })), TABS_Calendar, zdReborn ? /*#__PURE__*/_jsx(CalendarZdReborn, {
+    code: info === null || info === void 0 ? void 0 : info.code,
+    deviceId: detail === null || detail === void 0 ? void 0 : detail.deviceId,
+    handleAbility: detail === null || detail === void 0 ? void 0 : detail.handleAbility
+  }) : /*#__PURE__*/_jsx(Calendar, {
     code: info === null || info === void 0 ? void 0 : info.code
+  })), TABS_APPRAISAL, /*#__PURE__*/_jsx(Appraisal, {
+    id: id
   })), TABS_RM, /*#__PURE__*/_jsx(VmRepairMaintain, {
     id: id
   })), TABS_VIDEO, /*#__PURE__*/_jsx(VmVideo, {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@vtx/modals2",
-  "version": "6.0.0-beta.1",
+  "version": "6.0.0-beta.10",
   "description": "弹窗组件",
   "license": "MIT",
   "module": "lib/index.js",
@@ -51,10 +51,10 @@
     "@types/react-dom": "^18.0.0",
     "@umijs/lint": "^4.0.0",
     "@vtx/components": "^4.0.0-beta.58",
+    "@vtx/map-icon": "^2.0.62",
     "@vtx/ol-map": "^2.0.0-beta.16",
-    "@vtx/player": "latest",
+    "@vtx/player": "^1.12.7",
     "@vtx/utils": "^1.0.20",
-    "ol": "6.15.1",
     "antd": "6.0.0",
     "antd-dayjs-webpack-plugin": "^1.0.6",
     "babel-eslint": "^10.1.0",
@@ -65,22 +65,22 @@
     "father": "^4.1.0",
     "husky": "^8.0.1",
     "lint-staged": "^13.0.3",
+    "ol": "6.15.1",
     "prettier": "^2.7.1",
     "prettier-plugin-organize-imports": "^3.0.0",
     "prettier-plugin-packagejson": "^2.2.18",
     "react": "18.0.0",
     "react-dom": "18.0.0",
-    "stylelint": "^14.9.1",
-    "@vtx/map-icon": "^2.0.62"
+    "stylelint": "^14.9.1"
   },
   "peerDependencies": {
-    "antd": ">=6",
     "@ant-design/icons": ">=6",
     "@vtx/components": ">=4.0.0-beta.0",
     "@vtx/map-icon": ">=2.0.0",
     "@vtx/ol-map": ">=2.0.0-beta.0",
     "@vtx/player": ">=1.0.0",
     "@vtx/utils": ">=1.0.20",
+    "antd": ">=6",
     "ol": ">=6.15.1",
     "react": ">=18",
     "react-dom": ">=18"