three-trees-ui 1.0.30 → 1.0.31

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "three-trees-ui",
-  "version": "1.0.30",
+  "version": "1.0.31",
   "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] = ele.regularValue || ''
+              obj[ele.field] = ''
               queryParams.push(obj)
               // queryParams[ele.field] = "";
               this_.conditionBind.push(ele)
@@ -1122,11 +1122,6 @@
         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 (
@@ -2114,8 +2109,10 @@
       height: 90%;
       min-height: 400px;
     }
-    .el-dialog__body .el-container {
-      height: 100% !important;
+    @media (max-height: 960px) {
+      .el-dialog__body .el-container {
+        height: 100% !important;
+      }
     }
     .el-divider--vertical {
       height: 100%;

package/packages/Preview/src/FrameViewer.vue

@@ -2,12 +2,6 @@
   <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"
@@ -60,7 +54,6 @@
       return {
         dataSrc: null,
         loading: false,
-        contentType: '',
       }
     },
     mounted() {
@@ -78,7 +71,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：只提供一个保存按钮
@@ -116,12 +109,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()
           }
@@ -151,8 +144,7 @@
       height: 100%;
     }
 
-    .frame-viewer__iframe,
-    .frame-viewer__img {
+    .frame-viewer__iframe {
       width: 100%;
       height: 100%;
       border: 0;
@@ -161,10 +153,5 @@
         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: '1',
+        currentPolicy: '',
         currentUserOrgs: [],
       }
     },
     watch: {
       mode: function(newVal, oldVal) {
         if (newVal !== oldVal && newVal == 'search') {
-          this.currentPolicy = '1'
+          this.currentPolicy = ''
         }
       },
       currentPolicy: function(newVal, oldVal) {
@@ -49,9 +49,6 @@
         }
       },
     },
-    mounted() {
-      this.loadUserWithPolicy(this.currentPolicy)
-    },
     methods: {
       // 按照指定策略加载数据
       loadUserWithPolicy(policy) {
@@ -64,7 +61,7 @@
             this.$message.error(
               '未获取到当前用户的部门信息，无法按照该策略加载数据。'
             )
-            this.currentPolicy = '1'
+            this.currentPolicy = ''
           })
       },
       // 根据策略构建不同的查询参数

package/packages/UserSelector/src/UserSelectorDialog.vue

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

package/packages/UserSelector/src/UserSelectorMobileDialog.vue

@@ -18,128 +18,63 @@
         @click="handleDialogClose"
       />
     </template>
-    <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"
+
+    <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-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>
+            <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>
-              </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 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>
-              </van-cell>
-            </van-checkbox-group>
-          </van-list>
-        </van-pull-refresh>
-      </van-tab>
-    </van-tabs>
+              </div>
+            </div>
+          </van-cell>
+        </van-checkbox-group>
+      </van-list>
+    </van-pull-refresh>
   </van-action-sheet>
 </template>
 <script>
@@ -206,8 +141,6 @@
         selectIds: [],
         selectedData: [],
         finished: false,
-        activeGroupVal: 'myDep',
-        querys: [],
       }
     },
     computed: {
@@ -236,9 +169,6 @@
         }
       },
     },
-    mounted() {
-      this.getOrgId()
-    },
     methods: {
       onSearchInput: debounce(function() {
         this.onRefresh()
@@ -303,30 +233,6 @@
         }
         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>
@@ -415,8 +321,7 @@
     }
 
     .user-data__list {
-      max-height: 400px;
-      overflow: auto;
+      min-height: 400px;
     }
     .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.stop="handleRemove(item)"
+              @click="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.stop="handleRemoveText(index)"
+                @click="handleRemoveText(index)"
               ></i>
             </span>
           </template>
@@ -123,7 +123,6 @@
       @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,7 +38,6 @@
       @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>
@@ -93,7 +92,6 @@
           total: 0,
           showTotal: true,
         },
