three-trees-ui 1.0.32 → 1.0.34

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "three-trees-ui",
-  "version": "1.0.32",
+  "version": "1.0.34",
   "publicPath": "/ui",
   "author": "hotent",
   "private": false,

package/packages/CustomDialog/src/customDialog.vue

@@ -527,6 +527,7 @@
         executeScriptResult: null,
         customDialogParams: {},
         treeDialogConfig: null,
+        isPreview: false,
       }
     },
     computed: {
@@ -608,7 +609,8 @@
         })
         return ids.join(',')
       },
-      showDialog(isMounted = false) {
+      showDialog(isMounted = false, isPreview = false) {
+        this.isPreview = isPreview
         this.fixedParams = {}
         // 如果已存在配置信息就不去请求配置信息 直接初始化数据
         if (this.dialogConfig) {
@@ -1122,8 +1124,12 @@
         let flag = false
         if (this.queryParams.length != 0 && this.queryParams[0] != '') {
           this.conditionBind.forEach((item, index) => {
-            if (item.isRequire == 1 && !this.queryParams[index][item.field]) {
-              this.$message.error(`${item.comment}必填`)
+            if (
+              item.isRequire == 1 &&
+              !this.queryParams[index][item.field] &&
+              !this.isPreview
+            ) {
+              !flag && this.$message.error(`${item.comment}必填`)
               flag = true
               return
             }
@@ -1161,6 +1167,7 @@
             }
           })
         }
+        this.isPreview = false
         if (flag) {
           return
         }

package/packages/CustomDialog/src/main.vue

@@ -412,7 +412,8 @@
         if (this.isMobile) {
           this.$refs.customMobileDialogRef.showDialog()
         } else {
-          this.$refs.customDialogRef.showDialog()
+          // 第二个参数是为了处理点击预览按钮时，不立即触发必传验证提示
+          this.$refs.customDialogRef.showDialog(false, true)
         }
       },
       removeSelectOrg(item) {

package/src/mixins/onlineSubtable.js

@@ -25,6 +25,12 @@ export default {
         return SubPagination.getPageOffset(datapath, this)
       }
     },
+    // 是否为待办单
+    isTodoForm() {
+      const types = ['MyDelegate', 'done', 'LeaderDone', 'request']
+      const type = this.$route.query.type || ''
+      return types.includes(type) || this.$route.query.readId
+    },
   },
   mounted() {
     // 如果当前表单的element为Comment说明表单加载失败了。