Commit 0d23e131 authored by 田翔's avatar 田翔

fix: 绘制区域颜色高亮

parent 8b70e2ac
{ {
"name": "panda-xform", "name": "panda-xform",
"version": "6.8.8", "version": "6.8.9",
"description": "6.8.8 修复区域任务控件图片预览与关联表单隐藏值不清空问题", "description": "6.8.9 绘制区域颜色高亮",
"keywords": [ "keywords": [
"panda-xform" "panda-xform"
], ],
......
...@@ -2458,6 +2458,7 @@ const mapWidgets = [ ...@@ -2458,6 +2458,7 @@ const mapWidgets = [
default: [], default: [],
widget: 'TaskFieldList', widget: 'TaskFieldList',
description: '用于区域控件列表显示', description: '用于区域控件列表显示',
dependencies: ['areaTaskShine']
}, },
taskSummary: { taskSummary: {
title: '任务摘要', title: '任务摘要',
...@@ -2466,6 +2467,7 @@ const mapWidgets = [ ...@@ -2466,6 +2467,7 @@ const mapWidgets = [
default: [], default: [],
widget: 'TaskFieldList', widget: 'TaskFieldList',
description: '用于任务对象显示', description: '用于任务对象显示',
dependencies: ['areaTaskShine']
}, },
required: { required: {
title: '必填', title: '必填',
......
...@@ -147,11 +147,11 @@ const AreaTask = (props) => { ...@@ -147,11 +147,11 @@ const AreaTask = (props) => {
let layer = new Graphic({ let layer = new Graphic({
geometry: geometry, geometry: geometry,
symbol: new SimpleFillSymbol({ symbol: new SimpleFillSymbol({
// color: [83, 164, 253, 0.5], color: [83, 164, 253, 0.5],
// outline: { outline: {
// color: [255, 255, 255, 1], color: [83, 164, 253, 1],
// width: 2, width: 2,
// }, },
}), }),
}) })
viewRef.current.goTo({ target: geometry, zoom: viewRef.current.zoom > 20 ? 20 : viewRef.current.zoom > 15 ? viewRef.current.zoom : 15 }, { duration: 500 }) viewRef.current.goTo({ target: geometry, zoom: viewRef.current.zoom > 20 ? 20 : viewRef.current.zoom > 15 ? viewRef.current.zoom : 15 }, { duration: 500 })
...@@ -211,7 +211,11 @@ const AreaTask = (props) => { ...@@ -211,7 +211,11 @@ const AreaTask = (props) => {
let layer = new Graphic({ let layer = new Graphic({
geometry: geometry, geometry: geometry,
symbol: new SimpleFillSymbol({ symbol: new SimpleFillSymbol({
color: [83, 164, 253, 0.5],
outline: {
color: [83, 164, 253, 1],
width: 2,
},
}), }),
}) })
let graphicsLayer = view.map.layers.find((lyr) => lyr.id == 'newDrawLayer') let graphicsLayer = view.map.layers.find((lyr) => lyr.id == 'newDrawLayer')
......
...@@ -51,6 +51,7 @@ const AreaTaskShine = (props) => { ...@@ -51,6 +51,7 @@ const AreaTaskShine = (props) => {
// if (!toField.some(v => v.name === '反馈状态')) { // if (!toField.some(v => v.name === '反馈状态')) {
// return message.error(`【${accountName}】台账不存在反馈状态字段`) // return message.error(`【${accountName}】台账不存在反馈状态字段`)
// } // }
addons.setValue('tableName', tableName)
addons.setValue('accountName', accountName) addons.setValue('accountName', accountName)
addons.setValue('service', service) addons.setValue('service', service)
addons.setValue('layerName', layerName) addons.setValue('layerName', layerName)
...@@ -132,7 +133,8 @@ const AreaTaskShine = (props) => { ...@@ -132,7 +133,8 @@ const AreaTaskShine = (props) => {
const taskNameChange = (value) => { const taskNameChange = (value) => {
let item = taskList.find(v => v.Name === value) let item = taskList.find(v => v.Name === value)
if (item) { if (item) {
form.setFieldsValue({ accountName: item.FeedbackAccountName, tableName: item.FeedbackTableName, service: item.MapServerName, layerName: item?.LayerName.split(',') || [] }) setTableName(item.FeedbackTableName)
form.setFieldsValue({ accountName: item.FeedbackAccountName, service: item.MapServerName, layerName: item?.LayerName.split(',') || [] })
} }
} }
...@@ -179,7 +181,7 @@ const AreaTaskShine = (props) => { ...@@ -179,7 +181,7 @@ const AreaTaskShine = (props) => {
footer={ footer={
<div> <div>
<Button onClick={() => setVisible(false)}>取消</Button> <Button onClick={() => setVisible(false)}>取消</Button>
<Button onClick={() => clear()}>清空</Button> {/* <Button onClick={() => clear()}>清空</Button> */}
<Button type="primary" onClick={() => onOk()}>确定</Button> <Button type="primary" onClick={() => onOk()}>确定</Button>
</div> </div>
} }
...@@ -203,14 +205,14 @@ const AreaTaskShine = (props) => { ...@@ -203,14 +205,14 @@ const AreaTaskShine = (props) => {
disabled disabled
showSearch showSearch
options={accountList.map(v => ({ label: v.name, value: v.name }))} options={accountList.map(v => ({ label: v.name, value: v.name }))}
onChange={(value) => { // onChange={(value) => {
let tableName = accountList.find(v => v.name === value)?.tableName // let tableName = accountList.find(v => v.name === value)?.tableName
if (tableName) { // if (tableName) {
addons.setValue('tableName', tableName) // addons.setValue('tableName', tableName)
setTableName(tableName) // setTableName(tableName)
} // }
setAccountName(value) // setAccountName(value)
}} // }}
/> />
</Form.Item> </Form.Item>
<Form.Item label='方案名称' name='service' rules={[{ required: true, message: '方案名称必填', },]}> <Form.Item label='方案名称' name='service' rules={[{ required: true, message: '方案名称必填', },]}>
......
...@@ -37,6 +37,7 @@ const TaskFieldList = (props) => { ...@@ -37,6 +37,7 @@ const TaskFieldList = (props) => {
} }
const inputClick = () => { const inputClick = () => {
console.log(service, layerName, tableName)
if (!service || !layerName || !tableName) { if (!service || !layerName || !tableName) {
return message.error('请配置字段映射中的配置') return message.error('请配置字段映射中的配置')
} }
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment