Skip to content

A
amos-station-module-view
Commit 1f261525 authored by 张博's avatar 张博
Browse files
Options

Merge branch 'developer' of http://172.16.10.76/station/amos-station-module-view into developer

parents f3029f99 e942beb8
Hide whitespace changes
Inline Side-by-side
Showing with 4 additions and 2 deletions
mods/components/3dviewConvertor/styles/preControl.scss
View file @ 1f261525
.amos-side-pane-wrapper { .amos-side-pane-wrapper {
.amos-sidepane { .amos-sidepane {
z-index: 1; z-index: 99;
.record-view-parent { .record-view-parent {
width: 260px; width: 260px;
......
mods/components/3dviewConvertor/view/searchPane/index.js
View file @ 1f261525
import React, { Component } from 'react'; import React, { Component } from 'react';
import PropTypes from 'prop-types'; import PropTypes from 'prop-types';
import { deepCopy } from 'amos-tool';
import { SidePane, Tabs, message } from 'amos-framework'; import { SidePane, Tabs, message } from 'amos-framework';
import Icon from 'amos-icon'; import Icon from 'amos-icon';
import { AmosGridTable } from 'amos-pro'; import { AmosGridTable } from 'amos-pro';
...@@ -166,7 +167,7 @@ class SearchPane extends Component { ...@@ -166,7 +167,7 @@ class SearchPane extends Component {
let views = new Array(); let views = new Array();
if (record.position){ if (record.position){
record.id = record.id.replace( `${record.type}-` ,'' ); record.id = record.id.replace( `${record.type}-` ,'' );
views.push(record); views.push(deepCopy(record));
let args = { let args = {
target: views, target: views,
operateType: operateTypes.POINT_SEARCH operateType: operateTypes.POINT_SEARCH
...@@ -280,6 +281,7 @@ class SearchPane extends Component { ...@@ -280,6 +281,7 @@ class SearchPane extends Component {
paramsOnChange = (filter) => { paramsOnChange = (filter) => {
const { activeKey } = this.state; const { activeKey } = this.state;
this.setPageConfig({ pageSize: 10, current: 1 });
if (activeKey === 'search'){ if (activeKey === 'search'){
this.setState({ filter },this.fetchRetrieveData); this.setState({ filter },this.fetchRetrieveData);
} else if (activeKey === 'message'){ } else if (activeKey === 'message'){
......
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