@vtx/modals2 5.0.6 → 5.0.8

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

@@ -0,0 +1,4 @@
+import Appraise from "./Appraise";
+import Base from "./Base";
+import Score from "./Score";
+export { Appraise, Base, Score };

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

@@ -0,0 +1,40 @@
+function _typeof(o) { "@babel/helpers - typeof"; return _typeof = "function" == typeof Symbol && "symbol" == typeof Symbol.iterator ? function (o) { return typeof o; } : function (o) { return o && "function" == typeof Symbol && o.constructor === Symbol && o !== Symbol.prototype ? "symbol" : typeof o; }, _typeof(o); }
+function ownKeys(e, r) { var t = Object.keys(e); if (Object.getOwnPropertySymbols) { var o = Object.getOwnPropertySymbols(e); r && (o = o.filter(function (r) { return Object.getOwnPropertyDescriptor(e, r).enumerable; })), t.push.apply(t, o); } return t; }
+function _objectSpread(e) { for (var r = 1; r < arguments.length; r++) { var t = null != arguments[r] ? arguments[r] : {}; r % 2 ? ownKeys(Object(t), !0).forEach(function (r) { _defineProperty(e, r, t[r]); }) : Object.getOwnPropertyDescriptors ? Object.defineProperties(e, Object.getOwnPropertyDescriptors(t)) : ownKeys(Object(t)).forEach(function (r) { Object.defineProperty(e, r, Object.getOwnPropertyDescriptor(t, r)); }); } return e; }
+function _defineProperty(obj, key, value) { key = _toPropertyKey(key); if (key in obj) { Object.defineProperty(obj, key, { value: value, enumerable: true, configurable: true, writable: true }); } else { obj[key] = value; } return obj; }
+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 VtxBaseModal from "../vtx-base-modal";
+import { Appraise, Base, Score } from "./components";
+import { jsx as _jsx, Fragment as _Fragment } from "react/jsx-runtime";
+export default (function (props) {
+  var visible = props.visible,
+    theme = props.theme,
+    title = props.title,
+    id = props.id,
+    onCancel = props.onCancel;
+  var tabList = [{
+    key: 'wr-base',
+    title: '总览信息'
+  }, {
+    key: 'wr-appraise',
+    title: '评价分析'
+  }, {
+    key: 'wr-score',
+    title: '公厕得分'
+  }];
+  var contentList = _defineProperty(_defineProperty(_defineProperty({}, 'wr-base', /*#__PURE__*/_jsx(Base, _objectSpread({}, props))), 'wr-appraise', /*#__PURE__*/_jsx(Appraise, _objectSpread({}, props))), 'wr-score', /*#__PURE__*/_jsx(Score, _objectSpread({}, props)));
+  return /*#__PURE__*/_jsx(_Fragment, {
+    children: visible && /*#__PURE__*/_jsx(VtxBaseModal, {
+      type: "wr",
+      visible: visible,
+      theme: theme,
+      title: title,
+      id: id,
+      onCancel: onCancel,
+      tabs: tabList,
+      contents: contentList,
+      tabChose: "wr-score"
+    })
+  });
+});

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

@@ -0,0 +1,4 @@
+import "../components/Appraise/index.less";
+import "../components/Base/index.less";
+import "../components/Score/index.less";
+import "./index.less";

package/lib/vtx-wr-modal/style/index.less

@@ -0,0 +1 @@
+

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

