Commit 29339114 authored by 皮倩雯's avatar 皮倩雯

fix: '表单设计器'

parent 5b9c70fe
Pipeline #68178 passed with stages
...@@ -122,7 +122,7 @@ ...@@ -122,7 +122,7 @@
"js-calendar-converter": "0.0.4", "js-calendar-converter": "0.0.4",
"lodash": "4.17.11", "lodash": "4.17.11",
"minimist": "1.2.0", "minimist": "1.2.0",
"panda-xform": "^2.1.1", "panda-xform": "^2.4.0",
"parseForm": "^2.2.4", "parseForm": "^2.2.4",
"prop-types": "15.7.2", "prop-types": "15.7.2",
"quill": "^1.3.7", "quill": "^1.3.7",
......
...@@ -126,7 +126,7 @@ ...@@ -126,7 +126,7 @@
} }
.btn { .btn {
display: flex; display: flex;
justify-content: space-around; justify-content: flex-end;
width: 25rem; width: 25rem;
} }
.ant-btn { .ant-btn {
......
...@@ -82,6 +82,7 @@ const TableManager = props => { ...@@ -82,6 +82,7 @@ const TableManager = props => {
const [chooseLine, setChooseLine] = useState([0]); const [chooseLine, setChooseLine] = useState([0]);
const [keepValue, setKeepValue] = useState([0]); const [keepValue, setKeepValue] = useState([0]);
const [keepTreeSelect, setKeepTreeSelect] = useState([]); const [keepTreeSelect, setKeepTreeSelect] = useState([]);
const [keepData, setKeepData] = useState([]);
const [keepTreeFirst, setKeepTreeFirst] = useState([]); const [keepTreeFirst, setKeepTreeFirst] = useState([]);
const [treeVisible, setTreeVisible] = useState(true); // 是否显示左侧树 const [treeVisible, setTreeVisible] = useState(true); // 是否显示左侧树
const [hoverItemIndex, setHoverItemIndex] = useState(0); // hover流程索引 const [hoverItemIndex, setHoverItemIndex] = useState(0); // hover流程索引
...@@ -222,6 +223,7 @@ const TableManager = props => { ...@@ -222,6 +223,7 @@ const TableManager = props => {
keepValue: keepValue, keepValue: keepValue,
keepTreeSelect: keepTreeSelect, keepTreeSelect: keepTreeSelect,
keepTreeFirst: keepTreeFirst, keepTreeFirst: keepTreeFirst,
keepData: keepData,
}, },
}); });
// setType('config'); // setType('config');
...@@ -268,7 +270,6 @@ const TableManager = props => { ...@@ -268,7 +270,6 @@ const TableManager = props => {
let newArr = []; let newArr = [];
let aa = []; let aa = [];
let bb = []; let bb = [];
console.log(groupData, 'groupData');
// 对分组进行排序 // 对分组进行排序
const sortNameArr = res.data.groupNames; const sortNameArr = res.data.groupNames;
const sortList = []; const sortList = [];
...@@ -281,20 +282,18 @@ const TableManager = props => { ...@@ -281,20 +282,18 @@ const TableManager = props => {
} }
}); });
}); });
console.log(sortList, 'sortList');
console.log(groupData);
setAllData(groupData); setAllData(groupData);
if (!props.history.location.query || initNum.current > 0) { if (!props.history.location.query || initNum.current > 0) {
if (newArr.length > 0 && (!select || isSearch)) { if (newArr.length > 0 && (!select || isSearch)) {
setSelect(newArr[0].type); setSelect(newArr[0].type);
} }
setGroupArr(newArr); setGroupArr(newArr);
// if (groupArr.length == 0 || isSearch) {
// setGroupArr(newArr);
// }
} }
setKeepTreeFirst(bb); setKeepTreeFirst(bb);
setKeepTreeSelect(aa); setKeepTreeSelect(aa);
if (keyword === '') {
setKeepData(aa);
}
initNum.current += 1; initNum.current += 1;
} }
}) })
...@@ -680,6 +679,7 @@ const TableManager = props => { ...@@ -680,6 +679,7 @@ const TableManager = props => {
keepValue: keepValue, keepValue: keepValue,
keepTreeSelect: keepTreeSelect, keepTreeSelect: keepTreeSelect,
keepTreeFirst: keepTreeFirst, keepTreeFirst: keepTreeFirst,
keepData: keepData,
}, },
}); });
}, },
......
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