Merge remote-tracking branch 'origin/master'

ant-design-vue-jeecg/src/views/fieldx/FieldxList.vue

@@ -38,7 +38,7 @@
         <a-button type="primary" icon="import">导入</a-button>
       </a-upload>
       <!-- 高级查询区域 -->
-      <j-super-query :fieldList="superFieldList" ref="superQueryModal" @handleSuperQuery="handleSuperQuery"></j-super-query>
+<!--      <j-super-query :fieldList="superFieldList" ref="superQueryModal" @handleSuperQuery="handleSuperQuery"></j-super-query>-->
       <a-dropdown v-if="selectedRowKeys.length > 0">
         <a-menu slot="overlay">
           <a-menu-item key="1" @click="batchDel"><a-icon type="delete"/>删除</a-menu-item>

ant-design-vue-jeecg/src/views/fieldx/modules/FieldxForm.vue

@@ -5,7 +5,7 @@
         <a-row>
           <a-col :span="24">
             <a-form-model-item label="对应实体" :labelCol="labelCol" :wrapperCol="wrapperCol" prop="tableId">
-              <j-search-select-tag v-model="model.tableId"  dict="tablex,table_name,id" />
+              <j-search-select-tag v-model="model.tableId" placeholder="请选择对应实体" dict="tablex,table_name,id" />
             </a-form-model-item>
           </a-col>
           <a-col :span="24">
@@ -120,6 +120,7 @@
           isUniqueness:'0',
           status:'1',
           verisonStatus:'1',
+          tableId:'',
          },
         labelCol: {
           xs: { span: 24 },
@@ -173,6 +174,7 @@
       },
     },
     created () {
+      this.model.tableId = this.$route.query.tableId;
        //备份model原始值
       this.modelDefault = JSON.parse(JSON.stringify(this.model));
     },

ant-design-vue-jeecg/src/views/tablex/TablexList.vue

@@ -38,7 +38,7 @@
         <a-button type="primary" icon="import">导入</a-button>
       </a-upload>
       <!-- 高级查询区域 -->
-      <j-super-query :fieldList="superFieldList" ref="superQueryModal" @handleSuperQuery="handleSuperQuery"></j-super-query>
+<!--      <j-super-query :fieldList="superFieldList" ref="superQueryModal" @handleSuperQuery="handleSuperQuery"></j-super-query>-->
       <a-dropdown v-if="selectedRowKeys.length > 0">
         <a-menu slot="overlay">
           <a-menu-item key="1" @click="batchDel"><a-icon type="delete"/>删除</a-menu-item>