three-trees-ui 1.0.48 → 1.0.49

package/package.json

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

package/packages/CustomDialog/src/customDialog.js

@@ -36,7 +36,7 @@ export default {
         this.$showLoading()
       } else {
         this.loadingInstance = Loading.service({
-          fullscreen: true,
+          fullscreen: false,
           text: '查询中...',
         })
       }

package/packages/Editor/src/main.vue

@@ -25,6 +25,7 @@
     <div
       v-else
       :style="showBorder ? textDivStyle : {}"
+      class="w-e-text"
       :class="{ 'empty-div': type === 'property-text' && !hasTextValue }"
       v-html="inputVal"
     ></div>

package/packages/Global/src/GlobalValidate.vue

@@ -6,6 +6,7 @@
 <script>
   import utils from '@/utils.js'
   import emitter from '@/mixins/emitter.js'
+  import { Notification } from 'element-ui'
   const { Base64 } = require('js-base64')
   export default {
     name: 'HtGlobalValidate',
@@ -43,11 +44,19 @@
           })
           if (messages.length > 0) {
             result = false
-            this.$notify.error({
-              title: this.$t('ht.common.warmTips'),
-              dangerouslyUseHTMLString: true,
-              message: messages.join('<br/>'),
-            })
+            // 判断是移动端还是pc
+            if (utils.isMobile()) {
+              this.$notify({
+                message: messages[0],
+                background: '#f25130',
+              })
+            } else {
+              Notification.error({
+                title: this.$t('ht.common.warmTips'),
+                dangerouslyUseHTMLString: true,
+                message: messages.join('<br/>'),
+              })
+            }
           }
         }
         if (result) {
@@ -63,8 +72,39 @@
         let Fn = Function('data', '_me', '$Formulas', formulasDiyJs) //一个变量指向Function，防止有些前端编译工具报错
         try {
           let result = Fn(pInst.data, pInst, pInst.$Formulas)
-          if (!result) {
-            messages.push(item.tips)
+          if (result.constructor === Array) {
+            result = result.filter((it) => !it.valid)
+            if (result.length > 0) {
+              const tableName = result[0].tableName
+              const fieldName = result[0].fieldName
+              const sunIndexList = Array.from(
+                new Set(result.map((it) => it.sunIndex + 1))
+              )
+              const sunTableName = result[0].sunTableName
+              const indexList = Array.from(
+                new Set(result.map((it) => it.index + 1))
+              )
+              if (sunTableName) {
+                const tips = `${tableName}：第${indexList.join(
+                  ','
+                )}行,【${sunTableName}】第${sunIndexList.join(
+                  ','
+                )}行,字段【${fieldName}】${item.tips}`
+                messages.push(tips)
+              } else if (tableName) {
+                messages.push(
+                  `${tableName}：第${indexList.join(
+                    ','
+                  )}行,字段【${fieldName}】${item.tips}`
+                )
+              } else {
+                messages.push(item.tips)
+              }
+            }
+          } else {
+            if (!result) {
+              messages.push(item.tips)
+            }
           }
         } catch (err) {
           messages.push(`全局校验【${item.name}】脚本错误`)

package/packages/Table/src/Table.vue

@@ -43,7 +43,7 @@
               <ht-icon name="arrow" />
             </el-button>
           </el-tooltip>
-          <el-tooltip content="刷新数据" placement="top">
+          <el-tooltip v-if="showRefresh" content="刷新数据" placement="top">
             <el-button
               icon="el-icon-refresh"
               class="refresh-btn-icon"
@@ -267,6 +267,10 @@
         type: Boolean,
         default: false,
       },
+      showRefresh: {
+        type: Boolean,
+        default: true,
+      },
       showCustomColumn: {
         type: Boolean,
         default: true,
@@ -366,6 +370,7 @@
     },
     data() {
       return {
+        resetDefaultFilter: [], // 重置时需把默认筛选条件重置
         querys: [],
         sorter: null,
         quickSearchWord: null,
@@ -394,7 +399,10 @@
           relation: 'AND',
         }
         this.defaultQuerys.forEach((c) => {
-          calQuerys.push({ ...query, ...c })
+          // 如果有重置过筛选条件的 需在默认条件中剔除
+          if (this.resetDefaultFilter.indexOf(c.property) === -1) {
+            calQuerys.push({ ...query, ...c })
+          }
         })
         return calQuerys
       },
@@ -650,7 +658,15 @@
           this.calDefaultQuerys.forEach((item) => {
             param.querys.remove(item)
           })
-          param.querys = param.querys.concat(this.calDefaultQuerys)
+          // 默认查询条件和当前查询条件重复时，取消默认条件
+          param.querys = param.querys.concat(
+            this.calDefaultQuerys.filter((item) => {
+              let index = param.querys.findIndex((sub) => {
+                return sub.property === item.property
+              })
+              return index === -1
+            })
+          )
         }
 
         const me = this
@@ -821,8 +837,8 @@
             delete this.filters[k]
           }
         })
