@vtx/modals2 5.0.58 → 6.0.0-beta.0

package/lib/vtx-zg-modal/components/BaseInfo/index.js

@@ -3,7 +3,18 @@ import { VmInfoCollection, VmMap, VmWrapper } from "../../../_components";
 import useSettings from "../../../_hooks/useSettings";
 import { BaseService } from "../../api";
 import "./index.less";
+import { translateLocaleText } from "./../../../hooks/useTranslation.js";
 import { jsx as _jsx, jsxs as _jsxs, Fragment as _Fragment } from "react/jsx-runtime";
+var EllipsisDiv = function EllipsisDiv(_ref) {
+  var children = _ref.children,
+    _ref$className = _ref.className,
+    className = _ref$className === void 0 ? '' : _ref$className;
+  return /*#__PURE__*/_jsx("div", {
+    className: className,
+    title: children,
+    children: children
+  });
+};
 var BaseInfo = function BaseInfo(props) {
   var _useSettings = useSettings(),
     isDark = _useSettings.isDark;
@@ -46,7 +57,7 @@ var BaseInfo = function BaseInfo(props) {
     }), /*#__PURE__*/_jsx("div", {
       className: "zg-base-left",
       children: /*#__PURE__*/_jsxs(VmWrapper, {
-        title: "\u4E8B\u4EF6\u63CF\u8FF0",
+        title: translateLocaleText("t('vtxzgmodal.eventDescription')"),
         children: [/*#__PURE__*/_jsx(VmInfoCollection, {
           data: baseInfo,
           horizontal: true,
@@ -65,17 +76,17 @@ var BaseInfo = function BaseInfo(props) {
     }), /*#__PURE__*/_jsx("div", {
       className: "zg-base-right",
       children: /*#__PURE__*/_jsxs(VmWrapper, {
-        title: "\u6574\u6539\u6D41\u7A0B",
+        title: translateLocaleText("t('vtxzgmodal.rectificationProcess')"),
         children: [/*#__PURE__*/_jsx("div", {
           className: "zg-base-process ".concat(isDark ? 'dark' : ''),
           children: [{
-            title: '派发',
+            title: translateLocaleText("t('vtxzgmodal.dispatch')"),
             key: '1'
           }, {
-            title: '处理',
+            title: translateLocaleText("t('vtxzgmodal.process')"),
             key: '2'
           }, {
-            title: '结束',
+            title: translateLocaleText("t('vtxzgmodal.finish')"),
             key: '3'
           }].map(function (ele, index) {
             var isDone = getStep() >= index;
@@ -84,7 +95,7 @@ var BaseInfo = function BaseInfo(props) {
               children: [/*#__PURE__*/_jsx("div", {
                 className: "zg-base-process-item-order ".concat(isDone ? 'active' : ''),
                 children: index + 1
-              }), /*#__PURE__*/_jsx("div", {
+              }), /*#__PURE__*/_jsx(EllipsisDiv, {
                 className: "zg-base-process-item-title ".concat(isDone ? 'active' : ''),
                 children: ele.title
               }), index < records.length && /*#__PURE__*/_jsx("div", {
@@ -105,10 +116,12 @@ var BaseInfo = function BaseInfo(props) {
                   className: "zg-p-list-item-head-title",
                   children: [/*#__PURE__*/_jsx("img", {
                     src: require("../../imgs/dot".concat(isDone ? '_done' : '', ".png"))
-                  }), /*#__PURE__*/_jsx("div", {
+                  }), /*#__PURE__*/_jsx(EllipsisDiv, {
+                    className: "zg-p-list-item-head-title-text",
                     children: ele.processTypeStr
                   })]
-                }), /*#__PURE__*/_jsx("div", {
+                }), /*#__PURE__*/_jsx(EllipsisDiv, {
+                  className: "zg-p-list-item-head-time",
                   children: ele.processTimeStr
                 })]
               }), /*#__PURE__*/_jsxs("div", {
@@ -119,7 +132,11 @@ var BaseInfo = function BaseInfo(props) {
                     background: 'unset'
                   } : {}
                 }), /*#__PURE__*/_jsxs("div", {
-                  children: [ele.processContent, /*#__PURE__*/_jsx("div", {
+                  className: "zg-p-list-item-content-main",
+                  children: [/*#__PURE__*/_jsx(EllipsisDiv, {
+                    className: "zg-p-list-item-content-text",
+                    children: ele.processContent
+                  }), /*#__PURE__*/_jsx("div", {
                     className: "zg-p-list-item-content-bg",
                     children: getBaseShow(ele.processType, detailObj)
                   })]
@@ -139,7 +156,7 @@ function getBaseShow(type, detailObj) {
     case 'Xj':
       return /*#__PURE__*/_jsx(VmInfoCollection, {
         data: [{
-          label: '问题照片',
+          label: translateLocaleText("t('vtxzgmodal.photo')"),
           key: 'photos',
           value: detailObj === null || detailObj === void 0 ? void 0 : detailObj.photos,
           componentType: 'IMAGE'
@@ -151,19 +168,19 @@ function getBaseShow(type, detailObj) {
     case 'Pf':
       return /*#__PURE__*/_jsx(VmInfoCollection, {
         data: [{
-          label: '责任单位',
+          label: translateLocaleText("t('vtxzgmodal.unit')"),
           key: 'responsibleUnitName',
           value: detailObj === null || detailObj === void 0 ? void 0 : detailObj.responsibleUnitName
         }, {
-          label: '责任人',
+          label: translateLocaleText("t('vtxzgmodal.responsiblePerson')"),
           key: 'responsibleStaffNames',
           value: detailObj === null || detailObj === void 0 ? void 0 : detailObj.responsibleStaffNames
         }, {
-          label: '整改时限',
+          label: translateLocaleText("t('vtxzgmodal.hours3')"),
           key: 'reformTimeDay',
-          value: "".concat(detailObj.reformTimeDay || 0, "\u5929").concat(detailObj.reformTimeHour || 0, "\u5C0F\u65F6").concat(detailObj.reformTimeMin || 0, "\u5206")
+          value: "".concat(detailObj.reformTimeDay || 0).concat(translateLocaleText("t('common.dayUnit')")).concat(detailObj.reformTimeHour || 0).concat(translateLocaleText("t('vtxzgmodal.hourUnit')")).concat(detailObj.reformTimeMin || 0).concat(translateLocaleText("t('vtxzgmodal.minuteUnit')"))
         }, {
-          label: '截止时间',
+          label: translateLocaleText("t('vtxzgmodal.hours2')"),
           key: 'endDateTime',
           value: detailObj === null || detailObj === void 0 ? void 0 : detailObj.endDateTime
         }],
@@ -174,15 +191,15 @@ function getBaseShow(type, detailObj) {
     case 'Sqyq':
       return /*#__PURE__*/_jsx(VmInfoCollection, {
         data: [{
-          label: '原截止时间',
+          label: translateLocaleText("t('vtxzgmodal.hours4')"),
           key: 'oldEndTime',
           value: detailObj === null || detailObj === void 0 ? void 0 : detailObj.oldEndTime
         }, {
-          label: '期望截止时间',
+          label: translateLocaleText("t('vtxzgmodal.hours5')"),
           key: 'newEndTime',
           value: detailObj === null || detailObj === void 0 ? void 0 : detailObj.newEndTime
         }, {
-          label: '申请理由',
+          label: translateLocaleText("t('vtxzgmodal.applyReason')"),
           key: 'applyReason',
           value: detailObj === null || detailObj === void 0 ? void 0 : detailObj.applyReason
         }],
@@ -193,11 +210,11 @@ function getBaseShow(type, detailObj) {
     case 'Cs':
       return /*#__PURE__*/_jsx(VmInfoCollection, {
         data: [{
-          label: '结果',
+          label: translateLocaleText("t('vtxzgmodal.result')"),
           key: 'processResult',
-          value: "".concat(detailObj.processResult === 'Accept' ? '接受整改' : detailObj.processResult === 'Reject' ? '拒绝整改' : detailObj.processResult)
+          value: "".concat(detailObj.processResult === 'Accept' ? translateLocaleText("t('vtxzgmodal.acceptRectification')") : detailObj.processResult === 'Reject' ? translateLocaleText("t('vtxzgmodal.rejectRectification')") : detailObj.processResult)
         }, {
-          label: '原因',
+          label: translateLocaleText("t('vtxzgmodal.reason')"),
           key: 'rejectReason',
           value: detailObj === null || detailObj === void 0 ? void 0 : detailObj.rejectReason
         }],
@@ -210,11 +227,11 @@ function getBaseShow(type, detailObj) {
     case 'Tjfk':
       return /*#__PURE__*/_jsx(VmInfoCollection, {
         data: [{
-          label: '反馈内容',
+          label: translateLocaleText("t('vtxzgmodal.feedbackContent')"),
           key: 'feedbackContent',
           value: detailObj === null || detailObj === void 0 ? void 0 : detailObj.feedbackContent
         }, {
-          label: '反馈附件',
+          label: translateLocaleText("t('vtxzgmodal.attachment')"),
           key: 'photos',
           value: detailObj === null || detailObj === void 0 ? void 0 : detailObj.photos,
           componentType: 'IMAGE'
@@ -227,11 +244,11 @@ function getBaseShow(type, detailObj) {
     case 'Yqsh':
       return /*#__PURE__*/_jsx(VmInfoCollection, {
         data: [{
-          label: '结果',
+          label: translateLocaleText("t('vtxzgmodal.result')"),
           key: 'processResult',
-          value: detailObj.processResult === 'Fail' ? '不通过' : '通过'
+          value: detailObj.processResult === 'Fail' ? translateLocaleText("t('vtxzgmodal.failed')") : translateLocaleText("t('vtxzgmodal.passed')")
         }, {
-          label: '审批意见',
+          label: translateLocaleText("t('vtxzgmodal.opinion')"),
           key: 'auditOpinion',
           value: detailObj === null || detailObj === void 0 ? void 0 : detailObj.auditOpinion
         }],
@@ -242,15 +259,15 @@ function getBaseShow(type, detailObj) {
     case 'Jgsh':
       return /*#__PURE__*/_jsx(VmInfoCollection, {
         data: [{
-          label: '结果',
+          label: translateLocaleText("t('vtxzgmodal.result')"),
           key: 'processResult',
-          value: detailObj.processResult === 'Fail' ? '不通过' : '通过'
+          value: detailObj.processResult === 'Fail' ? translateLocaleText("t('vtxzgmodal.failed')") : translateLocaleText("t('vtxzgmodal.passed')")
         }, {
-          label: '审批意见',
+          label: translateLocaleText("t('vtxzgmodal.opinion')"),
           key: 'auditOpinion',
           value: detailObj === null || detailObj === void 0 ? void 0 : detailObj.auditOpinion
         }, {
-          title: '附件',
+          title: translateLocaleText("t('vtxzgmodal.attachment2')"),
           key: 'photos',
           value: detailObj === null || detailObj === void 0 ? void 0 : detailObj.photos,
           componentType: 'IMAGE'
@@ -262,19 +279,19 @@ function getBaseShow(type, detailObj) {
     case 'Dzg':
       return /*#__PURE__*/_jsx(VmInfoCollection, {
         data: [{
-          label: '第三方单位',
+          label: translateLocaleText("t('vtxzgmodal.unit2')"),
           key: 'thirdResponsibleUnitName',
           value: detailObj === null || detailObj === void 0 ? void 0 : detailObj.thirdResponsibleUnitName
         }, {
-          label: '责任人',
+          label: translateLocaleText("t('vtxzgmodal.responsiblePerson')"),
           key: 'thirdResponsibleStaffNames',
           value: detailObj === null || detailObj === void 0 ? void 0 : detailObj.thirdResponsibleStaffNames
         }, {
-          label: '整改时限',
+          label: translateLocaleText("t('vtxzgmodal.hours3')"),
           key: 'reformTimeDay',
-          value: "".concat(detailObj.reformTimeDay || 0, "\u5929").concat(detailObj.reformTimeHour || 0, "\u5C0F\u65F6").concat(detailObj.reformTimeMin || 0, "\u5206")
+          value: "".concat(detailObj.reformTimeDay || 0).concat(translateLocaleText("t('common.dayUnit')")).concat(detailObj.reformTimeHour || 0).concat(translateLocaleText("t('vtxzgmodal.hourUnit')")).concat(detailObj.reformTimeMin || 0).concat(translateLocaleText("t('vtxzgmodal.minuteUnit')"))
         }, {
-          label: '截止时间',
+          label: translateLocaleText("t('vtxzgmodal.hours2')"),
           key: 'endDateTime',
           value: detailObj === null || detailObj === void 0 ? void 0 : detailObj.endDateTime
         }],

package/lib/vtx-zg-modal/components/BaseInfo/index.less

@@ -23,6 +23,7 @@
   &-process {
     display: flex;
     align-items: center;
+    min-width: 0;
 
     --order-bg: #ecf0f5;
     --order-active-bg: #1890ff;
@@ -42,7 +43,8 @@
       display: flex;
       align-items: center;
       gap: 8px;
-          white-space: nowrap;
+      min-width: 0;
+      white-space: nowrap;
       &-order {
         width: 32px;
         height: 32px;
@@ -64,6 +66,9 @@
         font-size: 16px;
         color: var(--title-color);
         line-height: 24px;
+        max-width: 104px;
+        overflow: hidden;
+        text-overflow: ellipsis;
         white-space: nowrap;
         &.active {
           color: var(--modal-title-color);
@@ -96,19 +101,46 @@
     color: var(--modal-title-color);
     &-head {
       display: flex;
+      gap: 12px;
       justify-content: space-between;
+      min-width: 0;
       &-title {
         display: flex;
         align-items: center;
         gap: 12px;
+        min-width: 0;
         color: var(--blue-color);
+
+        &-text {
+          min-width: 0;
+          overflow: hidden;
+          text-overflow: ellipsis;
+          white-space: nowrap;
+        }
+      }
+
+      &-time {
+        flex-shrink: 0;
+        overflow: hidden;
+        text-overflow: ellipsis;
+        white-space: nowrap;
       }
     }
     &-content {
       display: flex;
       justify-content: start;
       gap: 16px;
+      min-width: 0;
       padding: 8px 0 8px 8px;
+      &-main {
+        min-width: 0;
+      }
+      &-text {
+        max-width: 338px;
+        overflow: hidden;
+        text-overflow: ellipsis;
+        white-space: nowrap;
+      }
       &-bg {
         width: 338px;
         padding: 8px 12px;
@@ -124,3 +156,18 @@
     }
   }
 }
+
+.zg-base {
+  .info-line,
+  .info-label-b,
+  .value {
+    min-width: 0;
+  }
+
+  .info-label-b,
+  .value {
+    overflow: hidden;
+    text-overflow: ellipsis;
+    white-space: nowrap;
+  }
+}

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

@@ -5,6 +5,7 @@ function _toPrimitive(t, r) { if ("object" != _typeof(t) || !t) return t; var e
 import VtxBaseModal from "../vtx-base-modal";
 import { BaseInfo } from "./components";
 import "./style";
+import { translateLocaleText } from "./../hooks/useTranslation.js";
 import { jsx as _jsx, Fragment as _Fragment } from "react/jsx-runtime";
 var TABS_BASE = 'base';
 var VtxZgModal = function VtxZgModal(props) {
@@ -17,7 +18,7 @@ var VtxZgModal = function VtxZgModal(props) {
     tabChose = props.tabChose;
   var tabs = [{
     key: TABS_BASE,
-    title: '总览信息'
+    title: translateLocaleText("t('vtxdefaultmodal.overviewInformation')")
   }];
   var contents = _defineProperty({}, TABS_BASE, /*#__PURE__*/_jsx(BaseInfo, {
     id: id

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

@@ -7,6 +7,7 @@ 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 { translateLocaleText } from "./../hooks/useTranslation.js";
 // import Appraisal from '../vm-appraisal-info';
 import VmCustom from "../_components/vm-custom";
 import VmVideo from "../_components/vm-video";
@@ -43,7 +44,7 @@ var VtxDfModal = function VtxDfModal(props) {
     photos = _CommonService$useBas.photos;
   var tabs = [{
     key: TABS_BASE,
-    title: '总览信息'
+    title: translateLocaleText("t('vtxdefaultmodal.overviewInformation')")
   }, {
     key: TABS_METERING,
     title: '计量信息'

package/package.json

@@ -1,81 +1,92 @@
-{
-  "name": "@vtx/modals2",
-  "version": "5.0.58",
-  "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": {
-    "base-64": "^1.0.0",
-    "htmr": "^1.0.2",
-    "number-precision": "^1.6.0",
-    "react-tagcloud": "^2.3.3",
-    "proj4": "^2.20.8"
-  },
-  "devDependencies": {
-    "@ant-design/icons": "4.7.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": "^3.1.166",
-    "@vtx/ol-map": "^1.0.170",
-    "@vtx/player": "latest",
-    "@vtx/utils": "^1.0.20",
-    "@turf/turf": "^7.3.4",
-    "ol": "6.15.1",
-    "ahooks": "^3.1.5",
-    "antd": "^4.24.16",
-    "antd-dayjs-webpack-plugin": "^1.0.6",
-    "axios": "^0.21.1",
-    "babel-eslint": "^10.1.0",
-    "babel-plugin-import": "^1.13.8",
-    "dayjs": "^1.11.10",
-    "dumi": "^2.2.13",
-    "echarts": "^5.3.2",
-    "echarts-for-react": "3.0.2",
-    "echarts-liquidfill": "^3.1.0",
-    "eslint": "^8.23.0",
-    "father": "^4.1.0",
-    "husky": "^8.0.1",
-    "lint-staged": "^13.0.3",
-    "lodash": "^4.17.21",
-    "prettier": "^2.7.1",
-    "prettier-plugin-organize-imports": "^3.0.0",
-    "prettier-plugin-packagejson": "^2.2.18",
-    "qs": "^6.0.0",
-    "react": "^18.0.0",
-    "react-dom": "^18.0.0",
-    "stylelint": "^14.9.1"
-  },
-  "peerDependencies": {
-    "react": ">=16.9.0",
-    "react-dom": ">=16.9.0"
-  },
-  "publishConfig": {
-    "access": "public"
-  },
-  "authors": []
-}
+{
+  "name": "@vtx/modals2",
+  "version": "6.0.0-beta.0",
+  "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": []
+}