formui-vue2-vistastory 0.3.0 → 0.5.0

package/FormUiForm.vue

@@ -42,7 +42,7 @@
 <!--{{fieldItem.name}}_{{ruleForm[fieldItem.name]}}-->
                                     <!--v-bind:multiple="'DEFAULT'==fieldItem.valueType?true:false"-->
                         <component v-bind:is="'formUiStyleSelect'"
-                                   ref="formUiStyleSelect"
+                                   :ref="'formUiFieldRef_'+fieldItem.name"
                                     v-bind:inputType="fieldItem.valueType=='CHECKBOX'?'checkbox':'select'"
                                    v-bind:defaultLabel="'请选择'"
                                    v-bind:disabled="fieldItem.disabled"
@@ -57,7 +57,7 @@
                     <span v-else-if="fieldItem.foreignServiceClass!='FormUiForeignService'">
 
                         <component v-bind:is="'formUiForeignSelect'"
-                                   :ref="'formUiForeignSelect'+fieldItem.name"
+                                   :ref="'formUiFieldRef_'+fieldItem.name"
                                      v-bind:multiple="'DEFAULT'==fieldItem.valueType?true:false"
                                    v-bind:defaultLabel="'无'"
                                    v-bind:disabled="fieldItem.disabled"
@@ -240,6 +240,14 @@
 
         </el-form>
         </div>
+<!--      <FormUiFormValidate :ref="'fromValidate_'+props.beanName" @setFieldValue="setFieldValue" @submitFormFocus="submitForm(ruleFormRef)"></FormUiFormValidate>-->
+      <component
+          v-bind:is="'FormUiFormValidate'"
+          :ref="'fromValidate_'+beanName"
+          :formuiFields="formuiFields"
+          @submitFormFocus="submitForm('ruleForm')"
+          @setFieldValue="setFieldValue">
+      </component>
     </div>
 </template>
 
@@ -251,6 +259,7 @@
   import formUiForeignSelect from './widget/FormUiForeignSelect.vue'
   import FormUiFileUpload from './widget/FormUiFileUpload.vue'
   import FormUiRichText from './widget/FormUiRichText.vue'
+  import FormUiFormValidate  from './FormUiFormValidate.vue'
   import moment from 'moment'
 
 //  组件导入
