@vtx/modals2 6.0.0-beta.5 → 6.0.0-beta.6

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

@@ -12,6 +12,7 @@ function _iterableToArrayLimit(r, l) { var t = null == r ? null : "undefined" !=
 function _arrayWithHoles(arr) { if (Array.isArray(arr)) return arr; }
 import { useSetState } from 'ahooks';
 import { VmIframeModal } from "../_components";
+import Appraisal, { insertAppraisalTab } from "../_components/vm-appraisal-info";
 import useGetConfig from "../_hooks/useGetConfig";
 import VtxBaseModal from "../vtx-base-modal";
 import { BaseService } from "./api";
@@ -25,8 +26,8 @@ var TABS_CALENDAR = 'calendar';
 var TABS_LANE_BASE = 'lane-base';
 var TABS_LANE_STATIC = 'lane-statistical';
 var TABS_LANE_CALENDAR = 'lane-calendar';
+var TABS_APPRAISAL = 'appraisal';
 var VtxRoadModal = function VtxRoadModal(props) {
-  var _contents;
   var id = props.id,
     title = props.title,
     subTitle = props.subTitle,
@@ -84,7 +85,9 @@ var VtxRoadModal = function VtxRoadModal(props) {
   var laneCalendarContent = /*#__PURE__*/_jsx(LaneCalendar, {
     id: id
   });
-  var contents = (_contents = {}, _defineProperty(_defineProperty(_defineProperty(_defineProperty(_defineProperty(_defineProperty(_defineProperty(_defineProperty(_defineProperty(_defineProperty(_contents, TABS_BASE, baseContent), "tr-".concat(TABS_BASE), baseContent), TABS_STATIC, statisticalContent), "tr-".concat(TABS_STATIC), statisticalContent), TABS_CALENDAR, calendarContent), "tr-".concat(TABS_CALENDAR), calendarContent), TABS_LANE_BASE, laneBaseContent), "tr-".concat(TABS_LANE_BASE), laneBaseContent), TABS_LANE_STATIC, laneStatisticalContent), "tr-".concat(TABS_LANE_STATIC), laneStatisticalContent), _defineProperty(_defineProperty(_contents, TABS_LANE_CALENDAR, laneCalendarContent), "tr-".concat(TABS_LANE_CALENDAR), laneCalendarContent));
+  var contents = _defineProperty(_defineProperty(_defineProperty(_defineProperty(_defineProperty(_defineProperty(_defineProperty({}, TABS_BASE, baseContent), TABS_STATIC, statisticalContent), TABS_CALENDAR, calendarContent), TABS_LANE_BASE, laneBaseContent), TABS_LANE_STATIC, laneStatisticalContent), TABS_LANE_CALENDAR, laneCalendarContent), TABS_APPRAISAL, /*#__PURE__*/_jsx(Appraisal, {
+    id: id
+  }));
   return /*#__PURE__*/_jsxs(_Fragment, {
     children: [visible && /*#__PURE__*/_jsx(VtxBaseModal, {
       title: title,
@@ -93,7 +96,7 @@ var VtxRoadModal = function VtxRoadModal(props) {
       theme: theme,
       visible: visible,
       onCancel: onCancel,
-      tabs: tabsData,
+      tabs: insertAppraisalTab(tabsData),
       tabChose: tabChose,
       startDate: startDate,
       endDate: endDate,

package/lib/vtx-road-modal/utils/url.js

@@ -0,0 +1,12 @@
+export var buildIframeQuery = function buildIframeQuery() {
+  var routeQuery = arguments.length > 0 && arguments[0] !== undefined ? arguments[0] : '';
+  var params = arguments.length > 1 && arguments[1] !== undefined ? arguments[1] : {};
+  var searchParams = new URLSearchParams(routeQuery || '');
+  Object.keys(params).forEach(function (key) {
+    var value = params[key];
+    if (value !== undefined && value !== null) {
+      searchParams.set(key, value);
+    }
+  });
+  return searchParams.toString().replace(/\+/g, '%20');
+};

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

@@ -3,7 +3,11 @@ 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 VmCustom from "../_components/vm-custom";
+import VmRepairMaintain from "../_components/vm-repair-maintain";
+import VmVideo, { insertVideoTab } from "../_components/vm-video";
+import useGetChannels from "../_hooks/useGetChannels";
 import useGetConfig from "../_hooks/useGetConfig";
 import VtxBaseModal from "../vtx-base-modal";
 import { BaseService } from "./api";
@@ -16,6 +20,9 @@ var TABS_CALENDAR = 'calendar';
 var TABS_THROW = 'throw';
 var TABS_ALARM = 'alarm';
 var TABS_TFD = 'tfd';
+var TABS_APPRAISAL = 'appraisal';
+var TABS_VIDEO = 'video';
+var TABS_RM = 'rm';
 var tabs = [{
   key: TABS_BASE,
   title: translateLocaleText("t('vtxdefaultmodal.overviewInformation')")
@@ -56,11 +63,13 @@ var VtxShxqModal = function VtxShxqModal(props) {
     baseInfo = _BaseService$useBaseI.baseInfo;
   var _useGetConfig = useGetConfig(info.typeCode, tabs),
     tabsData = _useGetConfig.tabsData;
+  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)),
+    channels = _useGetChannels.channels;
   var tabsList = useMemo(function () {
     var tabsList = tabsData;
-    return tabsList;
-  }, [JSON.stringify(tabsData)]);
-  var contents = _defineProperty(_defineProperty(_defineProperty(_defineProperty(_defineProperty({}, TABS_BASE, /*#__PURE__*/_jsx(BaseInfo, {
+    return insertVideoTab(tabsList, channels);
+  }, [JSON.stringify(tabsData), JSON.stringify(channels)]);
+  var contents = _defineProperty(_defineProperty(_defineProperty(_defineProperty(_defineProperty(_defineProperty(_defineProperty(_defineProperty({}, TABS_BASE, /*#__PURE__*/_jsx(BaseInfo, {
     id: id,
     info: info,
     baseInfo: baseInfo,
@@ -76,6 +85,12 @@ var VtxShxqModal = function VtxShxqModal(props) {
   })), TABS_TFD, /*#__PURE__*/_jsx(Tfd, {
     id: id,
     service: "rykq"
+  })), TABS_APPRAISAL, /*#__PURE__*/_jsx(Appraisal, {
+    id: id
+  })), TABS_RM, /*#__PURE__*/_jsx(VmRepairMaintain, {
+    id: id
+  })), TABS_VIDEO, /*#__PURE__*/_jsx(VmVideo, {
+    channels: channels
   }));
 
   // 自定义页签可配置多个，

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

@@ -12,11 +12,19 @@ function _iterableToArrayLimit(r, l) { var t = null == r ? null : "undefined" !=
 function _arrayWithHoles(arr) { if (Array.isArray(arr)) return arr; }
 import { request } from '@vtx/utils';
 import { useEffect, useState } from 'react';
+import Appraisal from "../_components/vm-appraisal-info";
 import VmCustom from "../_components/vm-custom";
+import VmRepairMaintain from "../_components/vm-repair-maintain";
+import VmVideo, { insertVideoTab } from "../_components/vm-video";
+import useGetChannels from "../_hooks/useGetChannels";
+import { CommonService } from "../_service";
 import VtxBaseModal from "../vtx-base-modal";
 import VtxDefaultModal from "../vtx-default-modal";
 import { Appraise, Base, Build, File, Score } from "./components";
 import "./style";
+var TABS_APPRAISAL = 'appraisal';
+var TABS_VIDEO = 'video';
+var TABS_RM = 'rm';
 import { translateLocaleText } from "./../hooks/useTranslation.js";
 
 //弹窗配置
@@ -49,19 +57,24 @@ export default (function (props) {
     _useState4 = _slicedToArray(_useState3, 2),
     config = _useState4[0],
     setConfig = _useState4[1];
+  var _CommonService$useBas = CommonService.useBaseInfo(id),
+    info = _CommonService$useBas.info;
+  var _useGetChannels = useGetChannels("".concat((info === null || info === void 0 ? void 0 : info.typeCode) || 'wr', "_").concat(info === null || info === void 0 ? void 0 : info.code), !!(info !== null && info !== void 0 && info.code)),
+    channels = _useGetChannels.channels;
   useEffect(function () {
     getByCode({
       code: 'wr'
     }).then(function (res) {
       if ((res === null || res === void 0 ? void 0 : res.result) === 0) {
-        setConfig((res.data.popupConfigJson || []).filter(function (item) {
+        var tabsConfig = (res.data.popupConfigJson || []).filter(function (item) {
           return item.display;
         }).map(function (item) {
           return _objectSpread(_objectSpread({}, item), {}, {
             key: item.code,
             title: item.name
           });
-        }));
+        });
+        setConfig(tabsConfig);
       }
     });
   }, []);
@@ -74,7 +87,13 @@ export default (function (props) {
       }
     });
   }, [id]);
-  var contentList = _defineProperty(_defineProperty(_defineProperty(_defineProperty(_defineProperty({}, 'base', /*#__PURE__*/_jsx(Base, _objectSpread(_objectSpread({}, props), {}, {
+  var contentList = _defineProperty(_defineProperty(_defineProperty(_defineProperty(_defineProperty(_defineProperty(_defineProperty(_defineProperty({}, TABS_APPRAISAL, /*#__PURE__*/_jsx(Appraisal, {
+    id: id
+  })), TABS_VIDEO, /*#__PURE__*/_jsx(VmVideo, {
+    channels: channels
+  })), TABS_RM, /*#__PURE__*/_jsx(VmRepairMaintain, {
+    id: id
+  })), 'base', /*#__PURE__*/_jsx(Base, _objectSpread(_objectSpread({}, props), {}, {
     detail: detail
   }))), 'appraise', /*#__PURE__*/_jsx(Appraise, _objectSpread({}, props))), 'score', /*#__PURE__*/_jsx(Score, _objectSpread({}, props))), 'build', /*#__PURE__*/_jsx(Build, _objectSpread({}, props))), 'file', /*#__PURE__*/_jsx(File, _objectSpread({}, props)));
 
@@ -97,7 +116,7 @@ export default (function (props) {
       title: title,
       id: id,
       onCancel: onCancel,
-      tabs: config,
+      tabs: insertVideoTab(config, channels),
       contents: contentList,
       tabChose: (_config$ = config[0]) === null || _config$ === void 0 ? void 0 : _config$.key,
       modalShow: modalShow,

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

@@ -7,10 +7,11 @@ 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 Appraisal from "../_components/vm-appraisal-info";
 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";
@@ -68,18 +69,9 @@ 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 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,
@@ -98,6 +90,8 @@ var VtxDfModal = function VtxDfModal(props) {
     code: info === null || info === void 0 ? void 0 : info.code
   })), TABS_Calendar, /*#__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,92 +1,92 @@
-{
-  "name": "@vtx/modals2",
-  "version": "6.0.0-beta.5",
-  "description": "弹窗组件",
-  "license": "MIT",
-  "module": "lib/index.js",
-  "types": "lib/index.d.ts",
-  "files": [
-    "lib"
-  ],
-  "scripts": {
-    "build": "father build",
-    "build:watch": "father dev",
-    "dev": "dumi dev",
-    "docs:build": "dumi build",
-    "docs:preview": "dumi preview",
-    "doctor": "father doctor",
-    "lint": "npm run lint:es && npm run lint:css",
-    "lint:css": "stylelint \"{src,test}/**/*.{css,less}\"",
-    "lint:es": "eslint \"{src,test}/**/*.{js,jsx,ts,tsx}\"",
-    "prepare": "husky install && dumi setup",
-    "prepublishOnly": "npm run build",
-    "start": "npm run dev"
-  },
-  "dependencies": {
-    "@turf/turf": "^7.3.4",
-    "ahooks": "^3.1.5",
-    "axios": "^0.21.1",
-    "base-64": "^1.0.0",
-    "classnames": "^2.5.1",
-    "dayjs": "^1.11.10",
-    "echarts": "^5.3.2",
-    "echarts-for-react": "3.0.2",
-    "htmr": "^1.0.2",
-    "lodash": "^4.17.21",
-    "number-precision": "^1.6.0",
-    "proj4": "^2.20.8",
-    "qs": "^6.0.0",
-    "react-tagcloud": "^2.3.3",
-    "viewerjs": "^1.3.3"
-  },
-  "devDependencies": {
-    "@ant-design/icons": "6.0.0",
-    "@babel/preset-react": "^7.28.5",
-    "@babel/runtime": "^7.6.3",
-    "@commitlint/cli": "^17.1.2",
-    "@commitlint/config-conventional": "^17.1.0",
-    "@types/lodash": "^4.14.202",
-    "@types/qs": "^6.9.11",
-    "@types/react": "^18.0.0",
-    "@types/react-dom": "^18.0.0",
-    "@umijs/lint": "^4.0.0",
-    "@vtx/components": "^4.0.0-beta.58",
-    "@vtx/ol-map": "^2.0.0-beta.16",
-    "@vtx/player": "latest",
-    "@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",
-    "babel-plugin-import": "^1.13.8",
-    "dumi": "^2.2.13",
-    "echarts-liquidfill": "^3.1.0",
-    "eslint": "^8.23.0",
-    "father": "^4.1.0",
-    "husky": "^8.0.1",
-    "lint-staged": "^13.0.3",
-    "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"
-  },
-  "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",
-    "ol": ">=6.15.1",
-    "react": ">=18",
-    "react-dom": ">=18"
-  },
-  "publishConfig": {
-    "access": "public"
-  },
-  "authors": []
-}
+{
+  "name": "@vtx/modals2",
+  "version": "6.0.0-beta.6",
+  "description": "弹窗组件",
+  "license": "MIT",
+  "module": "lib/index.js",
+  "types": "lib/index.d.ts",
+  "files": [
+    "lib"
+  ],
+  "scripts": {
+    "build": "father build",
+    "build:watch": "father dev",
+    "dev": "dumi dev",
+    "docs:build": "dumi build",
+    "docs:preview": "dumi preview",
+    "doctor": "father doctor",
+    "lint": "npm run lint:es && npm run lint:css",
+    "lint:css": "stylelint \"{src,test}/**/*.{css,less}\"",
+    "lint:es": "eslint \"{src,test}/**/*.{js,jsx,ts,tsx}\"",
+    "prepare": "husky install && dumi setup",
+    "prepublishOnly": "npm run build",
+    "start": "npm run dev"
+  },
+  "dependencies": {
+    "@turf/turf": "^7.3.4",
+    "ahooks": "^3.1.5",
+    "axios": "^0.21.1",
+    "base-64": "^1.0.0",
+    "classnames": "^2.5.1",
+    "dayjs": "^1.11.10",
+    "echarts": "^5.3.2",
+    "echarts-for-react": "3.0.2",
+    "htmr": "^1.0.2",
+    "lodash": "^4.17.21",
+    "number-precision": "^1.6.0",
+    "proj4": "^2.20.8",
+    "qs": "^6.0.0",
+    "react-tagcloud": "^2.3.3",
+    "viewerjs": "^1.3.3"
+  },
+  "devDependencies": {
+    "@ant-design/icons": "6.0.0",
+    "@babel/preset-react": "^7.28.5",
+    "@babel/runtime": "^7.6.3",
+    "@commitlint/cli": "^17.1.2",
+    "@commitlint/config-conventional": "^17.1.0",
+    "@types/lodash": "^4.14.202",
+    "@types/qs": "^6.9.11",
+    "@types/react": "^18.0.0",
+    "@types/react-dom": "^18.0.0",
+    "@umijs/lint": "^4.0.0",
+    "@vtx/components": "^4.0.0-beta.58",
+    "@vtx/ol-map": "^2.0.0-beta.16",
+    "@vtx/player": "latest",
+    "@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",
+    "babel-plugin-import": "^1.13.8",
+    "dumi": "^2.2.13",
+    "echarts-liquidfill": "^3.1.0",
+    "eslint": "^8.23.0",
+    "father": "^4.1.0",
+    "husky": "^8.0.1",
+    "lint-staged": "^13.0.3",
+    "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"
+  },
+  "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",
+    "ol": ">=6.15.1",
+    "react": ">=18",
+    "react-dom": ">=18"
+  },
+  "publishConfig": {
+    "access": "public"
+  },
+  "authors": []
+}