fix: '1.内嵌表单设计器按钮位置调整2.xForm版本升级'

package.json

@@ -122,7 +122,7 @@
         "js-calendar-converter": "0.0.4",
         "lodash": "4.17.11",
         "minimist": "1.2.0",
-        "panda-xform": "2.7.5",
+        "panda-xform": "^2.8.1",
         "prop-types": "15.7.2",
         "quill": "^1.3.7",
         "rc-tween-one": "^3.0.6",

src/pages/bsmanager/base/tablemanager/filedConfig/filedConfig.jsx

@@ -273,7 +273,7 @@ const AddModal = props => {
       setTreeLoading(true);
       getField();
     }
-  }, [flag]);
+  }, [flag, props.tableInfo]);
 
   const formateArrDataA = (initialArr, name) => {
     // 判定传参是否符合规则
@@ -460,33 +460,32 @@ const AddModal = props => {
     setFlag(flag + 1);
   };
   return (
-    <>
-      {/* <Spin tip="loading..." spinning={treeLoading}> */}
-      <div className={styles.containerBox}>
+    <Modal
+      title={
         <div className={styles.config}>
           {/* <ArrowLeftOutlined onClick={back} className={styles.goBack} /> */}
           <div className={styles.title}> 展示名称 【{formName}】</div>
           <div style={{ display: 'flex', justifyContent: 'flex-end' }}>
             {/* <div style={{ lineHeight: '32px', marginRight: '5px' }}>快速切换表:</div>
-              <div style={{ width: '350px', marginRight: '10px' }}>
-                <TreeSelect
-                  showSearch
-                  style={{ width: '100%' }}
-                  value={treeSelectValue}
-                  dropdownStyle={{ maxHeight: 400, overflow: 'auto' }}
-                  placeholder="请选择表名 "
-                  allowClear
-                  treeDefaultExpandAll
-                  showCheckedStrategy
-                  onChange={treeSelectOnchange}
-                >
-                  {selectTreeData ? (
-                    selectTreeData.map(i => mapTree(i))
-                  ) : (
-                    <Empty image={Empty.PRESENTED_IMAGE_SIMPLE} />
-                  )}
-                </TreeSelect>
-              </div> */}
+          <div style={{ width: '350px', marginRight: '10px' }}>
+            <TreeSelect
+              showSearch
+              style={{ width: '100%' }}
+              value={treeSelectValue}
+              dropdownStyle={{ maxHeight: 400, overflow: 'auto' }}
+              placeholder="请选择表名 "
+              allowClear
+              treeDefaultExpandAll
+              showCheckedStrategy
+              onChange={treeSelectOnchange}
+            >
+              {selectTreeData ? (
+                selectTreeData.map(i => mapTree(i))
+              ) : (
+                <Empty image={Empty.PRESENTED_IMAGE_SIMPLE} />
+              )}
+            </TreeSelect>
+          </div> */}
             <div className={styles.btn}>
               <Button
                 type="primary"
@@ -515,19 +514,37 @@ const AddModal = props => {
                 提交
               </Button>
               {/* <Button type="primary" icon={<PlusSquareOutlined />} onClick={add}>
-                  附加
-                </Button> */}
+              附加
+            </Button> */}
               {/* <Button
-                  type="primary"
-                  icon={<RollbackOutlined />}
-                  onClick={back}
-                  style={{ marginLeft: '30px' }}
-                >
-                  返回
-                </Button> */}
+              type="primary"
+              icon={<RollbackOutlined />}
+              onClick={back}
+              style={{ marginLeft: '30px' }}
+            >
+              返回
+            </Button> */}
             </div>
           </div>
         </div>
+      }
+      visible={props.fieldConfigShow}
+      // onOk={getNewGroup}
+      onCancel={() => props.setFieldConfigShow(false)}
+      footer={null}
+      width="100vw"
+      style={{
+        maxWidth: '100vw',
+        top: 0,
+        paddingBottom: 0,
+      }}
+      bodyStyle={{
+        height: 'calc(100vh - 55px)',
+      }}
+      getContainer={false}
+    >
+      {/* <Spin tip="loading..." spinning={treeLoading}> */}
+      <div className={styles.containerBox}>
         <div style={{ width: '100%', height: 'calc(100% - 63px)', padding: '10px' }}>
           {formObj && <FormDesigner ref={formRef} tableName={formObj} />}
         </div>
@@ -543,7 +560,7 @@ const AddModal = props => {
           formObj={pramFormObj}
         />
       )}
-    </>
+    </Modal>
   );
 };
 export default AddModal;

src/pages/bsmanager/base/tablemanager/filedConfig/index.less

@@ -116,11 +116,11 @@
 }
 .config {
   display: flex;
-  padding: 1rem 0 0.5rem 0.5rem;
+  // padding: 1rem 0 0.5rem 0.5rem;
   justify-content: space-between;
-  width: calc(100% - 10px);
+  width: calc(100% - 70px);
   position: relative;
-  padding-left: 50px;
+  // padding-left: 50px;
 
   .goBack {
     position: absolute;

src/pages/bsmanager/base/tablemanager/index.jsx

@@ -890,7 +890,7 @@ const TableManager = props => {
         >
           <div style={{ whiteSpace: 'pre-line', textAlign: 'justify' }}>{checkMsg}</div>
         </Modal>
-        <Modal
+        {/* <Modal
           title="表单设计"
           visible={fieldConfigShow}
           // onOk={getNewGroup}
@@ -906,9 +906,14 @@ const TableManager = props => {
             height: 'calc(100vh - 55px)',
           }}
           getContainer={false}
-        >
-          <AddModal tableInfo={tableInfo} show={fieldConfigShow} />
-        </Modal>
+        > */}
+        <AddModal
+          tableInfo={tableInfo}
+          show={fieldConfigShow}
+          fieldConfigShow={fieldConfigShow}
+          setFieldConfigShow={flags => setFieldConfigShow(flags)}
+        />
+        {/* </Modal> */}
       </PageContainer>
     </Spin>
   );