Skip to content

W
WebPublic
提交 118fa6c0 authored 作者: 钟是志's avatar 钟是志
浏览文件
操作

定位组件修改

上级 f977297f
显示空白字符变更
内嵌 并排
正在显示 包含 64 行增加 和 120 行删除
one_stop_public/location/index.jsx
浏览文件 @ 118fa6c0
......@@ -27,7 +27,7 @@ export default class location extends Component {
componentDidMount = () => {};
//在组件从 DOM 中移除的时候立刻被调用。
componentWillUnmount = () => {};
getLocationMsg = (locationMsg) => {
getLocationMsg = locationMsg => {
console.log(locationMsg);
//如果不为空的话显示提示
this.setState({ loading: true }, () => {
......@@ -75,7 +75,7 @@ export default class location extends Component {
}
};
// 点击确定提交定位
confirm = (e) => {
confirm = e => {
console.log(e);
if (this.state.btn) {
if (this.props.get === 'web') {
......@@ -107,36 +107,20 @@ export default class location extends Component {
title={btn ? '正在定位中' : locationMsg.address}
onConfirm={this.confirm}
okText="提交"
cancelText="取消">
cancelText="取消"
>
<Button
disabled={btn}
style={{ margin: 'auto', width: this.props.width }}
loading={this.state.loading}
className={styles.btn}
type="primary">
type="primary"
>
{this.props.btnName}
</Button>
</Popconfirm>
</div>
</div>
);
// return (
// <div style={{ paddingBottom: 49, paddingTop: 44 }}>
// <Nav name="签到" link/>
// <div id="EditAddress" className={styles.EditAddress}>
// <Location getLocationMsg={this.getLocationMsg.bind(this)}/>
// <Button onClick={this.submitLocation} className={styles.btn} type='primary'>签到</Button>
// <div style={this.state.style} className={styles.div}>
// <p><i>经纬度：</i><span>{this.state.locationMsg.lng},{this.state.locationMsg.lat}</span></p>
// <p><i>详细地址:</i><span>{this.state.locationMsg.address}</span></p>
// <p><i>最近的路口:</i><span>{this.state.locationMsg.nearestJunction}</span></p>
// <p><i>最近的路:</i><span>{this.state.locationMsg.nearestRoad}</span></p>
// <p><i>最近的POI:</i><span>{this.state.locationMsg.nearestPOI}</span></p>
// <Button onClick={this.submitLocation} className={styles.btn} type='primary'>签到</Button>
// </div>
// </div>
// </div>
// )
}
}
one_stop_public/tableCompon/index.jsx
浏览文件 @ 118fa6c0
......@@ -81,12 +81,7 @@ const giveRender = (column = {}) => {
return column;
};
@connect(({
DataColumn,
SqlManageEntity,
formList,
loading,
}) => ({
@connect(({ DataColumn, SqlManageEntity, formList, loading }) => ({
DataColumn,
SqlManageEntity,
formList,
......@@ -191,12 +186,7 @@ export default class tableCom extends Component {
};
getColumnSearchProps = (dataIndex, title) => ({
filterDropdown: ({
setSelectedKeys,
selectedKeys,
confirm,
clearFilters,
}) => (
filterDropdown: ({ setSelectedKeys, selectedKeys, confirm, clearFilters }) => (
<div style={{ padding: 8 }}>
<Input
ref={node => {
......@@ -213,11 +203,11 @@ export default class tableCom extends Component {
}}
/>
<Button
type='primary'
type="primary"
onClick={() => this.handleSearch(selectedKeys, confirm)}
icon='search'
icon="search"
loading={this.props.loading}
size='small'
size="small"
style={{
width: 90,
marginRight: 8,
......@@ -228,14 +218,14 @@ export default class tableCom extends Component {
<Button
loading={this.props.loading}
onClick={() => this.handleReset(clearFilters)}
size='small'
size="small"
style={{ width: 90 }}
>
重置
</Button>
</div>
),
filterIcon: filtered => <Icon type='search' style={{ color: filtered ? '#1890ff' : 'red' }} />,
filterIcon: filtered => <Icon type="search" style={{ color: filtered ? '#1890ff' : 'red' }} />,
onFilter: (value, record) =>
record[dataIndex]
? record[dataIndex]
......@@ -283,11 +273,7 @@ export default class tableCom extends Component {
};
componentWillReceiveProps(props) {
const {
json,
mapData,
obj,
} = props;
const { json, mapData, obj } = props;
if (json == null || this.props.safe) {
return;
}
......@@ -405,10 +391,7 @@ export default class tableCom extends Component {
allValues = JSON.stringify(allValues);
if (json.comName === 'TableSelect') {
const { dispatch } = this.props;
const {
sqlKey,
optionType,
} = json;
const { sqlKey, optionType } = json;
if (optionType === 'sql') {
dispatch({
type: 'SqlManageEntity/find',
......@@ -430,8 +413,7 @@ export default class tableCom extends Component {
if (
['DATE', 'DATETIME', 'TIME', 'TIMESTAMP', 'YEAR'].includes(datas[i].type)
) {
column.render = val => moment(val)
.format('YYYY-MM-DD HH:mm:ss');
column.render = val => moment(val).format('YYYY-MM-DD HH:mm:ss');
}
column = giveRender(column);
......@@ -468,8 +450,7 @@ export default class tableCom extends Component {
break;
}
column.render = val => moment(parseInt(val))
.format(ff);
column.render = val => moment(parseInt(val)).format(ff);
}
if (cll[k].isQuery) {
column = {
......@@ -516,8 +497,7 @@ export default class tableCom extends Component {
column.title = datas[i].title;
column.dataIndex = datas[i].name;
if (['DATE', 'DATETIME', 'TIME', 'TIMESTAMP', 'YEAR'].includes(datas[i].type)) {
column.render = val => moment(val)
.format('YYYY-MM-DD HH:mm:ss');
column.render = val => moment(val).format('YYYY-MM-DD HH:mm:ss');
}
column = giveRender(column);
columns.push(column);
......@@ -784,8 +764,7 @@ export default class tableCom extends Component {
data: requestParams,
method: method,
requestType: 'form',
})
.then(data => {
}).then(data => {
// if (!data || !Array.isArray(data)) {
// data = [];
// }
......@@ -976,8 +955,7 @@ export default class tableCom extends Component {
if (getToken() != null) {
pp.token = getToken();
}
uaaRequest(url, pp)
.then(data => {
uaaRequest(url, pp).then(data => {
const { sqlKeys } = this.state;
sqlKeys[sqlKey].data = data;
this.setState({ sqlKeys });
......@@ -1180,12 +1158,7 @@ export default class tableCom extends Component {
};
componentDidMount() {
const {
json,
mapData,
obj,
init,
} = this.props;
const { json, mapData, obj, init } = this.props;
if (json == null) {
return;
}
......@@ -1433,10 +1406,7 @@ export default class tableCom extends Component {
}
};
getColumn = key => {
let {
mapData,
json,
} = this.props;
let { mapData, json } = this.props;
const columnIds = json.columnIds;
......@@ -1479,20 +1449,8 @@ export default class tableCom extends Component {
getCellValue,
} = this.props;
// console.log(this.props.datas);
const {
options,
labels,
selectDis,
modalCode,
modalTitle,
modalInit,
modalProps,
} = this.state;
const {
getFieldDecorator,
getFieldError,
getFieldProps,
} = this.props.form;
const { options, labels, selectDis, modalCode, modalTitle, modalInit, modalProps } = this.state;
const { getFieldDecorator, getFieldError, getFieldProps } = this.props.form;
const disabled = json != null ? json.disabled : false;
const permRank = json != null ? (json.permRank != null ? json.permRank : 0) : 0;
if (json?.label === '账号') {
......@@ -1546,7 +1504,7 @@ export default class tableCom extends Component {
<>
{this.props.form.getFieldDecorator(this.props.uuid, {
initialValue: fk,
})(<Input type='hidden' />)}{' '}
})(<Input type="hidden" />)}{' '}
<ZdyTable
taskId={this.props.taskId}
importExcel={this.props.importExcel}
......@@ -1622,7 +1580,7 @@ export default class tableCom extends Component {
<>
{this.props.form.getFieldDecorator(uid, {
initialValue: obj[this.props.uuid] || json.initialValue,
})(<Input type='hidden' />)}
})(<Input type="hidden" />)}
<span
style={{
fontWeight: get === 'mobile' ? 'bold' : '',
......@@ -1639,7 +1597,7 @@ export default class tableCom extends Component {
<>
{this.props.form.getFieldDecorator(uid, {
initialValue: this.props.form.getFieldsValue()[uid] || json.initialValue,
})(<Input type='hidden' />)}
})(<Input type="hidden" />)}
<span
style={{
fontWeight: get === 'mobile' ? 'bold' : '',
......@@ -1732,8 +1690,7 @@ export default class tableCom extends Component {
case 'DatePicker':
cm = value ? (
<span>
{moment(parseInt(value))
.format('YYYY-MM-DD HH:mm:ss')}
{moment(parseInt(value)).format('YYYY-MM-DD HH:mm:ss')}
{get === 'mobile' ? <br /> : ''}
</span>
) : (
......@@ -1749,7 +1706,7 @@ export default class tableCom extends Component {
{filesX.map((f, index2) => {
return (
<li key={index2}>
<a target='_blank' key={f.path} href={queryApiActionPath() + f.path}>
<a target="_blank" key={f.path} href={queryApiActionPath() + f.path}>
{f.name}
</a>
</li>
......@@ -1769,7 +1726,7 @@ export default class tableCom extends Component {
{files.map((f, index2) => {
return (
<li key={index2}>
<a target='_blank' key={f.path} href={queryApiActionPath() + f.path}>
<a target="_blank" key={f.path} href={queryApiActionPath() + f.path}>
{f.name}
</a>
</li>
......@@ -1862,7 +1819,7 @@ export default class tableCom extends Component {
</MobileItem>
{this.props.form.getFieldDecorator(`defaultValues.${formKey}.${key}`, {
initialValue: value,
})(<Input type='hidden' />)}
})(<Input type="hidden" />)}
</>
);
}
......@@ -1875,7 +1832,7 @@ export default class tableCom extends Component {
{cm}
{this.props.form.getFieldDecorator(`defaultValues.${formKey}.${key}`, {
initialValue: value,
})(<Input type='hidden' />)}
})(<Input type="hidden" />)}
</>
);
}
......@@ -1969,7 +1926,7 @@ export default class tableCom extends Component {
</Form.Item>
{this.props.form.getFieldDecorator(`defaultValues.${formKey}.${key}`, {
initialValue: value,
})(<Input type='hidden' />)}
})(<Input type="hidden" />)}
</>
);
}
......@@ -1982,7 +1939,7 @@ export default class tableCom extends Component {
{cm}
{this.props.form.getFieldDecorator(`defaultValues.${formKey}.${key}`, {
initialValue: value,
})(<Input type='hidden' />)}
})(<Input type="hidden" />)}
</>
);
}
......@@ -2166,7 +2123,7 @@ export default class tableCom extends Component {
<Table
get={get}
columns={this.state.columns}
size='small'
size="small"
dataSource={ds}
pagination={false}
/>
......@@ -2199,13 +2156,11 @@ export default class tableCom extends Component {
} else {
cm = (
<span>
{moment(parseInt(obj[begin.base52]))
.format(
{moment(parseInt(obj[begin.base52])).format(
json.format ? json.format : 'YYYY-MM-DD HH:mm:ss',
)}{' '}
至{' '}
{moment(parseInt(obj[end.base52]))
.format(
{moment(parseInt(obj[end.base52])).format(
json.format ? json.format : 'YYYY-MM-DD HH:mm:ss',
)}
</span>
......@@ -2220,8 +2175,7 @@ export default class tableCom extends Component {
if (obj[dataColumn.base52] && obj[dataColumn.base52].indexOf('-') === -1) {
cm = (
<span>
{moment(parseInt(obj[dataColumn.base52]))
.format(
{moment(parseInt(obj[dataColumn.base52])).format(
json.format ? json.format : 'YYYY-MM-DD HH:mm:ss',
)}
</span>
......@@ -2230,8 +2184,7 @@ export default class tableCom extends Component {
cm = (
<span>
{obj[dataColumn.base52]
? moment(+new Date(obj[dataColumn.base52]))
.format(
? moment(+new Date(obj[dataColumn.base52])).format(
json.format ? json.format : 'YYYY-MM-DD HH:mm:ss',
)
: ''}
......@@ -2339,7 +2292,7 @@ export default class tableCom extends Component {
}
return (
<li key={index2}>
<a target='_blank' key={f.path} href={queryApiActionPath() + f.path}>
<a target="_blank" key={f.path} href={queryApiActionPath() + f.path}>
{f.name}
</a>
</li>
......@@ -2376,7 +2329,7 @@ export default class tableCom extends Component {
return (
<li key={index2}>
<a
target='_blank'
target="_blank"
key={f.filePath}
href={queryApiActionPath() + f.filePath}
>
......@@ -2536,12 +2489,24 @@ export default class tableCom extends Component {
if (json.isLink) {
cm = <a {...ev} />;
} else {
cm = <Button loading={this.props.loading} type='primary' {...ev} />;
cm = <Button loading={this.props.loading} type="primary" {...ev} />;
}
}
break;
case 'LocationCom':
// cm = '';
// break;
// console.log(obj, obj[dataColumn.base52], json);
let v = obj[dataColumn.base52];
if (typeof v !== 'object') {
console.log('定位组件未获取到对象', '进行了数据转换', v, typeof v, isJSON(v));
if (isJSON(v)) {
v = JSON.parse(v);
} else {
v = {};
}
}
cm = (
<span>
<LocationCom
......@@ -2551,7 +2516,7 @@ export default class tableCom extends Component {
width={json.width}
json={json}
showMap={json.showMap}
value={obj[dataColumn.base52]}
value={v}
/>
</span>
);
......@@ -2618,7 +2583,7 @@ export default class tableCom extends Component {
if (json.isLink) {
cm = <a {...ev} />;
} else {
cm = <Button loading={this.props.loading} type='primary' {...ev} />;
cm = <Button loading={this.props.loading} type="primary" {...ev} />;
}
}
......@@ -2803,7 +2768,7 @@ export default class tableCom extends Component {
case 'InputHidden':
cm = getFieldDecorator(dataColumn.base52, {
initialValue: initValue,
})(<Input type='hidden' />);
})(<Input type="hidden" />);
break;
case 'InputNumber':
cm = getFieldDecorator(dataColumn.base52, {
......@@ -2891,7 +2856,7 @@ export default class tableCom extends Component {
case 'Checkbox':
if (get === 'mobile') {
cm = (
<Flex direction='column' align='start'>
<Flex direction="column" align="start">
{getFieldDecorator(dataColumn.base52, {
initialValue: initValue, // 默认值
rules:
......@@ -2974,7 +2939,7 @@ export default class tableCom extends Component {
disabled={selectDis || disabled}
placeholder={json.placeholder}
style={{ width: json.width }}
optionFilterProp='children'
optionFilterProp="children"
getPopupContainer={
this.props.isDynamic && document.querySelector('#dynamic_div')
? () => {
......@@ -3001,8 +2966,7 @@ export default class tableCom extends Component {
}}
filterOption={(input, option) =>
option
? option.props.children.toLowerCase()
.indexOf(input.toLowerCase()) >= 0
? option.props.children.toLowerCase().indexOf(input.toLowerCase()) >= 0
: false
}
{...otherProps}
......@@ -3051,8 +3015,7 @@ export default class tableCom extends Component {
}
const filterF = function filter(inputValue, path) {
return path.some(
option => option?.label?.toLowerCase()
?.indexOf(inputValue.toLowerCase()) > -1,
option => option?.label?.toLowerCase()?.indexOf(inputValue.toLowerCase()) > -1,
);
};
cm = getFieldDecorator(dataColumn.base52, {
......@@ -3201,13 +3164,11 @@ export default class tableCom extends Component {
if (!isEdit) {
cm = (
<span>
{moment(parseInt(obj[begin.base52]))
.format(
{moment(parseInt(obj[begin.base52])).format(
json.format ? json.format : 'YYYY-MM-DD HH:mm:ss',
)}{' '}
至{' '}
{moment(parseInt(obj[end.base52]))
.format(
{moment(parseInt(obj[end.base52])).format(
json.format ? json.format : 'YYYY-MM-DD HH:mm:ss',
)}
</span>
......@@ -3311,8 +3272,7 @@ export default class tableCom extends Component {
}
});
}
: () => {
}
: () => {}
}
format={json.format ? json.format : 'YYYY-MM-DD HH:mm:ss'}
/>,
......
Markdown 格式
0% 或
您添加了 0 人 到此讨论。请谨慎行事。
请先完成此评论的编辑！
请 注册 或者 后发表评论