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

.env

 # PUBLIC_PATH = reactOMS, 默认转发 /cityinterface
-PROXY=/PandaGIS:http://192.168.12.178:8083;/PandaView:http://192.168.12.178:8083;/PandaMonitor:http://192.168.12.178:8083;/PandaWorkFlow:http://192.168.12.178:8083;/PandaCore:http://192.168.12.178:8083;/Cityinterface:http://192.168.12.178:8083;/PandaOMS:http://192.168.12.178:8083;/Publish:http://192.168.12.178:8083;/Web4:http://192.168.12.178:8083;/CityTemp:http://192.168.12.178:8083
-#  PROXY=/Cityinterface:http://192.168.12.121:8082;/PandaOMS:http://192.168.12.121:8082;/Web4:http://192.168.12.121:8082;/CityTemp:http://192.168.12.121:8082
+PROXY=/PandaGIS:http://192.168.12.3:8082;/PandaView:http://192.168.12.3:8082;/civbase:http://192.168.12.3:8082;/PandaMonitor:http://192.168.12.3:8082;/PandaWorkFlow:http://192.168.12.3:8082;/PandaCore:http://192.168.12.3:8082;/Cityinterface:http://192.168.12.3:8082;/PandaOMS:http://192.168.12.3:8082;/Publish:http://192.168.12.3:8082;/Web4:http://192.168.12.3:8082;/CityTemp:http://192.168.12.3:8082
+#  PROXY=/Cityinterface:http://192.168.12.3:8082;/PandaOMS:http://192.168.12.3:8082;/Web4:http://192.168.12.3:8082;/CityTemp:http://192.168.12.3:8082
 # 可设置第二个代理，test为转发前缀，后面为代理转发的地址
 # PROXY2 = test : http://localhost:8006/
 
 # 本地应用启动的host域名
-HOST = 192.168.12.78
+HOST = 192.168.12.80
 
 # 本地应用启动的端口
-PORT = 3002
+PORT = 3001
 

package.json

@@ -94,11 +94,11 @@
         "@wangeditor/editor-for-react": "^1.0.6",
         "@wisdom-cesium/cesium": "1.1.12",
         "@wisdom-cesium/krpano": "^1.0.29-60",
-        "@wisdom-utils/components": "0.1.337",
-        "@wisdom-utils/utils": "0.1.377",
         "@wisdom-map/amap": "1.4.0",
-        "@wisdom-map/arcgismap": "1.4.0-261",
+        "@wisdom-map/arcgismap": "1.4.0-262",
         "@wisdom-map/basemap": "1.1.0-41",
+        "@wisdom-utils/components": "0.1.337",
+        "@wisdom-utils/utils": "0.1.377",
         "ace-builds": "^1.4.12",
         "antd-img-crop": "^3.13.2",
         "array-move": "^4.0.0",
@@ -127,7 +127,7 @@
         "js-calendar-converter": "0.0.4",
         "lodash": "4.17.11",
         "minimist": "1.2.0",
-        "panda-xform": "5.9.26",
+        "panda-xform": "5.9.28",
         "parseForm": "^2.3.8",
         "prop-types": "15.7.2",
         "qrcode.react": "^3.1.0",

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

@@ -1038,6 +1038,32 @@ const Map = props => {
                 <Radio value={1}>手绘区域</Radio>
               </Radio.Group>
             </Form.Item>
+              {radio1 === 0 && (
+              <>
+                <Form.Item label="手绘区域" name="customPointExtent">
+                      <Tag
+                        style={{
+                          width: '100px',
+                          height: '27px',
+                          paddingLeft: '25px',
+                          paddingTop: '0px',
+                          marginTop: '4px',
+                          display: 'flex',
+                          alignItems: 'center',
+                        }}
+                        color="processing"
+                        onClick={() => {
+                          form.setFieldsValue({ customFlag: 1 });
+                          setRadio1(1)
+                          setButState(true);
+                          setResultData(null);
+                        }}
+                      >
+                        开始绘制
+                      </Tag> 
+               </Form.Item>
+              </>
+            )}
             {radio1 === 1 && (
               <>
                 <Form.Item label="手绘区域" name="customPointExtent">
@@ -1102,7 +1128,6 @@ const Map = props => {
                 </Form.Item>
               </>
             )}
-
             <Form.Item label="遮罩颜色" name="backgroundColor" style={{ marginBottom: '19px' }}>
               <div className={styles.colorContent}>
                 {colorArr.map(item => (
@@ -1300,8 +1325,8 @@ const Map = props => {
             <EditAndDrawPanel
               view={mapInfo.current}
               editType={['POLYGON', 'EXTENT', 'CIRCLE']}
-              defaultGraphic={resultData}
-              areaName={
+              defaultGraphic={resultData || 'edgelayer-arcgismap'}
+              areaName = {
                 form.getFieldsValue().areaName &&
                 form.getFieldsValue().areaName[form.getFieldsValue().areaName.length - 1]
               }