three-trees-ui 1.0.31 → 1.0.32

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "three-trees-ui",
-  "version": "1.0.31",
+  "version": "1.0.32",
   "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 (
@@ -2109,10 +2114,8 @@
       height: 90%;
       min-height: 400px;
     }
-    @media (max-height: 960px) {
-      .el-dialog__body .el-container {
-        height: 100% !important;
-      }
+    .el-dialog__body .el-container {
+      height: 100% !important;
     }
     .el-divider--vertical {
       height: 100%;

package/packages/Preview/src/FrameViewer.vue

@@ -2,6 +2,12 @@
   <div class="frame-container">
     <div class="frame-container__body">
       <loading v-if="loading" />
+      <div
+        class="frame-viewer__img"
+        v-else-if="contentType.indexOf('image') > -1"
+      >
+        <img :src="dataSrc" />
+      </div>
       <iframe
         v-else
         id="myNormframe"
@@ -54,6 +60,7 @@
       return {
         dataSrc: null,
         loading: false,
+        contentType: '',
       }
     },
     mounted() {
@@ -71,7 +78,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 +116,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()
           }
@@ -144,7 +151,8 @@
       height: 100%;
     }
 
-    .frame-viewer__iframe {
+    .frame-viewer__iframe,
+    .frame-viewer__img {
       width: 100%;
       height: 100%;
       border: 0;
@@ -153,5 +161,10 @@
         height: auto;
       }
     }
+    .frame-viewer__img {
+      display: flex;
+      align-items: center;
+      justify-content: center;
+    }
   }
 </style>

package/packages/UserSelector/src/PolicyUser.vue

@@ -33,14 +33,14 @@
           { id: '3', name: '我的所有部门' },
           { id: '4', name: '我的所有部门及下属部门' },
         ],
-        currentPolicy: '',
+        currentPolicy: '1',
         currentUserOrgs: [],
       }
     },
     watch: {
       mode: function(newVal, oldVal) {
         if (newVal !== oldVal && newVal == 'search') {
-          this.currentPolicy = ''
+          this.currentPolicy = '1'
         }
       },
       currentPolicy: function(newVal, oldVal) {
@@ -49,6 +49,9 @@
         }
       },
     },
+    mounted() {
+      this.loadUserWithPolicy(this.currentPolicy)
+    },
     methods: {
       // 按照指定策略加载数据
       loadUserWithPolicy(policy) {
@@ -61,7 +64,7 @@
             this.$message.error(
               '未获取到当前用户的部门信息，无法按照该策略加载数据。'
             )
-            this.currentPolicy = ''
+            this.currentPolicy = '1'
           })
       },
       // 根据策略构建不同的查询参数

package/packages/UserSelector/src/UserSelectorDialog.vue

