页面更新

ruoyi-ui/src/components/DynamicForms/index.vue

@@ -1,59 +1,69 @@
 <template>
-    <el-form-item :label="formConfig.columnComment" style="display: inline-block;" :prop="formConfig.columnName">
-      <!-- 输入框 -->
-      <el-input v-if="formConfig.htmlType == 'input'" v-model="config[formConfig.columnName]" :placeholder="'请输入'+formConfig.columnComment"
-        clearable @keyup.enter.native="handleQuery" />
-      <!-- 多行输入框 -->
-      <el-input v-if="formConfig.htmlType == 'textarea'" type="textarea" v-model="config[formConfig.columnName]" :placeholder="'请输入'+formConfig.columnComment"
-        clearable @keyup.enter.native="handleQuery" />
-      <!-- 下拉框 -->
-      <el-select v-model="config[formConfig.columnName]" v-if="formConfig.htmlType == 'select'" filterable :placeholder="'请输入'+formConfig.columnComment">
-        <el-option v-for="itemChild in formConfig.sysDictData" :key="itemChild.dictValue" :label="itemChild.dictLabel" :value="itemChild.dictValue">
-        </el-option>
-      </el-select>
-      <!-- 复选框 -->
-      <el-checkbox-group v-model="config" v-if="formConfig.htmlType == 'checkbox'">
-        <el-checkbox @change="handleCheckedCitiesChange" v-for="itemChild in formConfig.sysDictData" :label="itemChild.dictValue" :key="itemChild.dictLabel" >
-          {{itemChild.dictLabel}}
-        </el-checkbox>
-      </el-checkbox-group>
-      <!-- 单选框 -->
-      <el-radio-group v-model="config[formConfig.columnName]" v-if="formConfig.htmlType == 'radio'">
-        <el-radio v-for="itemChild in formConfig.sysDictData" :key="itemChild.dictValue" :label="itemChild.dictValue">{{itemChild.dictLabel}}</el-radio>
-      </el-radio-group>
-      <!-- 时间控件 -->
-      <el-date-picker  v-model="config[formConfig.columnName]" v-if="formConfig.htmlType == 'datetime'" type="date" :placeholder="'请输入'+formConfig.columnComment">
-      </el-date-picker>
-      <!-- 上传图片 -->
-      <el-upload v-if="formConfig.htmlType == 'imageUpload'" :headers="{Authorization: 'Bearer ' + getToken()}" :action="process + '/boman-file/upload'" :file-list="config" list-type="picture-card"
-        :on-preview="handlePictureCardPreview" :on-success="upImageFn" :on-remove="reseImage" >
-        <i class="el-icon-plus"></i>
-      </el-upload>
-      <el-dialog :visible.sync="dialogVisible" v-if="formConfig.htmlType == 'imageUpload'">
-        <img width="100%" :src="dialogImageUrl" alt="">
-      </el-dialog>
-      <!-- 上传文件 -->
-      <el-upload
-        class="upload-demo"
-        :headers="{Authorization: 'Bearer ' + getToken()}"
-        v-if="formConfig.htmlType == 'fileUpload'"
-        :action="process + '/boman-file/upload'"
-        :on-change="handleChange"
-        :on-success="upImageFn"
-         :on-remove="reseImage"
-        :file-list="config">
-        <el-button size="small" type="primary">点击上传</el-button>
-        <div slot="tip" class="el-upload__tip">只能上传jpg/png文件，且不超过500kb</div>
-      </el-upload>
-      <!-- 富文本 -->
-      <editor v-model="config[formConfig.columnName]" v-if="formConfig.htmlType == 'editor'" :min-height="192"/>
-    </el-form-item>
+  <el-form-item :label="formConfig.columnComment" style="display: inline-block;" :prop="formConfig.columnName">
+    <!-- 输入框 -->
+    <el-input v-if="formConfig.htmlType == 'input'" v-model="config[formConfig.columnName]" :placeholder="'请输入'+formConfig.columnComment"
+      clearable @keyup.enter.native="handleQuery" />
+    <!-- 多行输入框 -->
+    <el-input v-if="formConfig.htmlType == 'textarea'" type="textarea" v-model="config[formConfig.columnName]"
+      :placeholder="'请输入'+formConfig.columnComment" clearable @keyup.enter.native="handleQuery" />
+    <!-- 下拉框 -->
+    <el-select v-model="config[formConfig.columnName]" v-if="formConfig.htmlType == 'select'&&(!formConfig.fkInfo.fkTableName)"
+      filterable :placeholder="'请输入'+formConfig.columnComment">
+      <el-option v-for="itemChild in formConfig.sysDictData" :key="itemChild.dictValue" :label="itemChild.dictLabel"
+        :value="itemChild.dictValue">
+      </el-option>
+    </el-select>
+    <!-- 下拉框搜索 -->
+    <el-select v-model="config[formConfig.columnName]" v-if="formConfig.htmlType == 'select'&&(formConfig.fkInfo.fkTableName)"
+      multiple filterable remote reserve-keyword :remote-method="remoteMethod" :loading="loading" :placeholder="'请输入'+formConfig.columnComment">
+      <el-option v-for="itemChild in filterList" :key="itemChild.dictValue" :label="itemChild.dictLabel" :value="itemChild.dictValue">
+      </el-option>
+    </el-select>
+    <!-- 复选框 -->
+    <el-checkbox-group v-model="config" v-if="formConfig.htmlType == 'checkbox'">
+      <el-checkbox @change="handleCheckedCitiesChange" v-for="itemChild in formConfig.sysDictData" :label="itemChild.dictValue"
+        :key="itemChild.dictLabel">
+        {{itemChild.dictLabel}}
+      </el-checkbox>
+    </el-checkbox-group>
+    <!-- 单选框 -->
+    <el-radio-group v-model="config[formConfig.columnName]" v-if="formConfig.htmlType == 'radio'">
+      <el-radio v-for="itemChild in formConfig.sysDictData" :key="itemChild.dictValue" :label="itemChild.dictValue">{{itemChild.dictLabel}}</el-radio>
+    </el-radio-group>
+    <!-- 时间控件 -->
+    <el-date-picker v-model="config[formConfig.columnName]" v-if="formConfig.htmlType == 'datetime'" type="date"
+      :placeholder="'请输入'+formConfig.columnComment">
+    </el-date-picker>
+    <!-- 上传图片 -->
+    <el-upload v-if="formConfig.htmlType == 'imageUpload'" :headers="{Authorization: 'Bearer ' + getToken()}" :action="process + '/boman-file/upload'"
+      :file-list="config" list-type="picture-card" :on-preview="handlePictureCardPreview" :on-success="upImageFn"
+      :on-remove="reseImage">
+      <i class="el-icon-plus"></i>
+    </el-upload>
+    <el-dialog :visible.sync="dialogVisible" v-if="formConfig.htmlType == 'imageUpload'">
+      <img width="100%" :src="dialogImageUrl" alt="">
+    </el-dialog>
+    <!-- 上传文件 -->
+    <el-upload class="upload-demo" :headers="{Authorization: 'Bearer ' + getToken()}" v-if="formConfig.htmlType == 'fileUpload'"
+      :action="process + '/boman-file/upload'" :on-change="handleChange" :on-success="upImageFn" :on-remove="reseImage"
+      :file-list="config">
+      <el-button size="small" type="primary">点击上传</el-button>
+      <div slot="tip" class="el-upload__tip">只能上传jpg/png文件，且不超过500kb</div>
+    </el-upload>
+    <!-- 富文本 -->
+    <editor v-model="config[formConfig.columnName]" v-if="formConfig.htmlType == 'editor'" :min-height="192" />
+  </el-form-item>
 </template>
 
 <script>
   const defaultSettings = require('@/settings.js')
   import Editor from '@/components/Editor';
