兼容场景设计器

one_stop_public/Table/index.jsx

@@ -34,7 +34,7 @@ export default class ZdyTable extends Component {
       init: this.props.init || {},
       datas: {},
       isEdit: true,
-      isRowCol:false,
+      isRowCol: false,
       isReady: false,
       formConfig: {},
     };
@@ -91,7 +91,7 @@ export default class ZdyTable extends Component {
           datas: obj.datas,
           width: this.props.table ? obj.datas[val.formKey].width : xxx.width,
           isBorder: this.props.table ? obj.datas[val.formKey].isBorder : xxx.isBorder,
-          isRowCol:this.props.table ? obj.datas[val.formKey].isRowCol : xxx.isRowCol,
+          isRowCol: this.props.table ? obj.datas[val.formKey].isRowCol : xxx.isRowCol,
           mapData,
           currentFormKey: this.props.table ? val.formKey : obj.init,
           sqlData,
@@ -147,7 +147,7 @@ export default class ZdyTable extends Component {
           currentFormKey: obj.init,
           width: xxx.width,
           isBorder: xxx.isBorder,
-          isRowCol:xxx.isRowCol,
+          isRowCol: xxx.isRowCol,
           mapData,
           sqlData,
           defaultValues: val.unifiedServicePatternModel.defaultValues,
@@ -324,7 +324,7 @@ export default class ZdyTable extends Component {
           currentFormKey: obj.init,
           width: xxx.width,
           isBorder: xxx.isBorder,
-          isRowCol:xxx.isRowCol,
+          isRowCol: xxx.isRowCol,
           mapData,
           sqlData,
           defaultValues: val.unifiedServicePatternModel.defaultValues,
@@ -372,7 +372,7 @@ export default class ZdyTable extends Component {
         defaultBinds: this.props.table ? obj.datas[val.taskFormKey].defaultBinds : xxx.defaultBinds,
         width: this.props.table ? obj.datas[val.taskFormKey].width : xxx.width,
         isBorder: this.props.table ? obj.datas[val.taskFormKey].isBorder : xxx.isBorder,
-        isRowCol: this.props.table ? obj.datas[val.taskFormKey].isRowCol: xxx.isRowCol,
+        isRowCol: this.props.table ? obj.datas[val.taskFormKey].isRowCol : xxx.isRowCol,
         items: this.props.table ? obj.datas[val.taskFormKey].items : xxx.items,
         isReady: true,
         init: { ...this.state.init, ...(val.isSecond ? this.props.obj : {}) },
@@ -436,6 +436,7 @@ export default class ZdyTable extends Component {
       modalInit,
       concealModel, // 场景设计器内置跳转函数
       paddingBottom,
+      isDynamic, // 是否为大数据页面
     } = this.props;
     let style = {};
     if (formConfig.style != null) {
@@ -472,13 +473,15 @@ export default class ZdyTable extends Component {
     let updateTime;
     const styleDiv = this.props.height
       ? {
-          overflow: 'auto',
+          overflow: isDynamic ? 'hidden' : 'auto',
+          // overflowY: isDynamic && 'auto',
           width: '100%',
           height: this.props.height,
           paddingBottom: paddingBottom != null ? paddingBottom : '10px',
         }
       : {
-          overflow: 'auto',
+          overflow: isDynamic ? 'hidden' : 'auto',
+          // overflowY: isDynamic && 'auto',
           width: '100%',
           paddingBottom: paddingBottom != null ? paddingBottom : '10px',
         };
@@ -657,6 +660,7 @@ export default class ZdyTable extends Component {
                                           routerState={routerState} // 兼容表单设计器路由传参
                                           messageData={messageData} // 场景设计器共享变量参数
                                           concealModel={concealModel || {}} // 场景设计器内置路由跳转函数
+                                          isDynamic={isDynamic} // 是否为场景配置器调用
                                         />
                                       </td>
                                     );
@@ -755,6 +759,7 @@ export default class ZdyTable extends Component {
                   formId={formId}
                   fatherObj={this.props.fatherObj}
                   concealModel={concealModel || {}} // 场景设计器内置路由跳转函数
+                  isDynamic={isDynamic} // 是否为场景配置器调用
                 />
                 {/* {
                             items.map((item, i) => {

one_stop_public/tableCompon/index.jsx

@@ -803,7 +803,7 @@ export default class tableCom extends Component {
       reqUrls[url] = { params: params };
       isChange = true;
     }
-    console.log(isChange)
+    console.log(isChange);
     if (!isChange) {
       if (callback) {
         const data = reqUrls[url].data;
@@ -1154,7 +1154,12 @@ export default class tableCom extends Component {
         this.props.init,
         this.props.modalInit,
         this.props.defaultValues,
-        { clientType: this.props.get, formCode: this.props.formCode, formId: this.props.formId,isEdit:this.props.isEdit },
+        {
+          clientType: this.props.get,
+          formCode: this.props.formCode,
+          formId: this.props.formId,
+          isEdit: this.props.isEdit,
+        },
         this.props.index,
         this.props.fatherCode,
         {
@@ -1162,7 +1167,7 @@ export default class tableCom extends Component {
           sql: this.sqlUtil.bind(this, base52, json, callback),
           message: message,
           router: router,
-          uuid:UUID,
+          uuid: UUID,
           setValues: this.setValues.bind(this, base52, json),
           req: this.reqUtil.bind(this, base52, json, callback),
           md5: md5,
@@ -2606,6 +2611,13 @@ export default class tableCom extends Component {
               placeholder={json.placeholder}
               style={{ width: json.width }}
               optionFilterProp="children"
+              getPopupContainer={
+                this.props.isDynamic
+                  ? () => {
+                      return document.querySelector('#dynamic_div');
+                    }
+                  : ''
+              }
               onFocus={() => {
                 get === 'mobile' // 移动端取消输入键盘弹出
                   ? setTimeout(() => {