three-trees-ui 1.0.26 → 1.0.27

package/package.json

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

package/packages/CustomDialog/src/customDialog.vue

@@ -683,7 +683,7 @@
             var obj = {}
             //条件查询参数（用户输入的） 文本框输入 defaultType 1 用户输入 2固定值 3参数传入 5脚本
             if (ele.defaultType == '1') {
-              obj[ele.field] = ''
+              obj[ele.field] = ele.regularValue || ''
               queryParams.push(obj)
               // queryParams[ele.field] = "";
               this_.conditionBind.push(ele)
@@ -1122,6 +1122,11 @@
         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}必填`)
+              flag = true
+              return
+            }
             // 日期范围特殊处理
             if (item.dbType == 'date' && item.condition == 'BETWEEN') {
               if (

package/packages/Preview/src/FrameViewer.vue

@@ -2,6 +2,11 @@
   <div class="frame-container">
     <div class="frame-container__body">
       <loading v-if="loading" />
+      <img
+        v-else-if="contentType.indexOf('image') > -1"
+        :src="dataSrc"
+        class="frame-viewer__iframe"
+      />
       <iframe
         v-else
         id="myNormframe"
@@ -54,6 +59,7 @@
       return {
         dataSrc: null,
         loading: false,
+        contentType: '',
       }
     },
     mounted() {
@@ -71,7 +77,7 @@
           .then((response) => {
             const { data, headers } = response
             const type = headers['content-type']
-
+            this.contentType = type
             if (type) {
               if (window.navigator && window.navigator.msSaveBlob) {
                 //使用Blob构造函数可以直接在客户端上创建和操作Blob。msSaveBlob：只提供一个保存按钮
@@ -109,12 +115,12 @@
           return
         }
         if (iframe.attachEvent) {
-          iframe.attachEvent('onload', function () {
+          iframe.attachEvent('onload', function() {
             that.setFrameBody(this.contentWindow.document)
             that.watermarkRender()
           })
         } else {
-          iframe.onload = function () {
+          iframe.onload = function() {
             that.setFrameBody(this.contentWindow.document)
             that.watermarkRender()
           }