Commit 98e3d6b5 authored by 皮倩雯's avatar 皮倩雯

fix: '方案制定优化'

parent 6bf22e2b
Pipeline #80692 waiting for manual action with stages
...@@ -99,6 +99,7 @@ ...@@ -99,6 +99,7 @@
"@wisdom-map/basemap": "1.1.0-31", "@wisdom-map/basemap": "1.1.0-31",
"ace-builds": "^1.4.12", "ace-builds": "^1.4.12",
"antd-img-crop": "^3.13.2", "antd-img-crop": "^3.13.2",
"array-move": "^4.0.0",
"bizcharts": "^4.0.15", "bizcharts": "^4.0.15",
"chalk": "2.4.2", "chalk": "2.4.2",
"compression": "1.7.4", "compression": "1.7.4",
......
...@@ -28,7 +28,7 @@ const BaseConfig = (props, ref) => { ...@@ -28,7 +28,7 @@ const BaseConfig = (props, ref) => {
const [MonthType2, setMonthType2] = useState('首'); const [MonthType2, setMonthType2] = useState('首');
const [MonthType3, setMonthType3] = useState('首'); const [MonthType3, setMonthType3] = useState('首');
const [MonthDayType1, setMonthDayType1] = useState('1'); // 月选择-日期 const [MonthDayType1, setMonthDayType1] = useState('1'); // 月选择-日期
const [MonthDayType2, setMonthDayType2] = useState('31'); // 月选择-日期 const [MonthDayType2, setMonthDayType2] = useState('28'); // 月选择-日期
const [cities, setCities] = useState('周一'); const [cities, setCities] = useState('周一');
const [secondCity, setSecondCity] = useState(cityData[provinceData[0]][0]); const [secondCity, setSecondCity] = useState(cityData[provinceData[0]][0]);
const [startLen, setstartLen] = useState(1); // 开始日期 const [startLen, setstartLen] = useState(1); // 开始日期
...@@ -123,7 +123,7 @@ const BaseConfig = (props, ref) => { ...@@ -123,7 +123,7 @@ const BaseConfig = (props, ref) => {
setMonthType1('首'); setMonthType1('首');
setMonthType2('首'); setMonthType2('首');
setMonthDayType1('1'); setMonthDayType1('1');
setMonthDayType2('31'); setMonthDayType2('28');
} }
setValue(e.target.value); setValue(e.target.value);
}; };
...@@ -214,7 +214,7 @@ const BaseConfig = (props, ref) => { ...@@ -214,7 +214,7 @@ const BaseConfig = (props, ref) => {
value > MonthDayType1 && setMonthDayType1(value); value > MonthDayType1 && setMonthDayType1(value);
} }
if (MonthType2 === '首') { if (MonthType2 === '首') {
value > MonthDayType2 && setMonthDayType2('31'); value > MonthDayType2 && setMonthDayType2('28');
} }
}} }}
options={[ options={[
...@@ -271,7 +271,7 @@ const BaseConfig = (props, ref) => { ...@@ -271,7 +271,7 @@ const BaseConfig = (props, ref) => {
setMonthDayType1(startLen); setMonthDayType1(startLen);
} }
if (MonthDayType2 < startLen) { if (MonthDayType2 < startLen) {
setMonthDayType2('31'); setMonthDayType2('28');
} }
} else if (value === 2) { } else if (value === 2) {
if (MonthType2 === '末') { if (MonthType2 === '末') {
...@@ -281,7 +281,7 @@ const BaseConfig = (props, ref) => { ...@@ -281,7 +281,7 @@ const BaseConfig = (props, ref) => {
setMonthDayType1(startLen); setMonthDayType1(startLen);
} }
if (MonthDayType2 < startLen) { if (MonthDayType2 < startLen) {
setMonthDayType2('31'); setMonthDayType2('28');
} }
} }
} }
......
...@@ -206,23 +206,57 @@ ...@@ -206,23 +206,57 @@
display: flex; display: flex;
align-items: center; align-items: center;
} }
:global { .dragTable {
.editable-cell { :global {
position: relative; .editable-cell {
} position: relative;
}
.editable-cell-value-wrap {
padding: 5px 12px;
cursor: pointer;
}
.editable-cell-value-wrap { .editable-row:hover .editable-cell-value-wrap {
padding: 5px 12px; padding: 4px 11px;
cursor: pointer; border: 1px solid #d9d9d9;
height: 32px;
border-radius: 2px;
}
[data-theme='dark'] .editable-row:hover .editable-cell-value-wrap {
border: 1px solid #434343;
}
.ant-table-tbody > tr > td {
padding: 8px 16px;
height: 50px;
}
.row-dragging {
background: #fafafa;
border: 1px solid #ccc;
}
.row-dragging td {
padding: 16px;
}
.row-dragging .drag-visible {
visibility: visible;
}
}
}
// 拖拽组件拖拽行样式会丢失写全局样式解决
:global {
.row-dragging {
background: #fafafa;
border: 1px solid #ccc;
} }
.editable-row:hover .editable-cell-value-wrap { .row-dragging td {
padding: 4px 11px; padding: 16px;
border: 1px solid #d9d9d9;
border-radius: 2px;
} }
[data-theme='dark'] .editable-row:hover .editable-cell-value-wrap { .row-dragging .drag-visible {
border: 1px solid #434343; visibility: visible;
} }
} }
/* eslint-disable no-unused-expressions */
export const defaultState = {
selectList: [],
};
export const reducer = (state, action) => {
switch (action.type) {
case 'SET_SELECT_LIST':
return { ...state, selectList: action.data };
default:
defaultState;
}
};
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