n20-common-lib 2.18.14 → 2.18.16

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "n20-common-lib",
-  "version": "2.18.14",
+  "version": "2.18.16",
   "private": false,
   "scripts": {
     "serve": "vue-cli-service serve",

package/src/components/ApprovalButtons/indexApp.vue

@@ -332,7 +332,11 @@
     </cl-dialog>
   </div>
 </template>
-
+<script src="http://cmp/v1.0.0/js/cordova/__CMPSHELL_PLATFORM__/cordova.js"></script>
+<script src="http://cmp/v1.0.0/js/cordova/cordova-plugins.js"></script>
+<!--导入cmp.js-->
+<script src="http://cmp/v/js/cmp-i18n.js"></script>
+<script src="http://cmp/v/js/cmp.js"></script>
 <script>
 import selectSpr from './selectSpr.vue'
 import getJsonc from '../../assets/getJsonc.js'
@@ -553,7 +557,7 @@ export default {
   },
   methods: {
     test() {
-      window.close()
+      cmp.href.closePage()
     },
     // 查询选择审批人
     async showAdvancePop() {

package/src/components/TablePro/filterContent.vue

@@ -30,8 +30,8 @@
               type="primary"
               size="mini"
               @click="
-                () => {
-                  filteredValue.length ? confirmFilterEvent() : resetFilterEvent()
+                (ev) => {
+                  filteredValue.length ? confirmFilterEvent(ev) : resetFilterEvent(ev)
                 }
               "
             >
@@ -216,7 +216,7 @@ export default {
       $panel.confirmFilter()
     },
     // 多选
-    confirmFilterEvent() {
+    confirmFilterEvent(ev) {
       const { $panel, column } = this.params
       column.filters.map((item) => {
         item.data = { vals: this.filteredValue }
@@ -229,7 +229,8 @@ export default {
         }
         return item
       })
-      $panel.confirmFilter()
+
+      $panel.confirmFilter(ev)
     },
     resetFilterEvent() {
       this.filteredValue = []