-        customQuerys: [],
       }
     },
     mounted() {
@@ -229,7 +227,6 @@
       },
       // 加载全部用户
       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/templatePreview.js

@@ -535,7 +535,7 @@ export default {
     //获取汇总全部数据
     getAllSummary(data) {
       const allSummaryConfig = data.reduce((pre, cur) => {
-        pre[cur.field] = cur.val
+        pre[cur.field] = utils.thousandBit(cur.val)
         return pre
       }, {})
       if (Object.keys(allSummaryConfig).length) {
@@ -731,9 +731,14 @@ export default {
         let manageField = JSON.parse(this.templateInfo.manageField)
         let this_ = this
         manageField.forEach((item) => {
+          if (item.buttonId) {
+            obj[item.buttonId] = true
+          }
           if (item.beforeScriptValue) {
             let promise = this_.beforeScript(item.beforeScriptValue, item)
             promise.then((res) => {
+              obj[item.buttonId] = res
+              //为兼容旧数据（没有buttonId的数据）
               obj[item.name] = res
             })
           }
@@ -1399,6 +1404,10 @@ export default {
     },
     //列表数据查询入口
     search(param, cb, isSearchBtn) {
+      // 如果是高级查询，页码重置为首页
+      if (isSearchBtn) {
+        this.pagination.page = 1
+      }
       let params = {}
       //判断为合并查询还是高级查询
       let showAdvancedSearch = this.$refs.multipleTemplateTable
@@ -1475,7 +1484,7 @@ export default {
         let betweenConditions = {}
         params.pagination.querys.forEach((q) => {
           if (
-            q.value &&
+            q.value != undefined &&
             (q.operation != 'BETWEEN' || q.value.constructor == Array)
           ) {
             tempQueryS.push(q)
@@ -1957,10 +1966,11 @@ export default {
         const filterField = utils.parseToJson(this.templateInfo.filteringField)
         temquerys.forEach((q) => {
           let prefix = this.getColPreFix(conditionField, q.property)
+          const queryPre = this.getQueryPre(conditionField, q.property)
           if (!prefix) {
             prefix = this.getColPreFix(filterField, q.property)
           }
-          q.property = prefix + q.property
+          q.property = queryPre + prefix + q.property
           querys.push(q)
         })
       }
@@ -2417,18 +2427,50 @@ export default {
       if (type === 'searchResult') {
         this.curSelectParams.queryFilter.querys = this.templateSearchQuery
       }
+      if (type === 'selected') {
+        const selectedId = this.tableData.selectRows.map((item) => item.id_)
+        const selectedQuery = {
+          property: 't.id_',
+          value: selectedId ? selectedId.join(',') : '',
+          group: 'main',
+          operation: 'IN',
+          relation: 'AND',
+        }
+        this.curSelectParams.queryFilter.querys = [
+          ...this.curSelectParams.queryFilter.querys,
+          selectedQuery,
+        ]
+      }
+      //导出全部数据按钮
+      if (type == 'all') {
+        this.curSelectParams.queryFilter.querys = []
+      }
+      let loadingInstance = Loading.service({
+        fullscreen: true,
+      }) //开始
       this.$requestConfig
         .exportByBtnSetting({
           id: this.templateInfo.id,
           params: this.curSelectParams,
         })
-        .then(({ data, headers }) => {
-          const fileName = decodeURIComponent(
-            headers['content-disposition'].split(';')[1].split('filename=')[1]
-          )
-          const blob = new Blob([data])
-          saveAs(blob, fileName)
-        })
+        .then(
+          ({ data, headers }) => {
+            const fileName = decodeURIComponent(
+              headers['content-disposition'].split(';')[1].split('filename=')[1]
+            )
+            const blob = new Blob([data])
+            saveAs(blob, fileName)
+            loadingInstance.close() // 结束
+          },
+          (e) => {
+            loadingInstance.close() // 结束
+            let enc = new TextDecoder('utf-8')
+            let uint8_msg = JSON.parse(
+              enc.decode(new Uint8Array(e.response.data))
+            )
+            this.$message.error(uint8_msg.message)
+          }
+        )
     },
     importCommand(params) {
       switch (params.command) {
@@ -2717,6 +2759,13 @@ export default {
             operation: 'EQUAL',
             relation: 'AND',
           },
+          {
+            property: 'bo_alias_',
+            value: this.templateInfo.boDefAlias,
+            group: 'main',
+            operation: 'EQUAL',
+            relation: 'AND',
+          },
         ],
       }
       this.recordTableLoading = true
@@ -3103,6 +3152,10 @@ export default {
       this.getBpmTemplateByPagination(params)
     },
     filterChange(filters) {
+      // 筛选时需重置页面页码
+      if (filters) {
+        this.pagination.page = 1
+      }
       if (filters && Object.keys(filters).length > 0) {
         const key = Object.keys(filters)[0]
         const filter = filters[key]
@@ -3483,7 +3536,10 @@ export default {
         currentRows
           .filter((item) => item[fields] !== undefined && item[fields] !== '')
           .map((item) => Number(item[fields]))
-      if (!list || list.length == 0) return
+      if (!list || list.length == 0) {
+        let num = 0
+        return num.toFixed(decimal)
+      }
       const METHOD_MAP = {
         count: 'getCount',
         sum: 'getSum',
@@ -3651,7 +3707,7 @@ export default {
                 type: dialogConfig.custDialog,
               }
               obj.custdialog = {
-                name: '请选择',
+                name: dialogConfig.name || '请选择',
                 custDialog: custdialog,
                 resultField: dialogConfig.resultField,
               }
@@ -3727,6 +3783,10 @@ export default {
         type: 'warning',
       })
         .then(() => {
+          let loadingInstance = Loading.service({
+            fullscreen: true,
+            text: '数据更新中...',
+          })
           let selectRows = row
             ? [row]
             : this.tableData.selectRows
@@ -3742,20 +3802,37 @@ export default {
             boData: selectRows,
             boAlias: this.templateInfo.boDefAlias,
           }
-          this.$requestConfig.batchUpdateTemplateData(data).then((data) => {
-            if (data.state) {
-              this.$message({
-                type: 'success',
-                message: data.message,
-              })
-              this.search({
-                querys: this.buildDefaultQuerys() || [],
-              })
-              // 更新成功后需执行后置js
-              let script = Base64.decode(afterScriptValue)
-              this.tempScript(script, row)
-            }
-          })
+          this.$requestConfig
+            .batchUpdateTemplateData(data)
+            .then((data) => {
+              if (data.state) {
+                this.$message({
+                  type: 'success',
+                  message: data.message,
+                })
+                this.$nextTick(() => {
+                  // 以服务的方式调用的 Loading 需要异步关闭
+                  loadingInstance.close()
+                })
+                this.search({
+                  querys: this.buildDefaultQuerys() || [],
+                })
+                // 更新成功后需执行后置js
+                if (afterScriptValue) {
+                  let script = Base64.decode(afterScriptValue)
+                  this.tempScript(script, row)
+                }
+              } else {
+                this.$nextTick(() => {
+                  // 以服务的方式调用的 Loading 需要异步关闭
+                  loadingInstance.close()
+                })
+              }
+            })
+            .finally(() => {
+              loadingInstance.close()
+            })
+          this.$parent.init()
         })
         .catch(() => {
           this.$message({
@@ -4010,8 +4087,11 @@ export default {
         }
       } else if (btnOk.indexOf(btnAlias) != -1) {
         if (btnAlias == 'switch') {
+          const pkFieldValue =
+            parameter.pkField ||
+            this.getBindValue(row, this.templateInfo.pkField)
           this.switchChange(
-            parameter.pkField,
+            pkFieldValue,
             parameter.switchOn,
             parameter.switchOff,
             parameter.bind,