Commit 8e0667876ba0c37c0f9a8c6f62e8309a73a89677
1 parent
6de46a73
Revert "过滤项中英文"
This reverts commit 6de46a73.
Showing
4 changed files
with
7 additions
and
9 deletions
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 | - const filteItem = commonFunc.showLocalMessage(props, "filteItem", "过滤项"); | 277 | + |
| 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">{filteItem}</div> | 300 | + <div className="xly-tree-title">过滤项</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 | -const filteItem = commonFunc.showLocalMessage(props, "filteItem", "过滤项"); | 245 | + |
| 246 | return ( | 246 | return ( |
| 247 | <div className="modalChooseProcessContent"> | 247 | <div className="modalChooseProcessContent"> |
| 248 | <Form> | 248 | <Form> |
| @@ -259,7 +259,7 @@ const filteItem = commonFunc.showLocalMessage(props, "filteItem", "过滤项"); | @@ -259,7 +259,7 @@ const filteItem = commonFunc.showLocalMessage(props, "filteItem", "过滤项"); | ||
| 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">{filteItem}</div> | 262 | + <div className="xly-tree-title">过滤项</div> |
| 263 | <StaticEditTree | 263 | <StaticEditTree |
| 264 | {...treeProps} | 264 | {...treeProps} |
| 265 | expandedKeys={props.filterTreeDataKey} | 265 | expandedKeys={props.filterTreeDataKey} |
| @@ -271,7 +271,7 @@ const filteItem = commonFunc.showLocalMessage(props, "filteItem", "过滤项"); | @@ -271,7 +271,7 @@ const filteItem = commonFunc.showLocalMessage(props, "filteItem", "过滤项"); | ||
| 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">{filteItem}</div> | 274 | + <div className="xly-tree-title">过滤项</div> |
| 275 | <StaticEditTree | 275 | <StaticEditTree |
| 276 | {...treeProps} | 276 | {...treeProps} |
| 277 | expandedKeys={props.filterTreeDetailDataKey} | 277 | expandedKeys={props.filterTreeDetailDataKey} |
src/components/Common/CommonListSelectFlex/index.js
| @@ -503,7 +503,6 @@ const CommonListComponent = Form.create({ | @@ -503,7 +503,6 @@ 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", "过滤项"); | ||
| 507 | return ( | 506 | return ( |
| 508 | <div className="modalChooseProcessContent"> | 507 | <div className="modalChooseProcessContent"> |
| 509 | <Form > | 508 | <Form > |
| @@ -521,7 +520,7 @@ const CommonListComponent = Form.create({ | @@ -521,7 +520,7 @@ const CommonListComponent = Form.create({ | ||
| 521 | {displayLeft ? | 520 | {displayLeft ? |
| 522 | <Col span={4}> | 521 | <Col span={4}> |
| 523 | <div className="xly-tree-box"> | 522 | <div className="xly-tree-box"> |
| 524 | - <div className="xly-tree-title">{filteItem}</div> | 523 | + <div className="xly-tree-title">过滤项</div> |
| 525 | <StaticEditTree {...treeProps} /> | 524 | <StaticEditTree {...treeProps} /> |
| 526 | </div> | 525 | </div> |
| 527 | </Col> : '' | 526 | </Col> : '' |
src/components/Common/CommonListSelectTree/index.js
| @@ -693,7 +693,6 @@ const CommonListComponent = Form.create({ | @@ -693,7 +693,6 @@ const CommonListComponent = Form.create({ | ||
| 693 | } | 693 | } |
| 694 | } | 694 | } |
| 695 | }; | 695 | }; |
| 696 | - const filteItem = commonFunc.showLocalMessage(props, "filteItem", "过滤项"); | ||
| 697 | return ( | 696 | return ( |
| 698 | <div className="modalChooseProcessContent"> | 697 | <div className="modalChooseProcessContent"> |
| 699 | <Form > | 698 | <Form > |
| @@ -711,7 +710,7 @@ const CommonListComponent = Form.create({ | @@ -711,7 +710,7 @@ const CommonListComponent = Form.create({ | ||
| 711 | {displayLeft ? | 710 | {displayLeft ? |
| 712 | <Col span={4} style={{ height: realizeHeight > 0 ? `${500 + realizeHeight}px` : 'auto' }}> | 711 | <Col span={4} style={{ height: realizeHeight > 0 ? `${500 + realizeHeight}px` : 'auto' }}> |
| 713 | <div className="xly-tree-box"> | 712 | <div className="xly-tree-box"> |
| 714 | - <div className="xly-tree-title">{filteItem}</div> | 713 | + <div className="xly-tree-title">过滤项</div> |
| 715 | <StaticEditTree {...treeProps} noVlist /> | 714 | <StaticEditTree {...treeProps} noVlist /> |
| 716 | </div> | 715 | </div> |
| 717 | </Col> : '' | 716 | </Col> : '' |