提交

ruoyi-ui/src/views/tool/gen/basicInfoForm.vue

@@ -60,18 +60,18 @@
         </el-form-item>
       </el-col>
       <el-col :span="12">
-        <el-form-item   label="显示字段" prop="filterConditions">
-          <el-input  :disabled="true" v-model="info.filterConditions" placeholder="请输入显示字段" maxlength="50" />
+        <el-form-item   label="显示字段" prop="dkColumn">
+          <el-input  :disabled="true" v-model="info.dkColumn" placeholder="请输入显示字段" maxlength="50" />
         </el-form-item>
       </el-col>
       <el-col :span="12">
-        <el-form-item  label="输入字段" prop="filterConditions">
-          <el-input :disabled="true" v-model="info.filterConditions" placeholder="请输入输入字段" maxlength="50" />
+        <el-form-item  label="输入字段" prop="akColumn">
+          <el-input :disabled="true" v-model="info.akColumn" placeholder="请输入输入字段" maxlength="50" />
         </el-form-item>
       </el-col>
       <el-col :span="12">
-        <el-form-item   label="主键" prop="filterConditions">
-          <el-input :disabled="true" v-model="info.filterConditions" placeholder="请输入主键" maxlength="50" />
+        <el-form-item   label="主键" prop="tablePrimaryKey">
+          <el-input :disabled="true" v-model="info.tablePrimaryKey" placeholder="请输入主键" maxlength="50" />
         </el-form-item>
       </el-col>
       <el-col :span="12">

ruoyi-ui/src/views/tool/gen/editTable.vue

@@ -13,48 +13,23 @@
             min-width="10%"
             :show-overflow-tooltip="true"
           />
-          <el-table-column label="字段描述" min-width="10%">
-            <template slot-scope="scope">
-              <el-input v-model="scope.row.columnComment"></el-input>
-            </template>
-          </el-table-column>
+          <el-table-column label="字段描述" align="center" prop="columnComment" min-width="10%"  />
           <el-table-column
             label="物理类型"
             prop="columnType"
             min-width="10%"
             :show-overflow-tooltip="true"
           />
-          <el-table-column label="Java类型" min-width="11%">
-            <template slot-scope="scope">
-              <el-select v-model="scope.row.javaType">
-                <el-option label="Long" value="Long" />
-                <el-option label="String" value="String" />
-                <el-option label="Integer" value="Integer" />
-                <el-option label="Double" value="Double" />
-                <el-option label="BigDecimal" value="BigDecimal" />
-                <el-option label="Date" value="Date" />
-              </el-select>
-            </template>
-          </el-table-column>
-          <el-table-column label="java属性" min-width="10%">
-            <template slot-scope="scope">
-              <el-input v-model="scope.row.javaField"></el-input>
-            </template>
-          </el-table-column>
-
-          <el-table-column label="插入" min-width="5%">
-            <template slot-scope="scope">
-              <el-checkbox true-label="1" v-model="scope.row.isInsert"></el-checkbox>
-            </template>
-          </el-table-column>
-          <el-table-column label="编辑" min-width="5%">
+          <el-table-column label="字段显示规则" align="center" prop="mask" min-width="11%"/>
+          <el-table-column label="排序" min-width="5%" align="center" prop="sort"/>
+          <el-table-column label="输入字段" min-width="10%">
             <template slot-scope="scope">
-              <el-checkbox true-label="1" v-model="scope.row.isEdit"></el-checkbox>
+              <el-checkbox true-label="1" v-model="scope.row.isIn"></el-checkbox>
             </template>
           </el-table-column>
-          <el-table-column label="列表" min-width="5%">
+          <el-table-column label="显示字段" min-width="10%">
             <template slot-scope="scope">
-              <el-checkbox true-label="1" v-model="scope.row.isList"></el-checkbox>
+              <el-checkbox true-label="1" v-model="scope.row.isOut"></el-checkbox>
             </template>
           </el-table-column>
           <el-table-column label="查询" min-width="5%">
@@ -62,54 +37,17 @@
               <el-checkbox true-label="1" v-model="scope.row.isQuery"></el-checkbox>
             </template>
           </el-table-column>
-          <el-table-column label="查询方式" min-width="10%">
-            <template slot-scope="scope">
-              <el-select v-model="scope.row.queryType">
-                <el-option label="=" value="EQ" />
-                <el-option label="!=" value="NE" />
-                <el-option label=">" value="GT" />
-                <el-option label=">=" value="GTE" />
-                <el-option label="<" value="LT" />
-                <el-option label="<=" value="LTE" />
-                <el-option label="LIKE" value="LIKE" />
-                <el-option label="BETWEEN" value="BETWEEN" />
-              </el-select>
-            </template>
-          </el-table-column>
+          <el-table-column label="关联HR字段" min-width="10%" align="center" prop="hrParentId"/>
+          <el-table-column label="缺省值" min-width="10%" align="center" prop="defaultValue"/>
+          <el-table-column label="外键" min-width="10%" align="center" prop="foreignKey"/>
           <el-table-column label="必填" min-width="5%">
             <template slot-scope="scope">
               <el-checkbox true-label="1" v-model="scope.row.isRequired"></el-checkbox>
             </template>
           </el-table-column>
-          <el-table-column label="显示类型" min-width="12%">
-            <template slot-scope="scope">
-              <el-select v-model="scope.row.htmlType">
-                <el-option label="文本框" value="input" />
-                <el-option label="文本域" value="textarea" />
-                <el-option label="下拉框" value="select" />
-                <el-option label="单选框" value="radio" />
-                <el-option label="复选框" value="checkbox" />
-                <el-option label="日期控件" value="datetime" />
-                <el-option label="图片上传" value="imageUpload" />
-                <el-option label="文件上传" value="fileUpload" />
-                <el-option label="富文本控件" value="editor" />
-              </el-select>
-            </template>
-          </el-table-column>
-          <el-table-column label="字典类型" min-width="12%">
-            <template slot-scope="scope">
-              <el-select v-model="scope.row.dictType" clearable filterable placeholder="请选择">
-                <el-option
-                  v-for="dict in dictOptions"
-                  :key="dict.dictType"
-                  :label="dict.dictName"
-                  :value="dict.dictType">
-                  <span style="float: left">{{ dict.dictName }}</span>
-                  <span style="float: right; color: #8492a6; font-size: 13px">{{ dict.dictType }}</span>
-              </el-option>
-              </el-select>
-            </template>
-          </el-table-column>
+          <el-table-column label="显示类型" min-width="12%" align="center" prop="htmlType"/>
+          <el-table-column label="字典类型" min-width="12%" align="center" prop="dictType"/>
+            
         </el-table>
       </el-tab-pane>
       <el-tab-pane label="生成信息" name="genInfo">