three-trees-ui 1.1.10 → 1.1.12

package/package.json

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

package/packages/File/src/main.vue

@@ -9,6 +9,7 @@
     :style="inputsContainerWidth"
     class="ht-file"
   >
+    <ht-input v-show="false" v-model="uploadingStatus" validate="isUploading" />
     <input
       v-model="value"
       v-validate="inputValidate"
@@ -117,6 +118,7 @@
   </div>
 </template>
 <script>
+  import '@/validate.js'
   import { component as viewer } from 'v-viewer'
   import 'viewerjs/dist/viewer.css'
   import utils from '@/utils.js'
@@ -275,6 +277,7 @@
         temp: null,
         refreshFileUploadDebounce: _.debounce(this.refreshFileUpload, 200),
         inputVal: [],
+        uploadingStatus: false,
       }
     },
     computed: {
@@ -462,6 +465,7 @@
             }
           })
         }
+        this.uploadingStatus = loadingStatus
         this.$emit('update:uploading', loadingStatus)
       },
       // 同步附件数据到上传组件

package/packages/Select/src/main.vue

@@ -356,8 +356,10 @@
       checkValue(data) {
         let flag = false
         data.forEach((item) => {
-          if (this.value.split(',').includes(item[this.propKey])) {
-            flag = true
+          if (this.value) {
+            if (this.value.split(',').includes(item[this.propKey])) {
+              flag = true
+            }
           }
         })
         return flag

package/src/locale/validate/dict.js

@@ -50,6 +50,7 @@ const dict = {
         return args && args['message'] ? args['message'] : '校验失败'
       },
       required: () => '必填',
+      isUploading: () => '附件未完成上传',
       isBefore: (field, args) => {
         return '日期必须小于' + args
       },
@@ -139,6 +140,7 @@ const dict = {
         return args && args['message'] ? args['message'] : '校驗失敗'
       },
       required: () => '必填',
+      isUploading: () => '附件未完成上傳',
       isBefore: (field, args) => {
         return '日期必須小於' + args
       },
@@ -228,6 +230,7 @@ const dict = {
         return args && args['message'] ? args['message'] : 'Verification failed'
       },
       required: () => 'Required',
+      isUploading: () => 'Attachment file is uploading',
       isBefore: (field, args) => {
         return 'Must be less than ' + args
       },

package/src/mixins/templatePreview.js

@@ -2390,11 +2390,13 @@ export default {
         .then(() => {
           let s = []
           for (let i = 0; i < this.tableData.selectRows.length; i++) {
-            s.push(
-              this.tableData.selectRows[i][
-                this.templateInfo.pkField ? this.templateInfo.pkField : 'id_'
-              ]
-            )
+            let delId = this.tableData.selectRows[i][
+              this.templateInfo.pkField ? this.templateInfo.pkField : 'id_'
+            ]
+            if (!delId && this.tableData.selectRows[i]['id_']) {
+              delId = this.tableData.selectRows[i]['id_']
+            }
+            s.push(delId)
           }
           let data = {
             ids: s.join(','),

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
@@ -85,7 +85,15 @@ validate.install = (Vue) => {
     }
     return true
   }
-
+  Validator.extend('isUploading', {
+    validate: (value) => {
+      let result = value
+      if (value == 'false') {
+        result = false
+      }
+      return !result
+    },
+  })
   Validator.extend('isBefore', datelessthan)
   Validator.extend('isAfter', datemorethan)
   Validator.extend('isEnd', daterangeend)
@@ -109,10 +117,9 @@ 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
       }
     },