@@ -218,7 +218,7 @@
     data() {
       return {
         dialogVisible: false,
-        activeRange: 'contact',
+        activeRange: 'policy',
         searchWord: null,
         loading: false,
       }

package/packages/UserSelector/src/UserSelectorMobileDialog.vue

@@ -18,63 +18,128 @@
         @click="handleDialogClose"
       />
     </template>
-
-    <van-search
-      v-model="searchWord"
-      :placeholder="searchPlaceholder"
-      @input="onSearchInput"
-      @clear="reset"
-    />
-    <van-pull-refresh v-model="isLoading" @refresh="onRefresh">
-      <van-list
-        v-model="isLoading"
-        class="user-data__list"
-        :finished="finished"
-        finished-text="没有更多了"
-        @load="loadMore"
-      >
-        <van-checkbox-group v-model="selectIds">
-          <van-cell
-            v-for="item in data"
-            :key="item[primaryFieldProp]"
-            clickable
-            @click="rowClick(item, null, $event)"
+    <van-tabs
+      v-model="activeGroupVal"
+      :color="primaryColor"
+      @change="loadFilterGroup"
+    >
+      <van-tab title="我的主部门" name="myDep">
+        <van-search
+          v-model="searchWord"
+          :placeholder="searchPlaceholder"
+          @input="onSearchInput"
+          @clear="reset"
+        />
+        <van-pull-refresh v-model="isLoading" @refresh="onRefresh">
+          <van-list
+            v-model="isLoading"
+            class="user-data__list"
+            :finished="finished"
+            finished-text="没有更多了"
+            @load="loadMore"
           >
-            <template #icon>
-              <van-checkbox
-                :name="item[primaryFieldProp]"
-                :shape="single ? 'round' : 'square'"
-              />
-            </template>
-            <div class="user-list__container">
-              <ht-avatar-image
-                class="follow-theme-background-color"
-                :username="item[selectLabel]"
-                background-color="#409EFF"
-                color="#fff"
-                :size="36"
-              />
-              <div class="selector-item__detail">
-                <div class="selector-detail__name">
-                  <label>{{ item[selectLabel] }}</label>
-                  <span>({{ item['account'] }})</span>
+            <van-checkbox-group v-model="selectIds">
+              <van-cell
+                v-for="item in data"
+                :key="item[primaryFieldProp]"
+                clickable
+                @click="rowClick(item, null, $event)"
+              >
+                <template #icon>
+                  <van-checkbox
+                    :name="item[primaryFieldProp]"
+                    :shape="single ? 'round' : 'square'"
+                  />
+                </template>
+                <div class="user-list__container">
+                  <ht-avatar-image
+                    class="follow-theme-background-color"
+                    :username="item[selectLabel]"
+                    background-color="#409EFF"
+                    color="#fff"
+                    :size="36"
+                  />
+                  <div class="selector-item__detail">
+                    <div class="selector-detail__name">
+                      <label>{{ item[selectLabel] }}</label>
+                      <span>({{ item['account'] }})</span>
+                    </div>
+                    <div class="selector-detail__desc">
+                      <span :title="item.orgname">
+                        <ht-icon name="org-tree" />
+                        {{ item.orgname || '无' }}
+                      </span>
+                      <span :title="item.postname">
+                        <ht-icon name="users" />
+                        {{ item.postname || '无' }}
+                      </span>
+                    </div>
+                  </div>
                 </div>
-                <div class="selector-detail__desc">
-                  <span :title="item.orgname">
-                    <ht-icon name="org-tree" />
-                    {{ item.orgname || '无' }}
-                  </span>
-                  <span :title="item.postname">
-                    <ht-icon name="users" />
-                    {{ item.postname || '无' }}
-                  </span>
+              </van-cell>
+            </van-checkbox-group>
+          </van-list>
+        </van-pull-refresh>
+      </van-tab>
+      <van-tab title="所有用户" name="all">
+        <van-search
+          v-model="searchWord"
+          :placeholder="searchPlaceholder"
+          @input="onSearchInput"
+          @clear="reset"
+        />
+        <van-pull-refresh v-model="isLoading" @refresh="onRefresh">
+          <van-list
+            v-model="isLoading"
+            class="user-data__list"
+            :finished="finished"
+            finished-text="没有更多了"
+            @load="loadMore"
+          >
+            <van-checkbox-group v-model="selectIds">
+              <van-cell
+                v-for="item in data"
+                :key="item[primaryFieldProp]"
+                clickable
+                @click="rowClick(item, null, $event)"
+              >
+                <template #icon>
+                  <van-checkbox
+                    :name="item[primaryFieldProp]"
+                    :shape="single ? 'round' : 'square'"
+                  />
+                </template>
+                <div class="user-list__container">
+                  <ht-avatar-image
+                    class="follow-theme-background-color"
+                    :username="item[selectLabel]"
+                    background-color="#409EFF"
+                    color="#fff"
+                    :size="36"
+                  />
+                  <div class="selector-item__detail">
+                    <div class="selector-detail__name">
+                      <label>{{ item[selectLabel] }}</label>
+                      <span>({{ item['account'] }})</span>
+                    </div>
+                    <div class="selector-detail__desc">
+                      <span :title="item.orgname">
+                        <ht-icon name="org-tree" />
+                        {{ item.orgname || '无' }}
+                      </span>
+                      <span :title="item.postname">
+                        <ht-icon name="users" />
+                        {{ item.postname || '无' }}
+                      </span>
+                    </div>
+                  </div>
                 </div>
-              </div>
-            </div>
-          </van-cell>
-        </van-checkbox-group>
-      </van-list>
-    </van-pull-refresh>
+              </van-cell>
+            </van-checkbox-group>
+          </van-list>
+        </van-pull-refresh>
+      </van-tab>
+    </van-tabs>
   </van-action-sheet>
 </template>
 <script>
@@ -141,6 +206,8 @@
         selectIds: [],
         selectedData: [],
         finished: false,
+        activeGroupVal: 'myDep',
+        querys: [],
       }
     },
     computed: {
@@ -169,6 +236,9 @@
         }
       },
     },
