doway-coms 1.9.1 → 1.9.2

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "doway-coms",
-  "version": "1.9.1",
+  "version": "1.9.2",
   "description": "doway组件库",
   "author": "dowaysoft",
   "main": "packages/index.js",

package/packages/AuditsList/src/index.vue

@@ -115,7 +115,9 @@ export default {
     },
     historyData(val) {
       if (
+        // eslint-disable-next-line no-prototype-builtins
         val.logData.hasOwnProperty("code") &&
+        // eslint-disable-next-line no-prototype-builtins
         val.logData.hasOwnProperty("content")
       ) {
         val.logData = val.logData.content;

package/packages/BaseGrid/src/index.vue

@@ -269,6 +269,7 @@
             :optBtns="scope.column.params.optBtns"
             :popupAddName="scope.column.params.popupAddName"
             :popupAddPath="scope.column.params.popupAddPath"
+            :allowAutoClear="scope.column.params.allowAutoClear"
             @preSearch="(searchInfo) => preSearch(searchInfo, scope)"
             @selectChanged="cellValueChange(scope)"
             @confirmMultiSelect="
@@ -1699,6 +1700,7 @@ export default {
         colParams['isMultiSelect'] = originCol.isMultiSelect
         colParams['contrasts'] = originCol.contrasts || []
         colParams['controlEdit'] = true
+        colParams['allowAutoClear']=originCol.allowAutoClear
       }
       if (originCol.controlType === controlType.text) {
         colParams['controlEdit'] = true

package/packages/BasePulldown/src/index.vue

@@ -392,6 +392,12 @@ export default {
         return []
       },
     },
+    allowAutoClear:{
+      type:Boolean,
+      default:function(){
+        return true
+      }
+    }
   },
   watch: {},
   computed: {
@@ -499,7 +505,7 @@ export default {
       // if(scope.row.)
     },
     clearInputValue() {
-      if (this.isInputChanged === true) {
+      if (this.isInputChanged === true&&this.allowAutoClear) {
         this.setLinkValue(null, this.row)
         this.$emit('selectChanged', null)
       }
@@ -548,7 +554,7 @@ export default {
       if (event.keyCode === 9) {
         //tab事件
         this.$refs.pulldownRef.hidePanel()
-        this.clearInputValue()
+          this.clearInputValue()
       }
     },
     inputClickEvent(event) {
@@ -755,7 +761,7 @@ export default {
      * 面板隐藏事件
      */
     pullDownHideEvent({ $event }) {
-      this.clearInputValue()
+          this.clearInputValue()
     },
     /**
      * 查询数据