diff --git a/src/components/Common/CommonComponent/index.js b/src/components/Common/CommonComponent/index.js index b5d8fcd..c1fa3f1 100644 --- a/src/components/Common/CommonComponent/index.js +++ b/src/components/Common/CommonComponent/index.js @@ -432,6 +432,8 @@ export default class CommonComponent extends Component { } else if (this.props.onSaveState) { this.props.onSaveState({ sCurrMemoProps }); } + } else if (commonUtils.isNotEmptyObject(sMemo) && sMemo.indexOf('sName') > -1) { /* 计算方案 变量设置双击弹出 */ + this.props.onFieldDoubleClick(this.props.record, this.state.dataValue, this.props.showConfig, this.props.name); } else if (commonUtils.isNotEmptyObject(sMemo) && sMemo.indexOf('sValue') > -1) { /* 计算方案 变量设置双击弹出 */ this.props.onFieldDoubleClick(this.props.record, this.state.dataValue, this.props.showConfig, this.props.name); } else if (commonUtils.isNotEmptyObject(sMemo) && sMemo.indexOf('sAssignField') > -1) { /* 赋值字段 变量设置双击弹出 */ diff --git a/src/components/Common/CommonViewTable/index.js b/src/components/Common/CommonViewTable/index.js index e37774f..1750116 100644 --- a/src/components/Common/CommonViewTable/index.js +++ b/src/components/Common/CommonViewTable/index.js @@ -400,6 +400,7 @@ export default class CommonViewTable extends Component { {this.props.extraContent && this.props.extraContent(child)} + {this.props.extraContent2 && this.props.extraContent2(child)} ); }) diff --git a/src/components/Common/Feedback/Feedback.js b/src/components/Common/Feedback/Feedback.js index 1e16c0d..055008b 100644 --- a/src/components/Common/Feedback/Feedback.js +++ b/src/components/Common/Feedback/Feedback.js @@ -229,7 +229,7 @@ const Feedback = props => { // src={`http://localhost:8000/commonFeedback?iframeId=${ // iframeId.current // }`} - src={`https://project.xlyprint.cn/commonFeedback?iframeId=${ + src={`http://project.xlyprint.cn/commonFeedback?iframeId=${ iframeId.current }`} title="问题反馈" diff --git a/src/components/Common/PersonCenter/SwitchCompanyAndLanguage/index.js b/src/components/Common/PersonCenter/SwitchCompanyAndLanguage/index.js index 932ade5..0dc698c 100644 --- a/src/components/Common/PersonCenter/SwitchCompanyAndLanguage/index.js +++ b/src/components/Common/PersonCenter/SwitchCompanyAndLanguage/index.js @@ -20,7 +20,7 @@ const SwitchCompanyAndLanguageEvent = props => { const dataUrl = `${commonConfig.server_host}brand/getBrand/${userinfo.sId}`; const dataReturn = (await commonServices.getService(token, dataUrl)).data; - if (dataReturn.code === 1) { + if (dataReturn?.code === 1) { const companyList = dataReturn.dataset.rows[0]; setState(pre => ({ ...pre, companyList, companyData: companyList.find(item => item.sSubsidiaryId === userinfo.sSubsidiaryId) })); setTimeout(() => { diff --git a/src/components/Common/ProblemFeedback/index.less b/src/components/Common/ProblemFeedback/index.less index 6c3dc40..7ce67a8 100644 --- a/src/components/Common/ProblemFeedback/index.less +++ b/src/components/Common/ProblemFeedback/index.less @@ -54,7 +54,7 @@ } } -.modalWrap { +.modalWrap:not(.antdV5) { :global { .ant-modal-close { color: #4a495f !important; diff --git a/src/components/QuickQuote/index.jsx b/src/components/QuickQuote/index.jsx index 04fba44..c1a1fca 100644 --- a/src/components/QuickQuote/index.jsx +++ b/src/components/QuickQuote/index.jsx @@ -1291,15 +1291,21 @@ const BoxComponent = props => { const upViewProps20 = getUpViewPropsByITag(20); const { sBackProcessData = [] } = slaveRowData; + + const [downAbleConfigsNew, setDownAbleConfigsNew] = useState([]); + useEffect(() => { + setDownAbleConfigsNew(downAbleConfigs); + }, [selectedNode.showName, boxModel]); + // 获取sType为2的 const downViewProps = { ...props, - viewConfigs: downAbleConfigs.filter(item => item.sPartsName === boxModel || !item.sPartsName), - tableConfig: { ...slaveConfig, gdsconfigformslave: downAbleConfigs }, + viewConfigs: downAbleConfigsNew.filter(item => item.sPartsName === boxModel || !item.sPartsName), + tableConfig: { ...slaveConfig, gdsconfigformslave: downAbleConfigsNew }, iColValueView: 24, viewRow: slaveRowData, getViewRow: config => { - return sBackProcessData.find(item => item[config.sName]) || {}; + return sBackProcessData.find(item => item[config.sName0 || config.sName]) || {}; }, tableName: `slaveDown${boxModel}`, getSqlDropDownData: (...args) => { @@ -1375,6 +1381,51 @@ const BoxComponent = props => { "" ); }, + extraContent2: child => { + return ( +
+ {!child.sParentName ? ( +
+ ); + }, }; // 获取sType为3的 @@ -1728,7 +1779,7 @@ const BoxComponent = props => { <> {/* 后道参数 */}
-
+
diff --git a/src/components/QuickQuote/index.less b/src/components/QuickQuote/index.less index 10a5636..0b7615f 100644 --- a/src/components/QuickQuote/index.less +++ b/src/components/QuickQuote/index.less @@ -144,6 +144,14 @@ } } + .viewTableDownView { + :global { + .viewStyle { + padding-right: 14px; + } + } + } + .viewTable1 { padding: 0 20px 0 0; } @@ -413,4 +421,25 @@ width: calc(100% - 200px); height: 100%; } +} + +.downOperations { + position: absolute; + top: -4px; + right: -14px; + display: flex; + flex-direction: column; + z-index: 1000; + + :global { + button { + padding: 0; + width: 16px; + height: 16px; + + >span { + font-size: 10px; + } + } + } } \ No newline at end of file diff --git a/src/index.less b/src/index.less index 38d5fde..0d7ecb5 100644 --- a/src/index.less +++ b/src/index.less @@ -10,6 +10,7 @@ body, background: #888; height: 100%; font-size: 13px; + overflow: hidden; } html { @@ -138,10 +139,6 @@ html { white-space: nowrap; } -.ant-modal-body { - max-height: unset !important; -} - .topTable { .ant-table-header { table { @@ -1185,32 +1182,50 @@ tr[class*="SetRow_"] { height: 28px !important; } -.ant-modal-content { - border-radius: 0 !important; -} +.ant-modal-wrap:not(.antdV5) { -.ant-modal-header { - padding: 7px 24px !important; - background: var(--xly-skin-modal-bg-color, #646464) !important; - color: #fff !important; - font-size: 18px; - border-radius: 0 !important; -} + .ant-modal-body { + max-height: unset !important; + padding-top: 12px !important; + overflow: hidden; -.ant-modal-close-x { - height: 33px !important; - line-height: 33px !important; -} + .ant-col-5 { + width: 20%; + } + } -.ant-modal-title { - color: #fff !important; -} + .ant-modal-footer { + border-top: 0 !important; + } -.ant-modal-close { - color: #fff !important; + .ant-modal-content { + border-radius: 0 !important; + } + + .ant-modal-header { + padding: 7px 24px !important; + background: var(--xly-skin-modal-bg-color, #646464) !important; + color: #fff !important; + font-size: 18px; + border-radius: 0 !important; + } + + .ant-modal-close-x { + height: 33px !important; + line-height: 33px !important; + } + .ant-modal-title { + color: #fff !important; + } + + .ant-modal-close { + color: #fff !important; + + } } + .ant-menu-item i.selected { color: #f6c136; } @@ -1575,10 +1590,6 @@ tr[class*="SetRow_"] { overflow: auto; } -.ant-modal-body { - overflow: hidden; -} - /* 设置通用切换slaveTab */ .ant-tabs.ant-tabs-card>.ant-tabs-bar .ant-tabs-tab-disabled span { color: #6b6868; @@ -3286,18 +3297,6 @@ th.column-money { z-index: 900; } -.ant-modal-body { - padding-top: 12px !important; - - .ant-col-5 { - width: 20%; - } -} - -.ant-modal-footer { - border-top: 0 !important; -} - .ant-table-footer { background: none !important; border-top: none !important; diff --git a/src/routes/indexPage.js b/src/routes/indexPage.js index dc41c1a..1731000 100644 --- a/src/routes/indexPage.js +++ b/src/routes/indexPage.js @@ -4,8 +4,8 @@ import { ConfigProvider, Layout } from 'antd-v4'; import zhCN from 'antd-v4/lib/locale-provider/zh_CN'; // import Search from '../components/Common/Search'; import PersonCenter from './personCenter/personCenter'; -// import Feedback from './feedback/feedback'; -// import ProblemFeedback from './problemFeedback/problemFeedback'; +import Feedback from './feedback/feedback'; +import ProblemFeedback from './problemFeedback/problemFeedback'; import TabCon from './tab/tab'; import styles from './indexPage.less'; @@ -41,7 +41,7 @@ function IndexPage() { 版权所有上海小羚羊软件股份有限公司 咨询电话:400-880-6237 */} - {/* { ['project.xlyprint.cn'].includes(location.hostname) ? : } */} + { ['project.xlyprint.cn', 'localhost'].includes(location.hostname) ? : } ); }