doway-coms 2.10.18 → 2.10.20

package/package.json

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

package/packages/BaseGrid/src/index.vue

@@ -497,13 +497,13 @@
             :key="$index"
           >
             <a-input-number
-              :precision="0"
+              :precision="6"
               size="small"
               v-model="loopFilterValue.value[0]"
               @keyup.enter.native="filterConfirm(scope.column)"
             />~
             <a-input-number
-              :precision="0"
+              :precision="6"
               size="small"
               v-model="loopFilterValue.value[1]"
               @keyup.enter.native="filterConfirm(scope.column)"
@@ -3321,15 +3321,27 @@ export default {
               }
               break
             case controlType.number:
-              tempPushExp.operator = 'RA'
-              tempPushExp.value = loopBindingValue.value
-              expStr = '范围'
-              tempStr.exp =
-                tempStr.exp +
-                loopBindingValue.value[0] +
-                '到' +
-                loopBindingValue.value[1] +
-                '或'
+              if (loopBindingValue.value[0] != null && loopBindingValue.value[1] != null ) {
+                tempPushExp.operator = 'RA'
+                tempPushExp.value = loopBindingValue.value
+                expStr = '范围'
+                tempStr.exp =
+                    tempStr.exp +
+                    loopBindingValue.value[0] +
+                    '到' +
+                    loopBindingValue.value[1] +
+                    '或'
+              }else if (loopBindingValue.value[0] != null ) {
+                tempPushExp.operator = 'EQ'
+                tempPushExp.value = loopBindingValue.value[0]
+                tempStr.exp = tempStr.exp + tempPushExp.value + '或'
+                expStr = '等于'
+              } else {
+                tempPushExp.operator = 'EQ'
+                tempPushExp.value = loopBindingValue.value[1]
+                tempStr.exp = tempStr.exp + tempPushExp.value + '或'
+                expStr = '等于'
+              }
               break
             default:
               tempPushExp.value = loopBindingValue.value[0]

package/packages/utils/store.js

@@ -208,13 +208,15 @@ export default new Vuex.Store({
             }
         },
         setTabTitle({commit}, tabInfo) {
-            if (tabInfo.replaceQuery) {
-                let newRoutePath =
-                    tabInfo.path + '?' + stringUrlQuery(tabInfo.replaceQuery)
-                history.replaceState(null, null, (window.$wujie.props.webAppActiveRule + newRoutePath))
-            }
             //通知父应用修改Tab标签文字描述
             if (window.$wujie) {
+
+                if (tabInfo.replaceQuery) {
+                    let newRoutePath =
+                        tabInfo.path + '?' + stringUrlQuery(tabInfo.replaceQuery)
+                    history.replaceState(null, null, (window.$wujie.props.webAppActiveRule + newRoutePath))
+                }
+
                 window.$wujie.bus.$emit('subAppSetTabTitle', {
                     title: tabInfo.title,
                     name: tabInfo.name,