+    mounted() {
+      this.getOrgId()
+    },
     methods: {
       onSearchInput: debounce(function() {
         this.onRefresh()
@@ -233,6 +303,30 @@
         }
         this.$emit('row-click', row, column, event)
       },
+      loadFilterGroup(tabName) {
+        // 重置分页
+        if (tabName !== this.activeGroupVal) this.pagination.page = 1
+        this.activeGroupVal = tabName
+        this.$emit('getCustomQuerys', tabName === 'all' ? [] : this.querys)
+        this.onRefresh()
+      },
+      getOrgId() {
+        this.$requestConfig
+          .getOrgListByUserId(this.$requestConfig.getUserId())
+          .then((orgs) => {
+            const masterOrg = (orgs || []).find((org) => org.isMaster == 1)
+            this.querys = [
+              {
+                group: 'mainOrg',
+                operation: 'EQUAL',
+                property: 'uo.id_',
+                relation: 'AND',
+                value: masterOrg.id,
+              },
+            ]
+            this.$emit('getCustomQuerys', this.querys)
+          })
+      },
     },
   }
 </script>
@@ -321,7 +415,8 @@
     }
 
     .user-data__list {
-      min-height: 400px;
+      max-height: 400px;
+      overflow: auto;
     }
     .van-action-sheet__cancel {
       padding: 5px;

package/packages/UserSelector/src/main.vue

@@ -34,7 +34,7 @@
             <i
               v-if="inputWriteable"
               class="el-tag__close el-icon-close"
-              @click="handleRemove(item)"
+              @click.stop="handleRemove(item)"
             ></i>
           </span>
           <template v-if="!selectors.length && value">
@@ -48,7 +48,7 @@
               <i
                 v-if="inputWriteable"
                 class="el-tag__close el-icon-close"
-                @click="handleRemoveText(index)"
+                @click.stop="handleRemoveText(index)"
               ></i>
             </span>
           </template>
@@ -123,6 +123,7 @@
       @row-click="(row) => $emit('row-click', row)"
       @select-data="(data) => $emit('select-data', data)"
       @page-change="(page) => $emit('page-change', page)"
+      @getCustomQuerys="(querys) => $emit('getCustomQuerys', querys)"
     />
   </div>
 </template>

package/packages/UserSelectorInput/src/main.vue

@@ -38,6 +38,7 @@
       @load-role-user="loadRoleUser"
       @row-click="(row) => $emit('row-click', row)"
       @select-data="(data) => $emit('select-data', data)"
+      @getCustomQuerys="(querys) => (customQuerys = querys || [])"
     ></ht-user-selector>
   </div>
 </template>
@@ -92,6 +93,7 @@
           total: 0,
           showTotal: true,
         },