@@ -3,7 +3,7 @@ import { request } from '@vtx/utils';
 import { useRequest } from 'ahooks';
 var BaseService = {
   useBaseDetail: function useBaseDetail(id) {
-    var _info$geometryInfo, _info$geometryInfo2, _lngLats$split, _lngLats$split2, _info$geometryInfo3;
+    var _info$geometryInfo, _info$geometryInfo2, _lngLats$split, _lngLats$split2, _lngLats$split3, _info$geometryInfo3;
     var _useRequest = useRequest(function () {
         return request.get('/cloud/zykh-reborn/orderTask/get', {
           data: {
@@ -71,22 +71,30 @@ var BaseService = {
       value: info === null || info === void 0 ? void 0 : info.address,
       width: '100%'
     }];
-    var lngLats = info === null || info === void 0 || (_info$geometryInfo = info.geometryInfo) === null || _info$geometryInfo === void 0 ? void 0 : _info$geometryInfo.lngLats;
+    var type = info === null || info === void 0 || (_info$geometryInfo = info.geometryInfo) === null || _info$geometryInfo === void 0 ? void 0 : _info$geometryInfo.type;
+    var lngLats = info === null || info === void 0 || (_info$geometryInfo2 = info.geometryInfo) === null || _info$geometryInfo2 === void 0 ? void 0 : _info$geometryInfo2.lngLats;
+    var center = type === 'point' ? lngLats === null || lngLats === void 0 ? void 0 : lngLats.split(',') : lngLats === null || lngLats === void 0 || (_lngLats$split = lngLats.split(';')) === null || _lngLats$split === void 0 ? void 0 : _lngLats$split[0].split(',');
     return {
       info: info,
       baseInfo: baseInfo,
-      lngLats: (info === null || info === void 0 || (_info$geometryInfo2 = info.geometryInfo) === null || _info$geometryInfo2 === void 0 ? void 0 : _info$geometryInfo2.lngLats) || '',
+      center: center,
       loading: loading,
-      mapPoints: [{
-        lng: lngLats === null || lngLats === void 0 || (_lngLats$split = lngLats.split(',')) === null || _lngLats$split === void 0 ? void 0 : _lngLats$split[0],
-        lat: lngLats === null || lngLats === void 0 || (_lngLats$split2 = lngLats.split(',')) === null || _lngLats$split2 === void 0 ? void 0 : _lngLats$split2[1],
+      geometryType: type,
+      mapPoints: type === 'point' ? [{
+        lng: lngLats === null || lngLats === void 0 || (_lngLats$split2 = lngLats.split(',')) === null || _lngLats$split2 === void 0 ? void 0 : _lngLats$split2[0],
+        lat: lngLats === null || lngLats === void 0 || (_lngLats$split3 = lngLats.split(',')) === null || _lngLats$split3 === void 0 ? void 0 : _lngLats$split3[1],
         icon: 'GD',
         type: info === null || info === void 0 || (_info$geometryInfo3 = info.geometryInfo) === null || _info$geometryInfo3 === void 0 ? void 0 : _info$geometryInfo3.type,
         url: new MapIcon.CommonIcon({
           canvasIcon: 'GD',
           color: '#119FFB'
         }).getImgUrl()
-      }]
+      }] : [],
+      mapPolygons: type !== 'point' ? [{
+        id: info === null || info === void 0 ? void 0 : info.id,
+        rings: lngLats,
+        type: type
+      }] : []
     };
   },
   useGetRecord: function useGetRecord(orderTaskNo) {

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

@@ -12,8 +12,9 @@ var BaseInfo = function BaseInfo(props) {
   var _BaseService$useBaseD = BaseService.useBaseDetail(id, 'wgs84'),
     info = _BaseService$useBaseD.info,
     baseInfo = _BaseService$useBaseD.baseInfo,
-    lngLats = _BaseService$useBaseD.lngLats,
+    center = _BaseService$useBaseD.center,
     mapPoints = _BaseService$useBaseD.mapPoints,
+    geometryType = _BaseService$useBaseD.geometryType,
     loading = _BaseService$useBaseD.loading;
   var records = BaseService.useGetRecord(info === null || info === void 0 ? void 0 : info.orderNo);
   var getStep = function getStep() {
@@ -54,9 +55,10 @@ var BaseInfo = function BaseInfo(props) {
         }), /*#__PURE__*/_jsx("div", {
           className: "zg-base-map",
           children: /*#__PURE__*/_jsx(VmMap, {
-            mapCenter: lngLats ? lngLats.split(',') : mapCenter,
+            mapCenter: center || mapCenter,
             newMapPoints: mapPoints,
-            address: info === null || info === void 0 ? void 0 : info.address
+            address: info === null || info === void 0 ? void 0 : info.address,
+            geometryType: geometryType
           })
         })]
       })

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

@@ -42,6 +42,7 @@
       display: flex;
       align-items: center;
       gap: 8px;
+          white-space: nowrap;
       &-order {
         width: 32px;
         height: 32px;
@@ -63,6 +64,7 @@
         font-size: 16px;
         color: var(--title-color);
         line-height: 24px;
+        white-space: nowrap;
         &.active {
           color: var(--modal-title-color);
         }

package/package.json

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