Commit 6de46a73bb536da9d2d7007d4ec0e87756436472

Authored by chenxt
1 parent bf990ba7

过滤项中英文

src/components/Common/CommonListSelectAssignment.js
@@ -274,7 +274,7 @@ const CommonListComponent = Form.create({ @@ -274,7 +274,7 @@ const CommonListComponent = Form.create({
274 }; 274 };
275 const sProcessParams = commonFunc.showMessage(app.commonConst, 'sProcessParams');/* 选择工艺参数标题s */ 275 const sProcessParams = commonFunc.showMessage(app.commonConst, 'sProcessParams');/* 选择工艺参数标题s */
276 const displayLeft = (sModelsType !== 'search/sisColor' && sModelsType !== 'search/commonPopup'); 276 const displayLeft = (sModelsType !== 'search/sisColor' && sModelsType !== 'search/commonPopup');
277 - 277 + const filteItem = commonFunc.showLocalMessage(props, "filteItem", "过滤项");
278 // let slaveFilterCondition = []; 278 // let slaveFilterCondition = [];
279 // if (props.slaveFilterCondition) { 279 // if (props.slaveFilterCondition) {
280 // slaveFilterCondition = props.slaveFilterCondition.slice(0); 280 // slaveFilterCondition = props.slaveFilterCondition.slice(0);
@@ -297,7 +297,7 @@ const CommonListComponent = Form.create({ @@ -297,7 +297,7 @@ const CommonListComponent = Form.create({
297 {displayLeft ? 297 {displayLeft ?
298 <Col span={4}> 298 <Col span={4}>
299 <div className="xly-tree-box"> 299 <div className="xly-tree-box">
300 - <div className="xly-tree-title">过滤项</div> 300 + <div className="xly-tree-title">{filteItem}</div>
301 <StaticEditTree {...treeProps} /> 301 <StaticEditTree {...treeProps} />
302 </div> 302 </div>
303 </Col> : '' 303 </Col> : ''
src/components/Common/CommonListSelectFlex/EditTableCommonListSelectFlex/index.jsx
@@ -242,7 +242,7 @@ const CommonListComponent = Form.create({ @@ -242,7 +242,7 @@ const CommonListComponent = Form.create({
242 if (props.slaveFilterKeys) { 242 if (props.slaveFilterKeys) {
243 slaveDataShow = props.slaveData.filter(i => i && i.sSqlConditionId === props.slaveFilterKeys); 243 slaveDataShow = props.slaveData.filter(i => i && i.sSqlConditionId === props.slaveFilterKeys);
244 } 244 }
245 - 245 +const filteItem = commonFunc.showLocalMessage(props, "filteItem", "过滤项");
246 return ( 246 return (
247 <div className="modalChooseProcessContent"> 247 <div className="modalChooseProcessContent">
248 <Form> 248 <Form>
@@ -259,7 +259,7 @@ const CommonListComponent = Form.create({ @@ -259,7 +259,7 @@ const CommonListComponent = Form.create({
259 <Row gutter={[8, 0]}> 259 <Row gutter={[8, 0]}>
260 <Col span={props.treeSpan}> 260 <Col span={props.treeSpan}>
261 <div className="xly-tree-box"> 261 <div className="xly-tree-box">
262 - <div className="xly-tree-title">过滤项</div> 262 + <div className="xly-tree-title">{filteItem}</div>
263 <StaticEditTree 263 <StaticEditTree
264 {...treeProps} 264 {...treeProps}
265 expandedKeys={props.filterTreeDataKey} 265 expandedKeys={props.filterTreeDataKey}
@@ -271,7 +271,7 @@ const CommonListComponent = Form.create({ @@ -271,7 +271,7 @@ const CommonListComponent = Form.create({
271 </Col> 271 </Col>
272 <Col span={props.filterSpan}> 272 <Col span={props.filterSpan}>
273 <div className="xly-tree-box"> 273 <div className="xly-tree-box">
274 - <div className="xly-tree-title">过滤项</div> 274 + <div className="xly-tree-title">{filteItem}</div>
275 <StaticEditTree 275 <StaticEditTree
276 {...treeProps} 276 {...treeProps}
277 expandedKeys={props.filterTreeDetailDataKey} 277 expandedKeys={props.filterTreeDetailDataKey}
src/components/Common/CommonListSelectFlex/index.js
@@ -503,6 +503,7 @@ const CommonListComponent = Form.create({ @@ -503,6 +503,7 @@ const CommonListComponent = Form.create({
503 503
504 const BtnSure = commonFunc.showLocalMessage(props, 'BtnSure', '确定'); 504 const BtnSure = commonFunc.showLocalMessage(props, 'BtnSure', '确定');
505 const BtnCancel = commonFunc.showLocalMessage(props, 'BtnCancel', '取消'); 505 const BtnCancel = commonFunc.showLocalMessage(props, 'BtnCancel', '取消');
  506 + const filteItem = commonFunc.showLocalMessage(props, "filteItem", "过滤项");
506 return ( 507 return (
507 <div className="modalChooseProcessContent"> 508 <div className="modalChooseProcessContent">
508 <Form > 509 <Form >
@@ -520,7 +521,7 @@ const CommonListComponent = Form.create({ @@ -520,7 +521,7 @@ const CommonListComponent = Form.create({
520 {displayLeft ? 521 {displayLeft ?
521 <Col span={4}> 522 <Col span={4}>
522 <div className="xly-tree-box"> 523 <div className="xly-tree-box">
523 - <div className="xly-tree-title">过滤项</div> 524 + <div className="xly-tree-title">{filteItem}</div>
524 <StaticEditTree {...treeProps} /> 525 <StaticEditTree {...treeProps} />
525 </div> 526 </div>
526 </Col> : '' 527 </Col> : ''
src/components/Common/CommonListSelectTree/index.js
@@ -693,6 +693,7 @@ const CommonListComponent = Form.create({ @@ -693,6 +693,7 @@ const CommonListComponent = Form.create({
693 } 693 }
694 } 694 }
695 }; 695 };
  696 + const filteItem = commonFunc.showLocalMessage(props, "filteItem", "过滤项");
696 return ( 697 return (
697 <div className="modalChooseProcessContent"> 698 <div className="modalChooseProcessContent">
698 <Form > 699 <Form >
@@ -710,7 +711,7 @@ const CommonListComponent = Form.create({ @@ -710,7 +711,7 @@ const CommonListComponent = Form.create({
710 {displayLeft ? 711 {displayLeft ?
711 <Col span={4} style={{ height: realizeHeight > 0 ? `${500 + realizeHeight}px` : 'auto' }}> 712 <Col span={4} style={{ height: realizeHeight > 0 ? `${500 + realizeHeight}px` : 'auto' }}>
712 <div className="xly-tree-box"> 713 <div className="xly-tree-box">
713 - <div className="xly-tree-title">过滤项</div> 714 + <div className="xly-tree-title">{filteItem}</div>
714 <StaticEditTree {...treeProps} noVlist /> 715 <StaticEditTree {...treeProps} noVlist />
715 </div> 716 </div>
716 </Col> : '' 717 </Col> : ''