+        customQuerys: [],
       }
     },
     mounted() {
@@ -227,6 +229,7 @@
       },
       // 加载全部用户
       loadAllUser(param) {
+        param.querys = [...param.querys, ...this.customQuerys]
         this.$requestConfig.getUserList(param).then((data) => {
           const { rows, page, pageSize, total } = data
           if (this.isMobile && page > 1) {

package/src/mixins/querySqlPreview.js

@@ -2,6 +2,8 @@ import { Loading } from 'element-ui'
 import utils from 'three-trees-ui/src/utils.js'
 const { Base64 } = require('js-base64')
 const { saveAs } = require('file-saver')
+import { decode } from '@/util/base64'
+
 import Vue from 'vue'
 import $ from 'jquery'
 import _ from 'lodash'
@@ -49,12 +51,12 @@ export default {
     }
   },
   watch: {
-    formKey: function (newVal) {
+    formKey: function(newVal) {
       if (newVal) {
         this.init()
       }
     },
-    'tableData.selectRows': function (newVal) {
+    'tableData.selectRows': function(newVal) {
       if (newVal.length > 0) {
         let me_ = this
         me_.uploadParams.id = []
@@ -83,10 +85,10 @@ export default {
       handler(newVal) {
         if (newVal.shows) {
           let displayField = utils.parseToJson(newVal.shows)
-          let buttonsts = utils.parseToJson(newVal.buttons);
+          let buttonsts = utils.parseToJson(newVal.buttons)
           console.log(buttonsts)
-          if(buttonsts[0].isdefault == "1"){
-              this.isdefaultQuery = false
+          if (buttonsts[0].isdefault == '1') {
+            this.isdefaultQuery = false
           }
           for (var i = 0; i < displayField.length; i++) {
             if (displayField[i].hidden == 0) {
@@ -247,7 +249,7 @@ export default {
       this.$router.push(url)
     },
 
-    handleSizeChange: function (size) {
+    handleSizeChange: function(size) {
       //每页下拉显示数据
       this.pagination.pageSize = size
       if (this.$refs.queryViewList) {
@@ -256,7 +258,7 @@ export default {
         this.search()
       }
     },
-    handleCurrentChange: function (currentPage) {
+    handleCurrentChange: function(currentPage) {
       //点击第几页
       this.pagination.page = currentPage
       if (this.$refs.queryViewList) {
@@ -266,7 +268,7 @@ export default {
       }
     },
     //回车查询
-    searchEnterFun: function (e) {
+    searchEnterFun: function(e) {
       let keyCode = window.event ? e.keyCode : e.which
       if (keyCode == 13) {
         this.pagination.page = 1
@@ -419,11 +421,19 @@ export default {
                 ? operationType[operation]
                 : operation
           } else if (
-            typeof $(searchItems[i]).children().attr('ht-query') != 'undefined'
+            typeof $(searchItems[i])
+              .children()
+              .attr('ht-query') != 'undefined'
           ) {
             //查询条件类型
-            operation = $(searchItems[i]).children().attr('operation')
-            operationMap[$(searchItems[i]).children().attr('ht-query')] =
+            operation = $(searchItems[i])
+              .children()
+              .attr('operation')
+            operationMap[
+              $(searchItems[i])
+                .children()
+                .attr('ht-query')
+            ] =
               typeof operationType[operation] != 'undefined'
                 ? operationType[operation]
                 : operation
@@ -445,12 +455,16 @@ export default {
               searchItems[i]
             ).attr('field-query')
           } else if (
-            typeof $(searchItems[i]).children().attr('ht-query') != 'undefined'
+            typeof $(searchItems[i])
+              .children()
+              .attr('ht-query') != 'undefined'
           ) {
             //查询条件字段
-            fieldQueryMap[$(searchItems[i]).children().attr('ht-query')] = $(
-              searchItems[i]
-            )
+            fieldQueryMap[
+              $(searchItems[i])
+                .children()
+                .attr('ht-query')
+            ] = $(searchItems[i])
               .children()
               .attr('field-query')
           }
@@ -472,12 +486,19 @@ export default {
                 ? true
                 : false
           } else if (
-            typeof $(searchItems[i]).children().attr('ht-query') != 'undefined'
+            typeof $(searchItems[i])
+              .children()
+              .attr('ht-query') != 'undefined'
           ) {
             //查询条件字段
-            fieldQueryMap[$(searchItems[i]).children().attr('ht-query')] =
-              typeof $(searchItems[i]).children().attr('special-query') !=
-              'undefined'
+            fieldQueryMap[
+              $(searchItems[i])
+                .children()
+                .attr('ht-query')
+            ] =
+              typeof $(searchItems[i])
+                .children()
+                .attr('special-query') != 'undefined'
                 ? true
                 : false
           }
@@ -559,14 +580,16 @@ export default {
     },
     //点击导出按钮
     exports() {
-      if(this.isdefaultQuery){
+      if (this.isdefaultQuery) {
         this.dialogExportVisible = true
-      }else{
-        this.exportData.expField= JSON.parse(JSON.stringify(this.displayFields))
-        console.log(this.exportData)
+      } else {
+        // 增加导出字段限制
+        const checkField = this.getCheckField().map((item) => item.value)
+        this.exportData.expField = this.displayFields.filter((item) =>
+          checkField.includes(item.fieldName)
+        )
         this.submitExport()
       }
-      
     },
     punchOrder() {
       this.$store
@@ -861,5 +884,19 @@ export default {
     showSearchPane() {
       return true
     },
+    getCheckField() {
+      let customColumns = this.$refs.queryViewList.customColumns || []
+      let customColumnSetting = JSON.parse(
+        localStorage.getItem('customColumnSetting') || '{}'
+      )
+      const keys = customColumns.reduce((m, n) => m.concat(n.key), [])
+      const customColumnsHashCode = utils.hashCode(keys.join(','))
+      const checkField = JSON.parse(
+        decode(customColumnSetting[customColumnsHashCode]) || '[]'
+      )
+      return checkField.filter(
+        (field) => field.checked && ['序号', '操作'].indexOf(field.value) == -1
+      )
+    },
   },
 }