formui-vue2-vistastory 0.1.53 → 0.2.0

package/FormUiForm.vue

@@ -88,7 +88,7 @@
                         <!--:min="-99999" :max="99999"-->
                          <el-input-number v-model="ruleFormMoney[fieldItem.name]"
                                           controls-position="right"
-
+                                          @blur="handleBlur"
                                           :controls="false"
                                           :disabled="fieldItem.disabled"></el-input-number>
                     </span>
@@ -289,37 +289,49 @@ export default {
 //          console.log('imagePath=' + imagePath)
 //          console.log('imageUrl=' + imageUrl)
       },
-    // 提交
-    submitForm (formName) {
-//      console.log(this.queryParams)
-      let that = this
+      formatRuleForm(){
+//        从money date等数据像form表更新
+          let that = this
 
 //        alert(that.formuiFields.length)
 //        console.log(that.formuiFields)
-        for(let i=0;i< that.formuiFields.length;i++){
-          let fieldItem=that.formuiFields[i]
+          for(let i=0;i< that.formuiFields.length;i++){
+              let fieldItem=that.formuiFields[i]
 //          alert(fieldItem.name)
-            if(fieldItem.valueType=='MONEY'){
+
+              if(fieldItem.valueType=='MONEY'){
 //                alert(mathUtil.methods.mul)
-              if(that.ruleFormMoney[fieldItem.name]){
-                that.ruleForm[fieldItem.name]=mathUtil.mul(that.ruleFormMoney[fieldItem.name],100)
-              }
+                  if(that.ruleFormMoney[fieldItem.name]||that.ruleFormMoney[fieldItem.name]===0){
+                      //
+//                      console.log('try set money')
+                      that.ruleForm[fieldItem.name]=mathUtil.mul(that.ruleFormMoney[fieldItem.name],100)
+                  }
 
-            }else if(fieldItem.valueType=='DATETIME'){
+              }else if(fieldItem.valueType=='DATETIME'){
 //                alert(1)
 //                alert(that.ruleFormTime[fieldItem.name])
 //                that.ruleForm[fieldItem.name]=that.ruleFormTime[fieldItem.name]
-            }
+              }
 
-        }
+          }
 
-        for(let i=0;i< that.formuiFields.length;i++){
-            let fieldItem=that.formuiFields[i]
-            if(fieldItem.bindColumn&&this.getIsHide(fieldItem,that.ruleForm)==false){
+          for(let i=0;i< that.formuiFields.length;i++){
+              let fieldItem=that.formuiFields[i]
+              if(fieldItem.bindColumn&&this.getIsHide(fieldItem,that.ruleForm)==false){
 
-                this.$set(that.ruleForm,fieldItem.bindColumn,that.ruleForm[fieldItem.name])
-            }
-        }
+                  this.$set(that.ruleForm,fieldItem.bindColumn,that.ruleForm[fieldItem.name])
+              }
+          }
+
+      },
+    // 提交
+    submitForm (formName) {
+//      console.log(this.queryParams)
+      let that = this
+
+//        alert(that.formuiFields.length)
+//        console.log(that.formuiFields)
+        this.formatRuleForm()
 //        alert(4444)
 //        alert(this.$refs[formName].validate())
         try{
@@ -408,6 +420,10 @@ export default {
 //          console.log(that.rules)
 //          return rules
       },
+      handleBlur(){
+//          console.log('input_blur')
+          this.formatRuleForm()
+      },
       getIsHide(fieldItem,ruleForm){
 
           if(fieldItem.pre&&fieldItem.pre.length>0){

package/FormUiSimpleFormDialog.vue

@@ -0,0 +1,162 @@
+<template>
+  <div class="hf-form-ui-form">
+    <el-dialog
+        v-model="dialogVisible"
+        v-bind:title="title"
+        width="30%"
+        v-on:before-close="handleClose">
+      <FormUiForm v-if="loadSuccess"
+                  ref="FormUiFormRef"
+                  v-bind:removeFileds="removeFields"
+                  v-bind:ruleFormSrc="ruleForm"
+                  v-bind:autoSubmit="autoSubmit"
+                  v-bind:beanName="simpleFormResp.beanName"
+                  v-on:submitForm="submitFormObj">
+      </FormUiForm>
+    </el-dialog>
+  </div>
+</template>
+<script>
+import FormUiForm from './FormUiForm.vue'
+import formuiService from './service/formui/FormuiService.js'
+import httpUtil from './service/base/httpUtil.js'
+import { ElMessage } from 'element-plus'
+import {useRoute} from 'vue-router'
+
+export default {
+  name: 'FormUiSimpleForm',
+  props: {
+    simpleFormName: String,
+    id: String,
+    formData: Object,   //用于编辑的编辑格式
+    title: String,
+    autoSubmit: Boolean,
+  },
+  components: {FormUiForm},
+  data() {
+    return {
+      loadSuccess: false,
+      ruleForm: {},
+      simpleFormResp: {},
+      removeFields: '',
+      formDataCurrent: {},
+      queryParams: {},
+      dialogVisible: false,
+      simpleFormPath: ''
+    }
+  },
+  created () {
+    this.simpleFormPath = formuiConfig.simpleFormPath
+    Object.keys(this.$route.query).forEach(key => {
+      this.queryParams[key] = this.$route.query[key]
+    })
+
+    this.loadData()
+  },
+  mounted() {
+    let params = {}
+    params['methodName'] = this.simpleFormName;
+
+    if (this.formData && this.formData['id']) {
+      params['id'] = this.formData['id']
+    }
+
+    this.formDataCurrent = {}
+    for (var name in this.formData) {
+      this.formDataCurrent[name] = this.formData[name]
+    }
+
+    this.dialogVisible = true
+  },
+  methods: {
+    submitFormObj (formObj) {
+      formObj.fuTableName = this.tableName
+      if (this.simpleFormResp.method === 'POST') {
+        httpUtil.httpPost(ENV.VITE_API_PREFIX + '/table/process_simple_table_form', formObj, (res) => {
+          if (res.status.code !== 1) {
+            alert(res.status.msg) // 修改: ElMessage 改为 alert
+          } else {
+            this.$emit('submitCallback', res)
+            this.$emit('closeDialog')
+            alert('提交完成.') // 修改: ElMessage 改为 alert
+          }
+        }, (err) => {
+          console.error('err post' + err)
+          alert('提交错误，需要调试.') // 修改: ElMessage 改为 alert
+        })
+      } else if (this.simpleFormResp.method === 'GET') {
+        console.log('暂不支持get')
+      } else if (this.simpleFormResp.method === 'PUT') {
+        httpUtil.httpPut(ENV.VITE_API_PREFIX + '/table/process_simple_table_form', formObj, (res) => {
+          if (res.status.code !== 1) {
+            alert(res.status.msg) // 修改: ElMessage 改为 alert
+          } else {
+            this.$emit('submitCallback', res)
+            this.$emit('closeDialog')
+            alert('提交完成.') // 修改: ElMessage 改为 alert
+          }
+        }, (err) => {
+          console.error('err put' + err)
+          alert('提交错误，需要调试.') // 修改: ElMessage 改为 alert
+        })
+      } else if (this.simpleFormResp.method === 'DELETE') {
+        httpUtil.httpDelete(ENV.VITE_API_PREFIX + '/table/process_simple_table_form', formObj, (res) => {
+          this.$emit('submitCallback', res)
+          this.$emit('closeDialog')
+          alert('删除完成.') // 修改: ElMessage 改为 alert
+        }, (err) => {
+          console.error('err post' + err)
+          alert('删除错误，需要调试.') // 修改: ElMessage 改为 alert
+        })
+      }
+    },
+    handleClose (done) {
+      done()
+      this.$emit('closeDialog')
+    },
+    loadData() {
+      let param = { 'tableName': this.tableName, 'runType': this.runType }
+      if (this.runType === 'EDIT') {
+        param['id'] = this.formData['id']
+      }
+      if (this.runType === 'DELETE') {
+        param['id'] = this.formData['id']
+      }
+      formuiService.getTableSimpleForm(param, (resp) => {
+        this.simpleFormResp = resp
+        this.removeFields = resp.removeFields.split(',')
+        if (this.autoSubmit === true) {
+          this.ruleForm['id'] = resp.dataObj['id']
+          this.submitFormObj(this.ruleForm)
+          return
+        }
+        if (resp.dataObj) {
+          this.ruleForm = resp.dataObj
+        } else {
+          this.ruleForm = {}
+          let formDataCurrent = {}
+          for (var name in this.formData) {
+            formDataCurrent[name] = this.formData[name]
+          }
+          for (var name in formDataCurrent) {
+            if (formDataCurrent[name] || formDataCurrent[name] === '' || formDataCurrent[name] === 0) {
+              if (typeof formDataCurrent[name] === 'number') {
+                this.ruleForm[name] = formDataCurrent[name]
+              } else if (Date.parse(formDataCurrent[name]).toString() !== 'NaN') {
+                this.ruleForm[name] = formDataCurrent[name]
+              } else if (formDataCurrent[name].indexOf(',') === -1 && parseFloat(formDataCurrent[name]).toString() !== 'NaN') {
+                this.ruleForm[name] = parseFloat(formDataCurrent[name])
+              } else if (formDataCurrent[name].indexOf(',') !== -1) {
+                this.ruleForm[name] = formDataCurrent[name]
+              } else {
+                this.ruleForm[name] = formDataCurrent[name]
+              }
+            }
+          }
+        }
+        this.loadSuccess = true
+      })
+    }
+  }
+}
+</script>

package/FormUiSimpleTable.vue

@@ -0,0 +1,192 @@
+<template>
+  <div>
+  <div v-if="addSimpleFormName">
+    <el-button v-on:click="showDialog(addSimpleFormName,'新增')" v-bind:text="true" size="small">新增</el-button>
+  </div>
+
+  <FormUiQueryParam
+      ref="formUiSimpleTableRef"
+      v-if="tableConfig&&tableConfig.isQuery==1"
+      v-bind:beanName="tableConfig.queryName"
+      v-bind:removeFileds="[]"
+      v-bind:queryParams="queryParams"
+      v-bind:fieldGroupType="1"
+      v-on:updateQueryParams="updateQueryParams"
+      v-on:search="queryData">
+    <template v-slot:btns="slotProps">
+    </template>
+  </FormUiQueryParam>
+  <FormUiTable
+      v-if="tableConfig"
+      ref="formUiTableRef"
+      v-bind:methodName="tableConfig.tableName"
+      v-bind:isMenu="true"
+      v-bind:isFilter="tableConfig.isFilter==1"
+      v-bind:pageSize="5"
+      v-bind:editSimpleFormName="tableConfig.isBtnEdit==1?'editForm':''"
+      v-bind:addSimpleFormName="tableConfig.isBtnAdd==1?tableConfig.addFormName:''"
+      v-bind:deleteSimpleFormName="tableConfig.isBtnDel==1?'removeForm':''">
+  </FormUiTable>
+  </div>
+</template>
+<script>
+
+import formuiService from './service/formui/FormuiService.js'
+import FormUiTable from './FormUiTable.vue'
+import formuiConfig from './formuiConfig.js'
+
+
+export default {
+  props: {
+    tableName: String,
+    isMenu: {
+      type: Boolean,
+      default: false
+    },
+    isFilter: {
+      type: Boolean,
+      default: false
+    },
+    editSimpleFormName: String,
+    deleteSimpleFormName: String,
+    addSimpleFormName: String,
+    pageSize: {
+      type: Number,
+      default: 20
+    }
+  },
+  components: {
+    FormUiTable
+  },
+  data() {
+    return {
+      tableConfig: null,
+      simpleFormPath: '',
+      queryParams: {}
+    }
+  },
+  created() {
+    this.simpleFormPath = formuiConfig.simpleFormPath
+  },
+  mounted() {
+    Object.keys(this.$route.query).forEach(key => {
+      this.queryParams[key] = this.$route.query[key]
+    })
+
+    this.loadData()
+  },
+  beforeRouteUpdate(to) {
+    this.queryParams.pageNo = to.query.pageNo
+    this.loadData()
+  },
+  methods: {
+    handleCurrentChange(data) {
+      this.queryParams.pageNo = data - 1
+      this.goByParam()
+    },
+    goByParam() {
+      delete this.queryParams.methodName
+      this.$router.push({
+        query: this.queryParams
+      })
+    },
+    queryData(queryParams) {
+      if (queryParams) {
+        this.queryParams = queryParams
+      }
+
+      this.$refs['formUiTableRef'].loadData(this.queryParams)
+    },
+    loadData(queryParamsUpdate) {
+      if (queryParamsUpdate) {
+        this.queryParams = queryParamsUpdate
+      }
+
+      this.queryParams['tableName'] = this.$route.query.tableName
+
+      if (this.tableName) {
+        this.queryParams['tableName'] = this.tableName
+      }
+
+      formuiService.getFormUiSimpleTable(this,this.queryParams, (resp) => {
+        console.log('resp', resp)
+        this.tableConfig = resp
+      }, (err) => {})
+    },
+    filterClear() {
+      for (let i = 0; i < this.formuiTableRowList.length; i++) {
+        if (typeof this.formuiTableRowList[i]['isShow'] === 'undefined') {
+          this.formuiTableRowList[i].isShow = true
+        }
+        if (!this.formuiTableRowList[i].isShow && this.formuiTableRowList[i].isShow === false) {
+          this.formuiTableRowList[i].isShow = true
+        }
+      }
+      this.formuiTableRowFilterList = this.formuiTableRowList
+    },
+    filterCellValue() {
+      if (!this.queryParams.filter) {
+        this.filterClear()
+        return
+      }
+      let filterArr = this.queryParams.filter.split(' ')
+      console.log('filter:', filterArr)
+      this.formuiTableRowFilterList = []
+      for (let i = 0; i < this.formuiTableRowList.length; i++) {
+        let showNum = 0
+        outj:
+        for (let k = 0; k < filterArr.length; k++) {
+          if (filterArr[k] === '') {
+            showNum++
+            continue outj
+          }
+          for (let j = 0; j < this.formuiFieldList.length; j++) {
+            if (this.formuiTableRowList[i].tableCellList[j].formatValue.indexOf(filterArr[k]) !== -1) {
+              showNum++
+              continue outj
+            }
+          }
+        }
+        if (showNum === filterArr.length) {
+          this.formuiTableRowFilterList.push(this.formuiTableRowList[i])
+        }
+      }
+    },
+    checkDel(rowId) {
+      if (confirm('确认删除?') === false) {
+        return false
+      }
+      this.simpleFormAutoSubmit = true
+      this.showSimpleForm = 1
+      this.simpleFormTitle = '删除'
+      if (!rowId) {
+        console.error('异常，无id')
+        return
+      } else {
+        this.simpleFormId = rowId
+      }
+      this.simpleFormName = this.deleteSimpleFormName
+    },
+    showDialog(formName, title, rowId) {
+      this.simpleFormAutoSubmit = false
+      this.showSimpleForm = 1
+      this.simpleFormName = formName
+      this.simpleFormTitle = title
+      if (!rowId) {
+        this.simpleFormId = null
+      } else {
+        this.simpleFormId = rowId
+      }
+    },
+    closeDialog() {
+      console.log('closeDialog2---------------------')
+      this.showSimpleForm = 0
+      this.tableConfig=null
+    },
+    submitCallback() {
+      console.log('submitCallback---------------------')
+      this.loadData()
+    }
+  }
+}
+</script>

package/FormUiSimpleTableFormDialog.vue

@@ -0,0 +1,156 @@
+<template>
+  <div class="hf-form-ui-form">
+
+    <el-dialog
+        :visible.sync="dialogVisible"
+        v-bind:title="title"
+        width="80%"
+        :before-close="handleClose">
+
+      <FormUiForm v-if="loadSuccess"
+                  ref="FormUiFormRef"
+                  v-bind:removeFileds="removeFields"
+                  v-bind:ruleFormSrc="ruleForm"
+                  v-bind:autoSubmit="autoSubmit"
+                  v-bind:beanName="simpleFormResp.beanName"
+                  v-on:submitForm="submitFormObj">
+      </FormUiForm>
+    </el-dialog>
+  </div>
+</template>
+<script>
+import FormUiForm from './FormUiForm.vue'
+import formuiService from './service/formui/FormuiService'
+import httpUtil from './service/base/httpUtil'
+import formuiConfig from './formuiConfig.js'
+
+export default {
+  components:{FormUiForm},
+  props: {
+    simpleFormName: String,
+    id: String,
+    formData: Object,   //用于编辑的编辑格式
+    title: String,
+    autoSubmit: Boolean,
+    tableName: String,
+    runType: String
+  },
+  data() {
+    return {
+      dialogVisible:true,
+      loadSuccess: false,
+      ruleForm: {},
+      simpleFormResp: {},
+      removeFields: '',
+      queryParams:{}
+    }
+  },
+  created() {
+    // alert(1)
+    this.simpleFormPath = formuiConfig.simpleFormPath
+  },
+  mounted() {
+    // alert(2)
+    Object.keys(this.$route.query).forEach(key => {
+      this.queryParams[key] = this.$route.query[key]
+    })
+
+    this.loadData()
+  },
+  beforeDestroy() {
+    console.log('----onBeforeUnmount-tableformDialog----')
+    this.loadSuccess = false
+  },
+  methods: {
+    submitFormObj(formObj) {
+      formObj.fuTableName = this.tableName
+      if (this.simpleFormResp.method === 'POST') {
+        httpUtil.httpPost(ENV.VITE_API_PREFIX + '/table/process_simple_table_form', formObj, (res) => {
+          if (res.status.code !== 1) {
+            alert(res.status.msg) // 修改: ElMessage 改为 alert
+          } else {
+            this.$emit('submitCallback', res)
+            this.$emit('closeDialog')
+            alert('提交完成.') // 修改: ElMessage 改为 alert
+          }
+        }, (err) => {
+          console.error('err post' + err)
+          alert('提交错误，需要调试.') // 修改: ElMessage 改为 alert
+        })
+      } else if (this.simpleFormResp.method === 'GET') {
+        console.log('暂不支持get')
+      } else if (this.simpleFormResp.method === 'PUT') {
+        httpUtil.httpPut(ENV.VITE_API_PREFIX + '/table/process_simple_table_form', formObj, (res) => {
+          if (res.status.code !== 1) {
+            alert(res.status.msg) // 修改: ElMessage 改为 alert
+          } else {
+            this.$emit('submitCallback', res)
+            this.$emit('closeDialog')
+            alert('提交完成.') // 修改: ElMessage 改为 alert
+          }
+        }, (err) => {
+          console.error('err put' + err)
+          alert('提交错误，需要调试.') // 修改: ElMessage 改为 alert
+        })
+      } else if (this.simpleFormResp.method === 'DELETE') {
+        httpUtil.httpDelete(ENV.VITE_API_PREFIX + '/table/process_simple_table_form', formObj, (res) => {
+          this.$emit('submitCallback', res)
+          this.$emit('closeDialog')
+          alert('删除完成.') // 修改: ElMessage 改为 alert
+        }, (err) => {
+          console.error('err post' + err)
+          alert('删除错误，需要调试.') // 修改: ElMessage 改为 alert
+        })
+      }
+    },
+    handleClose(done) {
+      done()
+      this.$emit('closeDialog')
+      console.log('closeDialog---from dialog')
+    },
+    loadData() {
+      let param = { 'tableName': this.tableName, 'runType': this.runType }
+      if (this.runType === 'EDIT') {
+        param['id'] = this.formData['id']
+      }
+      if (this.runType === 'DELETE') {
+        param['id'] = this.formData['id']
+      }
+      formuiService.getTableSimpleForm(this,param, (resp) => {
+        this.simpleFormResp = resp
+        this.removeFields = resp.removeFields.split(',')
+        if (this.autoSubmit === true) {
+          this.ruleForm['id'] = resp.dataObj['id']
+          this.submitFormObj(this.ruleForm)
+          return
+        }
+        if (resp.dataObj) {
+          this.ruleForm = resp.dataObj
+        } else {
+          this.ruleForm = {}
+          let formDataCurrent = {}
+          for (var name in this.formData) {
+            formDataCurrent[name] = this.formData[name]
+          }
+          for (var name in formDataCurrent) {
+            if (formDataCurrent[name] || formDataCurrent[name] === '' || formDataCurrent[name] === 0) {
+              if (typeof formDataCurrent[name] === 'number') {
+                this.ruleForm[name] = formDataCurrent[name]
+              } else if (Date.parse(formDataCurrent[name]).toString() !== 'NaN') {
+                this.ruleForm[name] = formDataCurrent[name]
+              } else if (formDataCurrent[name].indexOf(',') === -1 && parseFloat(formDataCurrent[name]).toString() !== 'NaN') {
+                this.ruleForm[name] = parseFloat(formDataCurrent[name])
+              } else if (formDataCurrent[name].indexOf(',') !== -1) {
+                this.ruleForm[name] = formDataCurrent[name]
+              } else {
+                this.ruleForm[name] = formDataCurrent[name]
+              }
+            }
+          }
+        }
+        this.loadSuccess = true
+      })
+    }
+  }
+}
+</script>

package/FormUiTable.vue

@@ -0,0 +1,236 @@
+
+<template>
+  <!--格式化表格中的cell，因为有些数据比较难格式化，如枚举，和需子表查询，如通过id显示名字-->
+<div>
+  <div v-if="addSimpleFormName">
+    <el-button v-on:click="showDialog(addSimpleFormName,'新增','ADD')" v-bind:text="true" size="small">新增</el-button>
+  </div>
+  <div style="padding: 10px 0;" v-if="isFilter">
+    过滤：<el-input v-model="queryParams.filter" placeholder="输入关键字进行过滤" size="small" clearable style="width: 200px;" v-on:keyup="filterCellValue()"></el-input>
+  </div>
+  <el-table
+      v-bind:border="true"
+      v-bind:data="formuiTableRowFilterList"
+      style="width: 100%">
+    <el-table-column v-for="(fieldItem,fieldIndex) in formuiFieldList"
+                     v-bind:label="fieldItem.title" :key="fieldItem.id">
+      <template v-slot:default="scope">
+        <slot
+            v-bind:name="'cell_'+fieldItem.name"
+            v-bind:value="scope.row.tableCellList[fieldIndex].value"
+            v-bind:formatValue="scope.row.tableCellList[fieldIndex].formatValue">
+          {{scope.row.tableCellList[fieldIndex].formatValue}}
+        </slot>
+      </template>
+    </el-table-column>
+    <el-table-column
+        v-if="isMenu"
+        fixed="right"
+        label="操作">
+      <template v-slot:default="scope">
+        <slot name="menu" v-bind:scope="scope.row">
+        </slot>
+        <el-button v-if="editSimpleFormName" v-on:click="showDialog(editSimpleFormName,'编辑','EDIT',scope.row.id)" v-bind:text="true" size="small">编辑</el-button>
+        <el-button v-if="deleteSimpleFormName" v-on:click="checkDel(scope.row.id)" v-bind:text="true" size="small">删除</el-button>
+      </template>
+    </el-table-column>
+  </el-table>
+  <el-pagination
+      layout="prev, pager, next"
+      v-bind:total="page.rsCount"
+      v-bind:page-size="page.pageSize"
+      v-bind:current-page="parseInt(queryParams.pageNo)+1"
+      v-on:current-change="handleCurrentChange">
+  </el-pagination>
+
+
+  <div class="table-dialog" v-if="showSimpleForm==1">
+
+
+    <FormUiSimpleTableFormDialog
+        v-if="showSimpleForm==1"
+        v-bind:formData="{id:simpleFormId}"
+        v-bind:tableName="formTableName"
+        v-bind:runType="formRunType"
+        v-bind:title="simpleFormTitle"
+        v-bind:autoSubmit="simpleFormAutoSubmit"
+        v-on:closeDialog="closeDialog"
+        v-on:submitCallback="submitCallback">
+    </FormUiSimpleTableFormDialog>
+  </div>
+</div>
+</template>
+<script>
+
+import formuiService from './service/formui/FormuiService'
+import ossService from './service/base/OssService'
+import FormUiSimpleTableFormDialog from './FormUiSimpleTableFormDialog.vue'
+
+import formuiConfig from './formuiConfig'
+
+export default {
+  props: {
+    methodName: String,
+    isMenu: {
+      type: Boolean,
+      default: false
+    },
+    isFilter: {
+      type: Boolean,
+      default: false
+    },
+    editSimpleFormName: String,
+    deleteSimpleFormName: String,
+    addSimpleFormName: String,
+    pageSize: {
+      type: Number,
+      default: 20
+    }
+  },
+  components:{FormUiSimpleTableFormDialog},
+  data() {
+    return {
+      simpleFormPath: '',
+      formuiFieldList: [],
+      formuiTableRowList: [],
+      formuiTableRowFilterList: [],
+      routeQuery: this.$route.query,
+      page: { rsCount: 0, pageNo: 0, pageSize: 0 },
+      queryParams: {},
+      showSimpleForm: 0,
+      simpleFormName: '',
+      simpleFormTitle: '',
+      simpleFormAutoSubmit: false,
+      formTableName: '',
+      formRunType: ''
+    }
+  },
+  created() {
+    this.simpleFormPath = formuiConfig.simpleFormPath
+  },
+  mounted() {
+    this.queryParams['pageNo'] = 0
+    this.queryParams['pageSize'] = this.pageSize
+
+    Object.keys(this.$route.query).forEach(key => {
+      this.queryParams[key] = this.$route.query[key]
+    })
+
+    ossService.initOssUrl(this,this.loadData)
+  },
+  beforeRouteUpdate(to) {
+    this.queryParams.pageNo = to.query.pageNo
+    this.loadData()
+  },
+  methods: {
+    handleCurrentChange(data) {
+      this.queryParams.pageNo = data - 1
+      this.goByParam()
+    },
+    goByParam() {
+      delete this.queryParams.methodName
+      this.$router.push({
+        query: this.queryParams
+      })
+    },
+    loadData(queryParamsUpdate) {
+      if (this,this.$route.query['methodName'] && this.$route.query['methodName'] !== this.methodName) {
+        alert('你使用了受保护参数methodName:' + this.$route.query['methodName'])
+        return
+      }
+
+      if (queryParamsUpdate) {
+        this.queryParams = queryParamsUpdate
+      }
+
+      this.queryParams['methodName'] = this.methodName
+
+      formuiService.getFormUiTable(this,this.queryParams, (resp) => {
+        if (resp) {
+          this.formuiFieldList = resp.formuiFieldList
+          this.formuiTableRowList = resp.formuiTableRowList
+          this.page = resp.page
+          this.filterClear()
+        }
+      }, (err) => {})
+    },
+    filterClear() {
+      for (let i = 0; i < this.formuiTableRowList.length; i++) {
+        if (typeof this.formuiTableRowList[i]['isShow'] === 'undefined') {
+          this.formuiTableRowList[i].isShow = true
+        }
+        if (!this.formuiTableRowList[i].isShow && this.formuiTableRowList[i].isShow === false) {
+          this.formuiTableRowList[i].isShow = true
+        }
+      }
+      this.formuiTableRowFilterList = this.formuiTableRowList
+    },
+    filterCellValue() {
+      if (!this.queryParams.filter) {
+        this.filterClear()
+        return
+      }
+      let filterArr = this.queryParams.filter.split(' ')
+      console.log('filter:', filterArr)
+      this.formuiTableRowFilterList = []
+      for (let i = 0; i < this.formuiTableRowList.length; i++) {
+        let showNum = 0
+        outj:
+        for (let k = 0; k < filterArr.length; k++) {
+          if (filterArr[k] === '') {
+            showNum++
+            continue outj
+          }
+          for (let j = 0; j < this.formuiFieldList.length; j++) {
+            if (this.formuiTableRowList[i].tableCellList[j].formatValue.indexOf(filterArr[k]) !== -1) {
+              showNum++
+              continue outj
+            }
+          }
+        }
+        if (showNum === filterArr.length) {
+          this.formuiTableRowFilterList.push(this.formuiTableRowList[i])
+        }
+      }
+    },
+    checkDel(rowId) {
+      if (confirm('确认删除?') === false) {
+        return false
+      }
+      this.simpleFormAutoSubmit = true
+      this.showSimpleForm = 1
+      this.simpleFormTitle = '删除'
+      this.formRunType = 'DELETE'
+      this.formTableName = this.methodName
+      if (!rowId) {
+        console.error('异常，无id')
+        return
+      } else {
+        this.simpleFormId = rowId
+      }
+      this.simpleFormName = this.deleteSimpleFormName
+    },
+    showDialog(formName, title, formRunType, rowId) {
+      this.simpleFormAutoSubmit = false
+      this.showSimpleForm = 1
+      this.simpleFormName = formName
+      this.simpleFormTitle = title
+      this.formTableName = this.methodName
+      this.formRunType = formRunType
+      if (!rowId) {
+        this.simpleFormId = null
+      } else {
+        this.simpleFormId = rowId
+      }
+    },
+    closeDialog() {
+      console.log('closeDialog---------------------')
+      this.showSimpleForm = 0
+    },
+    submitCallback() {
+      console.log('submitCallback---------------------')
+      this.loadData()
+    }
+  }
+}
+</script>

package/formuiConfig.js

@@ -0,0 +1,10 @@
+/**
+ * Created by wslhk on 2022/4/19.
+ */
+let formuiConfig={
+    simpleFormPath:''
+}
+
+export default {
+    simpleFormPath:formuiConfig.simpleFormPath
+}

package/index.js

@@ -3,6 +3,9 @@ import FormUiForm from './FormUiForm.vue'
 import FormUiQueryParam from './FormUiQueryParam.vue'
 import FormUiTableCell from './FormUiTableCell.vue'
 import FormUiSimpleForm from './FormUiSimpleForm.vue'
+import FormUiTable from './FormUiTable.vue'
+import FormUiSimpleTable from './FormUiSimpleTable.vue'
+import formuiConfig from './formuiConfig.vue'
 
 
 export default {
@@ -12,6 +15,8 @@ export default {
         Vue.component('FormUiQuery', FormUiQueryParam)
         Vue.component('FormUiTableCell', FormUiTableCell)
         Vue.component('FormUiSimpleForm', FormUiSimpleForm)
-
+        Vue.component('FormUiTable', FormUiTable)
+        Vue.component('FormUiSimpleTable', FormUiSimpleTable)
+        Vue.component('formuiConfig', formuiConfig)
     }
 }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "formui-vue2-vistastory",
-  "version": "0.1.53",
+  "version": "0.2.0",
   "description": "formui-vue2-vistastory",
   "author": "vistastory <vistastory@126.com>",
   "private": false,

package/service/base/OssService.js

@@ -11,5 +11,44 @@ export default {
         error(err)
       }
     })
+  },
+  getFormuiConfig(that,params,callback,error){
+    // console.log('--------------------')
+    // console.log(ENV)
+    httpUtil.httpGet(that,'/formui/oss/get_formui_config', params,function (res) {
+      callback(res)
+    },function (err) {
+      console.log('err get' + err)
+      if(error){
+        error(err)
+      }
+    })
+  },
+  initOssUrl(that,callback){
+
+// alert(callback)
+    let formuiOssUrl=localStorage.getItem('formuiOssUrl');
+    if(formuiOssUrl){
+      // callback(formuiOssUrl)
+      if(callback){
+        callback()
+      }
+
+    }else{
+      this.getFormuiConfig(that,{},function (resp) {
+        // callback(resp.configMap.ossUrl)
+        localStorage.setItem('formuiOssUrl',resp.configMap.ossUrl)
+        if(callback){
+          callback()
+        }
+      })
+    }
+    // localStorage
+  },
+  getOssUrl(){
+
+// alert(callback)
+    let formuiOssUrl=localStorage.getItem('formuiOssUrl');
+    return formuiOssUrl;
   }
 }

package/service/formui/FormuiService.js

@@ -52,5 +52,36 @@ export default {
             }
         })
     },