-  import { getToken } from "@/utils/auth";
+  import {
+    listIndexfou
+  } from "@/api/tool/gen";
+  import {
+    getToken
+  } from "@/utils/auth";
   export default {
     data() {
       return {
@@ -63,7 +73,18 @@
         process: process.env.VUE_APP_BASE_API,
         dialogVisible: false,
         disabled: false,
+        loading: false,
+        filterList: [],
         config: {},
+        aliemg: {
+          table: '',
+          orderBy: 'create_time desc',
+          pageNo: 1,
+          pageSize: 10,
+          fixedData: {
+            condition: {}
+          }
+        },
       }
     },
     components: {
@@ -82,68 +103,86 @@
       this.config = {}
       this.init()
     },
-    mounted() {
-    },
+    mounted() {},
     methods: {
-      upImageFn(res, file){
-        this.config.push(res.data);
-        console.log(this.config,12153)
-      },
-      init() {
-        if(this.formConfig.htmlType == 'checkbox' || this.formConfig.htmlType == 'imageUpload' || this.formConfig.htmlType == 'fileUpload'){
-          this.config =  []
-        }else{
-          this.$set(this.config, this.formConfig.columnName,(this.formConfig.columnValue || ''))
-        }
-      },
-      handleChange(file, fileList) {
-        this.fileList = fileList.slice(-3);
-      },
-      getToken() {
-        return getToken()
-      },
-      reseImage(file, fileList) {
-        let urls = ""
-        if(file.response){
-          urls = file.response.url
-        }else{
-          urls = file.url
-        }
-        for (let i = this.config.length - 1; i >= 0; i--) {
-          if (this.config[i].url == urls) {
-            this.config.splice(i, 1);
+      listIndexfouFn() {
+        listIndexfou(this.aliemg).then(response => {
+              if (response.data) {
+                // this.tableDataalid = response.data.tableHeadList;
+                this.options = response.data
+              }
+              this.loading = false;
+            })
+          },
+          remoteMethod(query) {
+            if (query !== '') {
+              this.loading = true;
+              this.aliemg.fixedData.condition[this.formConfig.fkInfo.dkColumnName] = query
+              this.listIndexfouFn()
+            } else {
+              this.options = [];
+            }
+          },
+          upImageFn(res, file) {
+            this.config.push(res.data);
+          },
+          init() {
+            if (this.formConfig.htmlType == 'checkbox' || this.formConfig.htmlType == 'imageUpload' || this.formConfig.htmlType ==
+              'fileUpload') {
+              this.config = []
+            } else {
+              this.$set(this.config, this.formConfig.columnName, (this.formConfig.columnValue || ''))
+            }
+            this.aliemg.table = this.formConfig.fkInfo.fkTableName
+          },
+          handleChange(file, fileList) {
+            this.fileList = fileList.slice(-3);
+          },
+          getToken() {
+            return getToken()
+          },
+          reseImage(file, fileList) {
+            let urls = ""
+            if (file.response) {
+              urls = file.response.url
+            } else {
+              urls = file.url
+            }
+            for (let i = this.config.length - 1; i >= 0; i--) {
+              if (this.config[i].url == urls) {
+                this.config.splice(i, 1);
+              }
+            }
+          },
+          reseImage1(file, fileList) {
+            let urls = ""
+            if (file.response) {
+              urls = file.response.url
+            } else {
+              urls = file.url
+            }
+            for (let i = this.config.length - 1; i >= 0; i--) {
+              if (this.config[i].url == urls) {
+                this.config.splice(i, 1);
+              }
+            }
+          },
+          handlePictureCardPreview(file) {
+            this.dialogImageUrl = file.url;
+            this.dialogVisible = true;
+          },
+          handleDownload(file) {
+            console.log(file);
+          },
+          handleQuery() {
+            this.$emit('btns')
+          },
+          handleCheckedCitiesChange(value) {
+            console.log(this.config)
           }
-        }
-      },
-      reseImage1(file, fileList) {
-        let urls = ""
-        if(file.response){
-          urls = file.response.url
-        }else{
-          urls = file.url
-        }
-        for (let i = this.config.length - 1; i >= 0; i--) {
-          if (this.config[i].url == urls) {
-            this.config.splice(i, 1);
-          }
-        }
-      },
-      handlePictureCardPreview(file) {
-        this.dialogImageUrl = file.url;
-        this.dialogVisible = true;
-      },
-      handleDownload(file) {
-        console.log(file);
-      },
-      handleQuery() {
-        this.$emit('btns')
-      },
-      handleCheckedCitiesChange(value){
-        console.log(this.config)
       }
     }
-  }
 </script>
 
 <style>
-</style>
+</style>

ruoyi-ui/src/settings.js

@@ -1,8 +1,9 @@
 module.exports = {
   title: '潜山市云数据中心',
 
-  urls: `http://192.168.101.11:8090`,
+  // urls: `http://192.168.101.11:8090`,
   // urls: `http://192.168.101.110:8090`,
+  urls: `http://192.168.101.10:8090`,
   // urls: `http://192.168.101.49:8080`,
 
   // urls: ``,

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

@@ -472,11 +472,6 @@
             message: "请输入字段描述",
             trigger: "blur"
           }],
-          regular: [{
-            required: true,
-            message: "请输入正则表达式",
-            trigger: "blur"
-          }],
           columnType: [{
             required: true,
             message: "请输入物理类型",
@@ -882,7 +877,7 @@
       },
       resetZd() {
         this.formZd = {
-
+          columnId: ''
         };
         this.resetForm("formZd");
       },