Merge remote-tracking branch 'origin/master'

ruoyi-ui/src/api/modeler.js

@@ -0,0 +1,13 @@
+import request from '@/utils/request'
+
+// 流程模型列表
+export const getSearch = (data) => {
+  return request({
+    headers: {
+      'accountName': 'guest'
+    },
+    url: '/jflow/p/cs/module/search',
+    method: 'post',
+    data
+  })
+}

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

@@ -1,57 +1,57 @@
 <template>
-  <el-form-item :rules="rules" :label="formConfig.columnComment" style="display: inline-block;" :prop="formConfig.columnName">
+  <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" />
+      clearable @keyup.enter.native="handleQuery"  :disabled="formConfig.disabshow" />
     <!-- 多行输入框 -->
     <el-input v-if="formConfig.htmlType == 'textarea'" type="textarea" v-model="config[formConfig.columnName]"
-      :placeholder="'请输入'+formConfig.columnComment" clearable @keyup.enter.native="handleQuery" />
+      :placeholder="'请输入'+formConfig.columnComment" clearable @keyup.enter.native="handleQuery" :disabled="formConfig.disabshow"/>
     <!-- 下拉框 -->
     <el-select v-model="config[formConfig.columnName]" v-if="formConfig.htmlType == 'select'&&(!formConfig.fkInfo)"
-      filterable :placeholder="'请输入'+formConfig.columnComment">
+      filterable :placeholder="'请输入'+formConfig.columnComment" :disabled="formConfig.disabshow">
       <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 )"
+    <el-select :disabled="formConfig.disabshow" v-model="config[formConfig.columnName]" v-if="formConfig.htmlType == 'select'&&(formConfig.fkInfo)"
       filterable remote :remote-method="remoteMethod" :loading="loading" :placeholder="'请输入'+formConfig.columnComment">
       <el-option v-for="itemChild in filterList" :key="itemChild.table_id" :label="itemChild.table_name" :value="itemChild.table_id">
       </el-option>
     </el-select>
     <!-- 复选框 -->
-    <el-checkbox-group v-model="config" v-if="formConfig.htmlType == 'checkbox'">
+    <el-checkbox-group :disabled="formConfig.disabshow" 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-group :disabled="formConfig.disabshow" 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"
+    <el-date-picker :disabled="formConfig.disabshow" 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'"
+    <el-upload :disabled="formConfig.disabshow" 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'">
+    <el-dialog :disabled="formConfig.disabshow" :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'"
+    <el-upload :disabled="formConfig.disabshow" 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" />
+    <editor  :disabled="formConfig.disabshow" v-model="config[formConfig.columnName]" v-if="formConfig.htmlType == 'editor'" :min-height="192" />
   </el-form-item>
 </template>
 