+    getTableSimpleForm(that,params,callback,error){
+        httpUtil.httpGet(that,'/formui/table/get_formui_table_form', params,function (res) {
+            callback(res)
+        },function (err) {
+            console.log('err get' + err)
+            if(error){
+                error(err)
+            }
+        })
+    },
+    getFormUiTable(that,params,callback,error){
 
+        httpUtil.httpGet(that,'/formui/get_formui_table', params,function (res) {
+            callback(res)
+        },function (err) {
+            console.log('err get' + err)
+            if(error){
+                error(err)
+            }
+        })
+    },
+    getFormUiSimpleTable(that,params,callback,error){
+
+        httpUtil.httpGet(that,'/formui/get_formui_simple_table', params,function (res) {
+            callback(res)
+        },function (err) {
+            console.log('err get' + err)
+            if(error){
+                error(err)
+            }
+        })
+    },
 }

package/widget/FormUiForeignByBean.vue

@@ -0,0 +1,153 @@
+<template>
+    <!--管理员列表-->
+    <div>
+        <!--[begin]-->
+<!--{{fieldValue}}-->
+        <!--:multiple="multipleSrc"-->
+        <!--{{fieldItem.valueType}}-->
+        <!--[a1]-->
+        <!--{{state.selectItems}}-->
+        <el-select
+                :validate-event="validate"
+                @change="changeSelect"
+                v-model="fieldValueSrc"
+                filterable
+                reserve-keyword
+                placeholder="请选择"
+
+                :disabled="disabled"
+                :multiple="multipleSrc||fieldItem.valueType=='CHECKBOX'"
+
+        >
+            <el-option v-if="!selectItems||selectItems.length==0"
+                    :label="defaultLabelStr"
+                       value="" >
+            </el-option>
+            <el-option v-for="item in selectItems"
+                    :label="item.title"
+                    :value="item.id" :key="item.id">
+            </el-option>
+            <!--<el-option-->
+                    <!--label="非主库"-->
+                    <!--:value="0">-->
+            <!--</el-option>-->
+        </el-select>
+        <!--[a2]-->
+        <!--{{defaultLabelStr}}___-->
+        <!--{{selectItems}}-->
+        <!--[end]-->
+        <!--{{props.fieldItem}}-->
+
+    </div>
+</template>
+
+<script>
+    import formuiService from '../service/formui/FormuiService'
+    import moment from 'moment'
+
+    export default {
+        props: {
+            beanName: String,
+            fieldName: String,
+            fieldValue: [Object, String, Number],
+            defaultLabel: String,
+            multiple: Boolean,
+            fieldItem: Object,
+            formData: Object,
+            disabled: Boolean,
+        },
+        data() {
+            return {
+                validate: false,
+                defaultLabelStr: '请选择',
+                selectItems: [],
+                fieldValueSrc: '',
+                title: '',
+                multipleSrc: false,
+                jsonList: [],
+            }
+        },
+        mounted() {
+            // 值转换
+            if (Array.isArray(this.fieldValue)) {
+                // 数组直接赋值
+                this.fieldValueSrc = (this.fieldValue)
+            } else if ((this.fieldValue && Number.isInteger(this.fieldValue) == false
+                    && this.fieldValue.indexOf(',') != -1) || this.fieldItem.valueType == 'CHECKBOX') {
+                // 包含，的字符串
+                let arr = []
+                if (this.fieldValue) {
+                    arr = (this.fieldValue + '').split(",");
+                }
+                this.fieldValueSrc = []
+                for (var i = 0; i < arr.length; i++) {
+                    if (arr[i] === '') {
+                        continue;
+                    }
+                    this.fieldValueSrc.push(parseInt(arr[i]))
+                }
+
+            } else if ((this.fieldValue || this.fieldValue === 0) && isNaN(this.fieldValue) == false) {
+                // 非空数字
+                this.fieldValueSrc = parseInt(this.fieldValue)
+            }
+
+            if (this.multiple) {
+                // 是否支多选,目前checkbox为多选
+                this.multipleSrc = this.multiple
+            }
+
+            if (this.defaultLabel) {
+                this.defaultLabelStr = this.defaultLabel
+            }
+
+            if (this.fieldItem.joinItems) {
+                let jsonObj = {}
+                for (var i = 0; i < this.fieldItem.joinItems.length; i++) {
+                    jsonObj = {}
+                    let parentFieldName = this.fieldItem.joinItems[i].parentFieldName
+                    let joinFieldName = this.fieldItem.joinItems[i].joinFieldName
+                    let value = this.fieldItem.joinItems[i].value
+                    jsonObj['parentFieldName'] = parentFieldName
+                    jsonObj['joinFieldName'] = joinFieldName
+                    jsonObj['value'] = value
+
+                    if (parentFieldName && this.formData) {
+                        if (this.formData[parentFieldName] || this.formData[parentFieldName] === 0) {
+                            jsonObj['value'] = parseInt(this.formData[parentFieldName])
+                        }
+                    }
+
+                    this.jsonList.push(jsonObj)
+                }
+            }
+
+            this.loadData()
+        },
+        methods: {
+            loadData() {
+                formuiService.getFormuiForeignByBean({ beanName: this.beanName, fieldName: this.fieldName, value: this.formData['id'] }, (resp) => {
+                    this.selectItems = resp.selectItems
+                    this.fieldValueSrc = resp.values
+
+                    this.changeSelect()
+                    this.validate = true
+                })
+            },
+            changeSelect() {
+                this.$emit('setFieldValue', this.fieldName, this.fieldValueSrc.toString())
+            },
+            updateJsonList(jsonList) {
+                this.jsonList = jsonList
+                this.loadData();
+            }
+        },
+        expose: {
+            updateJsonList
+        }
+    }
+</script>
+
+<style scoped>
+
+</style>

package/widget/FormUiForeignSelect.vue

@@ -104,7 +104,10 @@
             if(Array.isArray(this.fieldValue)) {
                 this.fieldValueSrc = (this.fieldValue)
             }else if((this.fieldValue&&Number.isInteger(this.fieldValue)==false&&this.fieldValue.indexOf(',')!=-1)||this.fieldItem.valueType=='CHECKBOX'){
-                var arr=this.fieldValue.split(",");
+              var arr=[]
+              if(this.fieldValue){
+                arr=this.fieldValue.split(",");
+              }
                 this.fieldValueSrc=[]
                 for(var i=0;i<arr.length;i++){
                     if(arr[i]===''){

package/widget/FormUiRichText.vue

@@ -227,6 +227,9 @@
     }
 </script>
 
-<style scoped>
-
-</style>
+<style>
+.v-modal {
+    z-index: 200 !important;
+}
+.table-dialog .el-dialog__wrapper{z-index: 230 !important;}
+</style>