three-trees-ui 1.0.25 → 1.0.27

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "three-trees-ui",
-  "version": "1.0.25",
+  "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()
           }

package/packages/UserDialog/src/main.vue

@@ -18,6 +18,7 @@
       @search="handleSearch"
       @reset="handleReset"
       @page-change="handlePageChange"
+      @size-change="handleSizeChange"
       @contact-group-change="loadContactUser"
       @load-org-user="loadOrgUser"
       @load-policy-user="loadPolicyUser"
@@ -165,6 +166,10 @@
           }
         }
       },
+      handleSizeChange(size) {
+        this.pagination.pageSize = size
+        this.handleLoad(this.pagination.page)
+      },
       // 处理过滤类型变化的事件
       handleFilterTypeChange(type) {
         this.filterType = type

package/packages/UserSelector/src/UserSelectorDialog.vue

@@ -10,21 +10,27 @@
     top="3vh"
   >
     <div class="dialog-selector__body">
-      <el-input
-        v-model="searchWord"
-        size="small"
-        clearable
-        :placeholder="searchPlaceholder"
-        @clear="reset"
-        @keyup.enter.native="search"
-      >
-        <i
-          slot="prefix"
-          :title="t('ht.common.search')"
-          class="el-input__icon el-icon-search"
-          @click="search"
-        />
-      </el-input>
+      <div class="search-main">
+        <el-input
+          v-model="searchWord"
+          size="small"
+          clearable
+          :placeholder="searchPlaceholder"
+          @clear="reset"
+          @keyup.enter.native="search"
+        >
+          <i
+            slot="prefix"
+            :title="t('ht.common.search')"
+            class="el-input__icon el-icon-search"
+            @click="search"
+          />
+        </el-input>
+        <div class="right">
+          <el-button type="primary" size="mini" @click="search">搜索</el-button>
+          <el-button size="mini" @click="reset">重置</el-button>
+        </div>
+      </div>
       <ht-list-selector
         ref="selector"
         v-model="selectors"
@@ -290,6 +296,13 @@
       }
     }
     .dialog-selector__body {
+      .search-main {
+        display: flex;
+        .right {
+          display: flex;
+          margin-left: 15px;
+        }
+      }
       .el-icon-search {
         cursor: pointer;
       }

package/src/mixins/querySqlPreview.js

@@ -12,6 +12,7 @@ export default {
       fileList: [],
       tableData: { selectRows: [], querys: '' },
       dialogExportVisible: false,
+      isdefaultQuery: true,
       exportData: { getType: 'all', expField: [] },
       exportSellection: [],
       searchForm: {},
@@ -82,6 +83,11 @@ export default {
       handler(newVal) {
         if (newVal.shows) {
           let displayField = utils.parseToJson(newVal.shows)
+          let buttonsts = utils.parseToJson(newVal.buttons);
+          console.log(buttonsts)
+          if(buttonsts[0].isdefault == "1"){
+              this.isdefaultQuery = false
+          }
           for (var i = 0; i < displayField.length; i++) {
             if (displayField[i].hidden == 0) {
               this.displayFields.push(displayField[i])
@@ -553,7 +559,14 @@ export default {
     },
     //点击导出按钮
     exports() {
-      this.dialogExportVisible = true
+      if(this.isdefaultQuery){
+        this.dialogExportVisible = true
+      }else{
+        this.exportData.expField= JSON.parse(JSON.stringify(this.displayFields))
+        console.log(this.exportData)
+        this.submitExport()
+      }
+      
     },
     punchOrder() {
       this.$store