-        this.$emit('filter-change', m)
         this.load()
+        this.$emit('filter-change', m)
       },
       doLayout() {
         this.$nextTick(() => {

package/src/validate.js

@@ -15,7 +15,7 @@ validate.install = (Vue) => {
   Validator.localize(dict)
 
   //比较类型。1，小于:datelessthan。2，小于等于:daterangeend。3，大于:datemorethan。4，大于等于:daterangestart
-  const getDatevalAndCompare = function(selfValue, targetValue, compareType) {
+  const getDatevalAndCompare = function (selfValue, targetValue, compareType) {
     let targetDate = targetValue
     if (!targetDate) {
       return true
@@ -109,9 +109,10 @@ validate.install = (Vue) => {
             return true
           }
         }
-        var re = /^([0-9]{3}[1-9]|[0-9]{2}[1-9][0-9]{1}|[0-9]{1}[1-9][0-9]{2}|[1-9][0-9]{3})-(((0[13578]|1[02])-(0[1-9]|[12][0-9]|3[01]))|((0[469]|11)-(0[1-9]|[12][0-9]|30))|(02-(0[1-9]|[1][0-9]|2[0-8])))/g.test(
-          dateVal.trim()
-        )
+        var re =
+          /^([0-9]{3}[1-9]|[0-9]{2}[1-9][0-9]{1}|[0-9]{1}[1-9][0-9]{2}|[1-9][0-9]{3})-(((0[13578]|1[02])-(0[1-9]|[12][0-9]|3[01]))|((0[469]|11)-(0[1-9]|[12][0-9]|30))|(02-(0[1-9]|[1][0-9]|2[0-8])))/g.test(
+            dateVal.trim()
+          )
         return re
       }
     },
@@ -180,7 +181,17 @@ validate.install = (Vue) => {
   Validator.extend('frontJSValidate', {
     validate: (value, args) => {
       return new Promise((resolve) => {
-        let jsScript = args[0]
+        const validateStr = args[0]
+        const validateList = validateStr.split('&')
+        let jsScript = validateList[0]
+        let index = 0 //字表index
+        let sunIndex = 0 //孙表index
+        if (validateList.length >= 2) {
+          index = validateList[1].split('=')[1]
+        }
+        if (validateList.length == 3) {
+          sunIndex = validateList[2].split('=')[1]
+        }
         jsScript = decode(jsScript)
         let formElementAry = document.getElementsByName('online-form')
         let dataViewElementAry = document.getElementsByName('data-view')
@@ -189,20 +200,24 @@ validate.install = (Vue) => {
         if (formElementAry && formElementAry.length == 1) {
           //PC表单
           let frmInst = formElementAry[0].__vue__
-          data = JSON.parse(JSON.stringify(frmInst.data))
+          if (frmInst && frmInst.data) {
+            data = JSON.parse(JSON.stringify(frmInst.data))
+          }
           paramName = 'data'
-        } else if(dataViewElementAry && dataViewElementAry.length == 1){
+        } else if (dataViewElementAry && dataViewElementAry.length == 1) {
           //表单列表
           let dataViewInst = dataViewElementAry[0].__vue__.$children[0]
-          data = JSON.parse(JSON.stringify(dataViewInst.searchForm))
+          if (dataViewInst && dataViewInst.searchForm) {
+            data = JSON.parse(JSON.stringify(dataViewInst.searchForm))
+          }
           paramName = 'searchForm'
         }
         if (value && value._isVue) {
           value = value.value
         }
         function evil() {
-          let Fn = Function('value', paramName, jsScript) //一个变量指向Function，防止有些前端编译工具报错
-          let result = Fn(value, data)
+          let Fn = Function('value', paramName, 'index', 'sunIndex', jsScript) //一个变量指向Function，防止有些前端编译工具报错
+          let result = Fn(value, data, Number(index), Number(sunIndex))
           return result
         }
         try {