cloud-web-corejs 1.0.54-dev.252 → 1.0.54-dev.254

package/src/components/xform/form-render/index.vue

@@ -59,6 +59,7 @@
     <importDialog v-if="showImportDialog" :visiable.sync="showImportDialog" :param="importDialogOption"
                   :parentTarget="_self"></importDialog>
     <formDrawer v-if="showFormDrawer" :visiable.sync="showFormDrawer" :option="formDrawerOption"></formDrawer>
+    <fileReferenceDialog v-if="showFileReferenceDialog" :visiable.sync="showFileReferenceDialog" :option="fileReferenceDialogOption"></fileReferenceDialog>
   </div>
 </template>
 
@@ -76,7 +77,9 @@ export default {
     searchFormDialog: () => import("../../../components/xform/form-designer/form-widget/dialog/searchFormDialog.vue"),
     formDialog: () => import("../../../components/xform/form-designer/form-widget/dialog/formDialog.vue"),
     importDialog: () => import("../../../components/xform/form-designer/form-widget/dialog/importDialog.vue"),
-    formDrawer: () => import("../../../components/xform/form-designer/form-widget/dialog/formDrawer.vue")
+    formDrawer: () => import("../../../components/xform/form-designer/form-widget/dialog/formDrawer.vue"),
+    fileReferenceDialog: () => import("../../../components/xform/form-designer/form-widget/dialog/fileReferenceDialog.vue")
+
   },
   mixins: [indexMixin],
 };

package/src/components/xform/form-render/indexMixin.js

@@ -190,7 +190,10 @@ modules = {
       bdService: null,
       globalParam: {},
       widgetEditOnWf: null,
-      wfModifyEnabled: false
+      wfModifyEnabled: false,
+
+      fileReferenceDialogOption: null,
+      showFileReferenceDialog:false,
     };
   },
   computed: {
@@ -549,8 +552,7 @@ modules = {
             this.hanldeWfWidgetNew1(widget)
             if (wfInfo.taskStep == "9999") {
               this.hanldeWfWidgetItemNew(widget)
-            }
-            else if (toModify) {
+            } else if (toModify) {
               //后台返回流程可以修改单据
               //设置组件的特定流程节点的可编辑，仅显示，隐藏
               if (taskDefinitionKey) {
@@ -2391,12 +2393,28 @@ modules = {
       }
     },
     validate(callback) {
-      this.$refs['renderForm'].$baseValidate(valid => {
-        /*if(!valid){
-          this.scrollToFirstError();
-        }*/
+      this.$refs['renderForm'].$baseValidate((valid, obj) => {
+        if (!valid) {
+          let message = null
+          let keys = Object.keys(obj);
+          if (keys.length) {
+            let item = obj[keys[0]];
+            if (item && item.length) {
+              message = item[0].message;
+            }
+          }
+          if (!message) {
+            message = this.$t2("必填项不能为空", "system.message.required");
+          }
+
+          this.$message({
+            message: message,
+            type: "error",
+            duration: 2000,
+          });
+        }
         callback && callback(valid);
-      })
+      }, {errorTip: false})
     },
     /*scrollToFirstError() {
       // 获取第一个验证失败的字段
@@ -2465,7 +2483,16 @@ modules = {
       this.formDrawerOption.confirm && this.formDrawerOption.confirm()
     },
 
-
+    openFileReferenceDialog(option) {
+      this.fileReferenceDialogOption = option;
+      this.showFileReferenceDialog = true;
+    },
+    confirmFileReferenceDialog() {
+      this.fileReferenceDialogOption.confirm && this.fileReferenceDialogOption.confirm()
+    },
+    getFormRef(){
+      return this;
+    }
   }
 };