@@ -91,12 +91,6 @@
       Editor
     },
     props: {
-      rules: {
-        type: Object,
-        required: true,
-        'default': {
-        }
-      },
       formConfig: {
         type: Object,
         required: true,
@@ -106,7 +100,19 @@
       },
     },
     created() {
-      this.config = {}
+      this.config = {}
+      // console.log(this.formConfig.mask.slice(3,4),876454)
+      console.log(this.formConfig.fkInfo)
+      if(this.formConfig.readonly == true){
+        this.formConfig.disabshow = true
+      }else if(this.formConfig.mask.slice(3,4) == '0'){
+        this.formConfig.disabshow = true
+      }else{
+        this.formConfig.disabshow = false
+      }
+      if(this.formConfig.fkInfo == null){
+          this.formConfig.fkInfo=false
+      }
       this.init()
     },
     watch: {

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

@@ -16,7 +16,7 @@
     <!-- 下拉框搜索 -->
     <el-select :disabled="formConfig.disabshow" v-model="config[formConfig.columnName]" v-if="formConfig.htmlType == 'select'&&(formConfig.fkInfo)"
       filterable remote :remote-method="remoteMethod" :loading="loading" :placeholder="'请输入'+formConfig.columnComment">
-      <el-option v-for="itemChild in filterList" :key="itemChild.table_id" :label="itemChild.table_name" :value="itemChild.table_id">
+      <el-option v-for="itemChild in filterList" :key="itemChild.id" :label="itemChild.table_name" :value="itemChild.id">
       </el-option>
     </el-select>
     <!-- 复选框 -->
@@ -97,21 +97,27 @@
         'default': {
           sysDictData: []
         }
+      },
+      type: {
+        type: Number,
+        default: 1
       },
     },
     created() {
       this.config = {}
       // console.log(this.formConfig.mask.slice(3,4),876454)
       console.log(this.formConfig.fkInfo)
-      if(this.formConfig.readonly == true){
-        this.formConfig.disabshow = true
-      }else if(this.formConfig.mask.slice(3,4) == '0'){
-        this.formConfig.disabshow = true
-      }else{
-        this.formConfig.disabshow = false
-      }
-      if(this.formConfig.fkInfo == null){
-          this.formConfig.fkInfo=false
+      if(this.type){
+        if(this.formConfig.readonly == true){
+          this.formConfig.disabshow = true
+        }else if(this.formConfig.mask.slice(3,4) == '0'){
+          this.formConfig.disabshow = true
+        }else{
+          this.formConfig.disabshow = false
+        }
+        if(this.formConfig.fkInfo == null){
+            this.formConfig.fkInfo=false
+        }
       }
       this.init()
     },

ruoyi-ui/src/views/activiti/modeler/index.vue

@@ -82,7 +82,12 @@ import FormItemComponent from '@/components/FormItemComponent';
 import ItemComponent from '@/components/ItemComponent';
 import StandardTable from '@/components/StandardTable';
 import listModalComponent from '@/components/listModalComponent'
+import {
+    getSearch
+  } from '@/api/modeler.js'
+
 // import router from '../config/router.config'
+
 import {  mapMutations,mapState } from 'vuex';
 export default {
   name:'TemplateManagementLists',
@@ -225,31 +230,32 @@ export default {
       let obj = Object.assign({},this.searchData)
       delete obj.createTime
       delete obj.status
-      // this.$network.post('/p/cs/module/search', obj).then((res) => {
-      //   if(res.data.resultCode !== 0){
-      //     return
-      //   }
-      //   let data = res.data.data
-      //   this.total = data.total
+      getSearch(obj).then((res) => {
+        if(res.data.resultCode !== 0){
+          return
+        }
+        let data = res.data.data
+        this.total = data.total
 
-      //   this.listsConfig = data.records.reduce((arr,item) => {
-      //     let items = {
-      //       event:{
-      //         queryLists:() => {
-      //           this.queryLists()
-      //         }
-      //       }
-      //     }
-      //     items = Object.assign(items,item)
-      //     arr.push({
-      //       row:1,
-      //       col:1,
-      //       component:listModalComponent,
-      //       item:items
-      //     })
-      //     return arr
-      //   },[])
-      // });
+        this.listsConfig = data.records.reduce((arr,item) => {
+          let items = {
+            event:{
+              queryLists:() => {
+                this.queryLists()
+              }
+            }
+          }
+          items = Object.assign(items,item)
+          arr.push({
+            row:1,
+            col:1,
+            component:listModalComponent,
+            item:items
+          })
+          return arr
+        },[])
+        console.log(this.listsConfig,9998)
+      });
     },
     addTemplate () {  //新建模版
       this.changeKeepAliveArray(['TemplateManagementLists'])

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

@@ -366,7 +366,7 @@
     <!-- 快速搜索对话框 -->
     <el-dialog :close-on-click-modal="false" :title="titleopenquery" :visible.sync="openquery" width="1200px" append-to-body>
       <el-form ref="formquery" @row-dblclick="dbSelectedZd" :model="formquery" :rules="rules" label-width="100px">
-          <dynamic-forms :ref="item.columnName" :config="formquery.fixedData" @inputs = "changeFn" :formConfig="item" v-for="(item,index) in queryData.queryList" :key='index' />
+          <dynamic-forms :type='0' :ref="item.columnName" :config="formquery.fixedData" @inputs = "changeFn" :formConfig="item" v-for="(item,index) in queryData.queryList" :key='index' />
       <el-form-item style="display: inline-block;">
         <el-button type="primary"   @click="handleQuery">搜索</el-button>
         <el-button   @click="openquery = false">取消</el-button>