Merge branch 'master' of https://g.civnet.cn:8443/ReactWeb5/maintenance

package.json

@@ -95,7 +95,7 @@
         "@wisdom-cesium/cesium": "^1.0.78",
         "@wisdom-cesium/krpano": "^1.0.29-28",
         "@wisdom-map/amap": "1.1.0-beta.45",
-        "@wisdom-map/arcgismap": "1.4.0-124",
+        "@wisdom-map/arcgismap": "1.4.0-137",
         "@wisdom-map/basemap": "1.1.0-24",
         "ace-builds": "^1.4.12",
         "antd-img-crop": "^3.13.2",

src/pages/database/InitDataBase/InitDataBase.jsx

@@ -86,6 +86,7 @@ const InitDataBase = props => {
   const [keep, setKeep] = useState([]);
   const [flag, setFlag] = useState(0);
   const [keepData, setKeepData] = useState({});
+  const chooseDb = useRef({});
   const key = CryptoJS.enc.Utf8.parse('1p2a3n4d5a6o7m8s9a10n1e2t3c4o5re'); //十六位十六进制数作为密钥
   const iv = CryptoJS.enc.Utf8.parse('1234567890000000');
 
@@ -254,12 +255,13 @@ const InitDataBase = props => {
   const onFinish = values => {
     setCardLoading(true);
     const obj = values;
-
+    console.log(chooseDb.current, 'obj');
     saveConnectionNew({
       ip: obj.ip,
       dbName: obj.dbName,
       userName: obj.userName,
       password: Encrypt(obj.password),
+      desc: chooseDb.current.desc,
     })
       .then(resnew => {
         setCardLoading(false);
@@ -361,6 +363,7 @@ const InitDataBase = props => {
     Object.keys(obj).forEach(k => {
       obj[k] = item[k];
     });
+    chooseDb.current = item;
     form.setFieldsValue({ ...obj, password: Decrypt(obj.password) });
   };
   // 产品方案选择框回调

src/pages/platformCenter/gis/schemeConfig/ScopeMap/index.jsx

+/* eslint-disable react/jsx-boolean-value */
 /* eslint-disable no-unused-expressions */
 /* eslint-disable no-case-declarations */
 /* eslint-disable import/no-duplicates */
@@ -1234,6 +1235,7 @@ const Map = props => {
         {canLoadMap && (
           <ArcGISSceneMap
             ref={mapRef}
+            filterMap={true}
             getMapInfo={e => getMapInfo(e)}
             widgets={widgets}
             config={firstList}