Integer

szuprefix · Jul 12, 2021 · 99c0d51 · 99c0d51
1 parent 18cd4ae
commit 99c0d51
Show file tree

Hide file tree

Showing 4 changed files with 12 additions and 5 deletions.
diff --git a/src/components/layout/BatchActions.vue b/src/components/layout/BatchActions.vue
@@ -39,9 +39,15 @@
 
             },
             getConfirm(action) {
-                if (action.confirm instanceof Function) {
-                    return action.confirm
-                } else if (action.confirm === false) {
+                let cfm = action.confirm
+                if (typeof cfm === 'string'){
+                    this.$store.state.bus.$emit('opendrawer', {
+                        component: cfm,
+                        context: {...action.drawer, ...this.context}
+                    })
+                }else if (cfm instanceof Function) {
+                    return cfm
+                } else if (cfm === false) {
                     return (action, scope) => Promise.resolve()
                 } else {
                     return (action, scope) => this.$confirm(action.notice, `确定要对${scope.label}记录执行"${action.label}"操作吗?`, {type: 'warning'})

diff --git a/src/components/model/Search.vue b/src/components/model/Search.vue
@@ -120,7 +120,7 @@
                     return 'daterange'
                 } else if (['number', 'integer', 'decimal'].includes(f.type) && f.lookups && f.lookups.includes('range')) {
                     return 'numberrange'
-                } else if (f.type === 'string' && f.lookups && f.lookups.includes('in')) {
+                } else if (['string', 'integer'].includes(f.type) && f.lookups && f.lookups.includes('in')) {
                     return 'array'
                 } else if (['string', 'integer'].includes(f.type) && f.lookups && f.lookups.includes('exact') && !f.lookups.includes('in')) {
                     return 'input'

diff --git a/src/components/table/widgets/Mobile.vue b/src/components/table/widgets/Mobile.vue
@@ -5,7 +5,7 @@
 
 </template>
 <script>
-   import {copyContentH5} from 'vue-django/src/utils/clip'
+   import copyContentH5 from 'vue-django/src/utils/clip'
    function maskMobile(s) {
        if(!s || s.length<8) {
            return s

diff --git a/src/utils/filters.js b/src/utils/filters.js
@@ -72,6 +72,7 @@ export function parseTime (time, cFormat) {
     })
     return time_str
 }
+
 export function localTimeStr(t) {
     return dateTime(t).toLocaleString()
 }