feats

src/components/map/index.jsx

@@ -6,34 +6,41 @@ import { getLocation } from '@/utils/authorize';
 import iconPath from '@/assets/icons/marker.png';
 import style from './style.module.less';
 
+/**
+ * 这里使用2个map, 每个 map 负责不同的场景
+ * 如果使用 1 个map, 通过属性去控制, 微信暂时有 bug 比如 showLocation 就有bug
+ */
 export default (props) => {
   const { readOnly, location, onChange } = props;
 
+  console.log('-----map---readOnly---', readOnly);
+
   const id = React.useMemo(() => `map-${Math.random().toString(36).substring(2, 10)}`, []);
+  const idReadOnly = React.useMemo(() => `map-${Math.random().toString(36).substring(2, 10)}`, []);
   const mapCtxRef = React.useRef();
 
   const [
-    // markers,
+    markers,
     center,
   ] = React.useMemo(() => {
     // eslint-disable-next-line no-undef
     const loc = location || DEFAULT_POS;
     const [longitude, latitude] = loc.split(',');
-
-    // const mks = [{
-    //   id: 1,
-    //   longitude,
-    //   latitude,
-    //   iconPath,
-    //   width: 17,
-    //   height: 20
-    // }];
+    
+    const mks = readOnly ? [{
+      id: 1,
+      longitude,
+      latitude,
+      iconPath,
+      width: 17,
+      height: 20
+    }] : [];
 
     return [
-      // mks,
+      mks,
       { longitude, latitude }
     ]
-  }, [location]);
+  }, [location, readOnly]);
 
   const moveTo = (ctx, point) => {
     ctx.moveToLocation({
@@ -86,30 +93,41 @@ export default (props) => {
 
   React.useEffect(() => {
     if (!readOnly) {
+      getContext();
+
+      // 获取定位
       fixedLocation().then((res) => {
         const { longitude, latitude } = res;
         onChange([longitude, latitude].join(','));
       })
     }
-  }, [readOnly]);
-
-  React.useEffect(() => {
-    getContext();
-  }, [getContext]);
+  // eslint-disable-next-line react-hooks/exhaustive-deps
+  }, [readOnly, getContext]);
 
   return (
     <View className={style['map-wrapper']}>
-      <Map
-        id={id}
-        showLocation
-        longitude={center.longitude}
-        latitude={center.latitude}
-      // markers={markers}
-      >
-        {!readOnly && (
-          <Icon name="aim" size="24px" onClick={onRefresh} color="#1A7565" className={style['icon']} />
-        )}
-      </Map>
+      {
+        !readOnly && (
+          <Map
+            id={id}
+            showLocation
+            longitude={center.longitude}
+            latitude={center.latitude}
+          >
+            <Icon name="aim" size="24px" onClick={onRefresh} color="#1A7565" className={style['icon']} />
+          </Map>
+        )
+      }
+      {
+        readOnly && (
+          <Map
+            id={idReadOnly}
+            longitude={center.longitude}
+            latitude={center.latitude}
+            markers={markers}
+          />
+        )
+      }
     </View >
   )
 }

src/pages/issue/components/Issue/index.jsx

@@ -144,8 +144,9 @@ export default (props) => {
         onChange={onDateChange}
       />
 
+      {/* 地图只在新增的时候允许修改 */}
       <Map
-        readOnly={readOnly}
+        readOnly={issue?.issueId}
         location={formData.location}
         onChange={e => !formData.location && setFieldChange('location', e)}
       />