@@ -260,7 +269,7 @@
 export default {
   name: 'FormUiForm',
     props: ['beanName','removeFileds','ruleFormSrc','btnTitle','labelWidth'],
-    components:{FormUiFileUpload,formUiStyleSelect,formUiForeignSelect,FormUiRichText},
+    components:{FormUiFileUpload,formUiStyleSelect,formUiForeignSelect,FormUiRichText,FormUiFormValidate},
     data () {
     return {
         labelWidthCurrent:'auto',
@@ -367,8 +376,8 @@ export default {
 //                          alert(1)
                           that.formuiFields[i].joinItems[j].value=value
 //                              console.log('formUiForeignSelect'+that.formuiFields[i].name+'<<<<')
-                          if(that.$refs['formUiForeignSelect'+that.formuiFields[i].name]){
-                              that.$refs['formUiForeignSelect'+that.formuiFields[i].name][0].updateJsonList(that.formuiFields[i].joinItems)
+                          if(that.$refs['formUiFieldRef_'+that.formuiFields[i].name]){
+                              that.$refs['formUiFieldRef_'+that.formuiFields[i].name][0].updateJsonList(that.formuiFields[i].joinItems)
 
                           }
 
@@ -383,9 +392,18 @@ export default {
 
           }
 
-
           this.loadSuccess=true
 
+          // let ctx2=getCurrentInstance()
+          // console.log('->',ctx,ctx2)
+          let refKey='formUiFieldRef_'+key;
+
+          if(that.$refs[refKey]){
+            that.$refs[refKey][0].setFieldValue(key,value)
+            // ctx.refs[refKey].method.setFieldValue(key,value)
+          }
+
+        // console.log('setValue_flag3')
           //手动验证
 //          let kv={}
 //          kv['publish']=value
@@ -473,6 +491,10 @@ export default {
           }
           this.inputVisible = false;
           this.inputValue = '';
+      },
+      validateRes (res,formObj) {
+        console.log('validateRes:')
+        return this.$refs['fromValidate_'+this.beanName].showValidateDialog(res,formObj)
       }
   },
 

package/FormUiFormValidate.vue

@@ -0,0 +1,108 @@
+<template>
+  <div class="form-ui-form-validate">
+    <el-dialog :visible.sync="state.dialogVilidate"  v-if="state.validateRes">
+      表单验证错误
+      <hr />
+      <div v-for="item in state.validateRes.validateItemList" :key="item.fieldName">
+        <table style="width:100%">
+          <tbody>
+            <tr>
+              <td>字段</td>
+              <td>填入值</td>
+              <td>消息</td>
+              <td>等级</td>
+            </tr>
+            <tr>
+              <td>
+                <span v-for="fieldItem in formuiFields" v-if="fieldItem.name==item.fieldName ">
+                  {{fieldItem.title}}({{fieldItem.name}})
+                </span>
+                </td>
+              <td>{{ state.formObj[item.fieldName] }}</td>
+              <td>{{ item.message }}</td>
+              <td>
+                <span v-if="item.validateStatus === 'warn'" style="color: orange">警告</span>
+                <span v-if="item.validateStatus === 'error'" style="color: red">错误</span>
+              </td>
+            </tr>
+          </tbody>
+        </table>
+      </div>
+      <hr />
+      <div style="padding: 10px 0;">
+        等级说明：<span style="color: orange">警告</span>为建议修改，<span style="color: red">错误</span>为必须修改
+      </div>
+
+      <br/>
+      <el-button @click="state.dialogVilidate = false"
+                 v-if="state.validateRes.validateStatus !== 'pass'">
+        返回修改
+      </el-button>
+      <el-button @click="submitFormObjFocus" type="warning"
+                 v-if="state.validateRes.validateStatus === 'warn'">
+        强行提交
+      </el-button>
+    </el-dialog>
+
+  </div>
+</template>
+
+<script>
+import FormUiForm from './FormUiForm.vue';
+// import formuiService from './service/formui/FormuiService.js';
+// import httpUtil from './service/base/httpUtil.js';
+
+export default {
+  name: 'FormUiFormValidate',
+  props: {
+    simpleFormName: String,
+    id: [String, Number],
+    formData: Object,
+    formuiFields: Object
+  },
+  components: {
+    FormUiForm
+  },
+  data() {
+    return {
+      route: null, // 如果有实际使用再初始化
+      state: {
+        ruleForm: {},
+        simpleFormResp: {},
+        removeFields: '',
+        dialogVilidate: false,
+        validateRes: null,
+        formObj: {}
+      }
+    };
+  },
+  methods: {
+    showValidateDialog(res, formObj) {
+      if (!res || !res.validateStatus ||res.validateStatus === 'pass') {
+        return true;
+      }
+      this.state.validateRes = res;
+      this.state.dialogVilidate = true;
+      this.state.formObj = formObj;
+      console.log('show---dialog')
+    },
+    submitFormObjFocus() {
+      this.$emit('setFieldValue', 'formuiValidationForcePass', 1);
+      this.$emit('submitFormFocus');
+      setTimeout(() => {
+        this.$emit('setFieldValue', 'formuiValidationForcePass', '');
+      }, 0);
+      this.state.dialogVilidate = false;
+    }
+  },
+  mounted() {
+    // 可以在这里调用 useRoute()
+    // 或者通过注入方式获取路由对象（需全局引入 vue-router 并注册）
+    // 示例：this.route = this.$route
+  }
+};
+</script>
+
+<style scoped>
+/* 保留原有样式 */
+</style>

package/FormUiSimpleForm.vue

@@ -4,7 +4,7 @@
 
         <component v-if="loadSuccess"
                    v-bind:is="'FormUiForm'"
-                   ref="FormUiForm"
+                   ref="FormUiFormRef"
                    v-bind:removeFileds="removeFields"
                    v-bind:ruleFormSrc="ruleForm"
                    v-bind:beanName="simpleFormResp.beanName"
@@ -45,6 +45,9 @@ export default {
 
           if(that.simpleFormResp.method=='POST'){
               httpUtil.httpPost(that,that.simpleFormResp.url, formObj,function (res) {
+                if(!that.$refs['FormUiFormRef'].validateRes(res,formObj)){
+                  return
+                }
                   that.$emit('submitCallback', res)
 //                  callback(res)
               },function (err) {
@@ -57,6 +60,9 @@ export default {
               alert('暂不支持get');
           }else if(that.simpleFormResp.method=='PUT'){
               httpUtil.httpPut(that,that.simpleFormResp.url, formObj,function (res) {
+                if(!that.$refs['FormUiFormRef'].validateRes(res,formObj)){
+                  return
+                }
                   that.$emit('submitCallback', res)
               },function (err) {
                   console.log('err get' + err)
@@ -65,6 +71,9 @@ export default {
                   }
               })
           }else if(that.simpleFormResp.method=='DELETE'){
+            if(!that.$refs['FormUiFormRef'].validateRes(res,formObj)){
+              return
+            }
             alert('暂不支持delete');
           }
 

package/FormUiSimpleTable.vue

@@ -113,6 +113,13 @@ export default {
         this.tableConfig = resp
       }, (err) => {})
     },
+    loadTableData(queryParamsUpdate) {
+      if (queryParamsUpdate) {
+        this.queryParams = queryParamsUpdate
+      }
+        this.$refs['formUiTableRef'].loadData(this.queryParams)
+
+    },
     filterClear() {
       for (let i = 0; i < this.formuiTableRowList.length; i++) {
         if (typeof this.formuiTableRowList[i]['isShow'] === 'undefined') {

package/FormUiSimpleTableFormDialog.vue

@@ -67,6 +67,9 @@ export default {
       formObj.fuTableName = this.tableName
       if (this.simpleFormResp.method === 'POST') {
         httpUtil.httpPost(that, '/formui/table/process_simple_table_form', formObj, (res) => {
+          if(!that.$refs['FormUiFormRef'].validateRes(res,formObj)){
+            return
+          }
           if (res.status.code !== 1) {
             alert(res.status.msg) // 修改: ElMessage 改为 alert
           } else {
@@ -82,6 +85,9 @@ export default {
         console.log('暂不支持get')
       } else if (this.simpleFormResp.method === 'PUT') {
         httpUtil.httpPut(that,  '/formui/table/process_simple_table_form', formObj, (res) => {
+          if(!that.$refs['FormUiFormRef'].validateRes(res,formObj)){
+            return
+          }
           if (res.status.code !== 1) {
             alert(res.status.msg) // 修改: ElMessage 改为 alert
           } else {
@@ -95,6 +101,9 @@ export default {
         })
       } else if (this.simpleFormResp.method === 'DELETE') {
         httpUtil.httpDelete(that, '/formui/table/process_simple_table_form', formObj, (res) => {
+          if(!that.$refs['FormUiFormRef'].validateRes(res,formObj)){
+            return
+          }
           that.$emit('submitCallback', res)
           that.$emit('closeDialog')
           alert('删除完成.') // 修改: ElMessage 改为 alert

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "formui-vue2-vistastory",
-  "version": "0.3.0",
+  "version": "0.5.0",
   "description": "formui-vue2-vistastory",
   "author": "vistastory <vistastory@126.com>",
   "private": false,
@@ -11,7 +11,7 @@
   "dependencies": {
     "tinymce-plugin-formatpainter":"^1.0.1",
     "axios": "^0.18.1",
-    "element-ui": "^2.15.10",
+    "element-ui": "^2.15.14",
     "js-md5": "^0.7.3",
     "moment": "^2.24.0",
     "qs": "^6.6.0",

package/widget/FormUiFileUpload.vue

@@ -193,7 +193,7 @@
         ossService.ostObjectPolicy(this,{
 //        'dir': window.UEDITOR_CONFIG.OSSDIR,
           'dir': this.dir,
-          'srcname': param.file.name
+          'srcname': encodeURIComponent(param.file.name)
         },function (resp) {
           var sign = resp;
           var form = new FormData();

package/widget/FormUiForeignSelect.vue

@@ -46,7 +46,11 @@
         methods: {
             changeSelect:function () {
 //              alert(22)
+//               console.log('change-select',this.fieldName+'->'+this.fieldValueSrc.toString())
+//               setTimeout( ()=>{
                 this.$emit('setFieldValue', this.fieldName, this.fieldValueSrc.toString())
+              // },1000)
+
             },
             updateJsonList:function(jsonList){
                 this.jsonList=jsonList
@@ -79,8 +83,23 @@
 //                    that.selectItems=resp.selectItems
 //                })
 //                this.isMainStore=field
+            },setFieldValue:function(key,value){
+              // console.log('select_setvalue',key,value)
+            if(value.indexOf(',')){
+              this.fieldValueSrc=[]
+
+              let valArr=value.split(',')
+              for(var i=0;i<valArr.length;i++){
+                this.fieldValueSrc.push(parseInt(valArr[i]))
+              }
+            }else{
+              this.fieldValueSrc=parseInt(value)
             }
 
+
+            // loadData()
+          }
+
         },
 
         data () {
@@ -101,6 +120,7 @@
             let that = this
 //            alert(that.beanName)
 
+          // console.log('this.fieldValue',this.fieldValue)
             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'){

package/widget/FormUiForeignStr.vue

@@ -44,7 +44,11 @@
 
                 })
 
-            }
+            },setFieldValue:function(key,value){
+
+            this.fieldValueSrc=(value)
+            // loadData()
+          }
 
         },
 

package/widget/FormUiRichText.vue

@@ -75,7 +75,7 @@
                 ossService.ostObjectPolicy(that,{
 //        'dir': window.UEDITOR_CONFIG.OSSDIR,
                     'dir': 'formui',
-                    'srcname': blobInfo.filename()
+                    'srcname': encodeURIComponent(blobInfo.filename())
                 },function (resp) {
 //                                            alert(22)
                     var sign = resp;

package/widget/FormUiStyleSelect.vue

@@ -113,6 +113,11 @@
 //                }
 
             },
+          setFieldValue:function(key,value){
+
+            this.fieldValueSrc=parseInt(value)
+            // loadData()
+          }
 
         },