Merge branch 'master' of github.com:szuprefix/vue-django

szuprefix · Aug 2, 2020 · f154724 · f154724
2 parents 4b4f3e9 + 2ff4bc4
commit f154724
Show file tree

Hide file tree

Showing 21 changed files with 104 additions and 106 deletions.
diff --git a/src/components/creator/BatchCreator.vue b/src/components/creator/BatchCreator.vue
@@ -19,15 +19,15 @@
     import TooltipCell from '../table/widgets/TooltipCell.vue'
     import {pick, last, uniqWith, isEqual, isEmpty, uniqueId, filter, forOwn, sortBy} from 'lodash'
     import ModelView from '../../mixins/model_view'
-    import server_response from '../../mixins/server_response'
+    import ServerResponse from '../../mixins/server_response'
     import Qs from 'qs'
     import queueLimit from '../../utils/async_queue'
     import {Validator, genFieldRules, clear$Fields} from '../../utils/validators'
     import {Register} from '../../utils/app_model'
 
     export default{
         name: 'BatchCreator',
-        mixins: [server_response, ModelView],
+        mixins: [ServerResponse, ModelView],
         props: {
             structure: Object,
             value: Array

diff --git a/src/components/form/Form.js b/src/components/form/Form.js
@@ -2,21 +2,20 @@
  * Created by denishuang on 2019/8/25.
  */
 
-import schema from 'async-validator'
-import array_normalize from '../../utils/array_normalize'
+import arrayNormalize from '../../utils/array_normalize'
 
-export function joinErrors(errors) {
+export function joinErrors (errors) {
     let es = {}
     for (let n in errors) {
-        es[n] = errors[n].join("")
+        es[n] = errors[n].join('')
     }
     return es
 }
 export function defaultWidget (f) {
-    return f.type == 'boolean' ? 'checkbox' : (['date', 'datetime', 'time'].includes(f.type) ? f.type : ( ['integer', 'decimal'].includes(f.type) ? 'number' : 'text'))
+    return f.type === 'boolean' ? 'checkbox' : (['date', 'datetime', 'time'].includes(f.type) ? f.type : ( ['integer', 'decimal'].includes(f.type) ? 'number' : 'text'))
 }
 
-export function defaultRuleType(f){
+export function defaultRuleType (f){
     if (f.multiple) {
         return 'array'
     }
@@ -26,16 +25,16 @@ export function defaultRuleType(f){
     return f.model ? 'number' : (['field', 'time', 'datetime'].includes(f.type) ? 'string' : (['integer', 'decimal'].includes(f.type) ? 'number' : f.type))
 }
 
-export function defaultSpan(f){
-    return f.widget == 'textarea' ? {xs: 24, sm: 24, md: 24, lg: 24, xl: 24} : {
+export function defaultSpan (f){
+    return f.widget === 'textarea' ? {xs: 24, sm: 24, md: 24, lg: 24, xl: 24} : {
         xs: 24,
         sm: 24,
         md: 12,
         lg: 12,
         xl: 8
     }
 }
-export function defaultRules(f){
+export function defaultRules (f){
     let rs = []
     if (f.required) {
         rs.push({
@@ -52,7 +51,7 @@ export function defaultRules(f){
     }
     return rs
 }
-export function normalizeItem(i){
+export function normalizeItem (i) {
     let a = Object.assign({}, i)
     a.label = a.label || a.name
     a.rules = a.rules || defaultRules(a)
@@ -62,8 +61,8 @@ export function normalizeItem(i){
     a.span = Object.assign({}, defaultSpan(a), a.span)
     return a
 }
-export function normalizeItems(items){
-    return array_normalize(items,{}, normalizeItem)
+export function normalizeItems (items) {
+    return arrayNormalize(items,{}, normalizeItem)
 }
 export function getItemRules (items) {
     let d = {}
@@ -86,4 +85,4 @@ export default  {
     normalizeItems,
     getItemRules,
     joinErrors
-}
+}
diff --git a/src/components/form/Form.vue b/src/components/form/Form.vue
@@ -31,14 +31,13 @@
     </el-form>
 </template>
 <script>
-    import server_response from '../../mixins/server_response'
-    import schema from 'async-validator'
+    import ServerResponse from '../../mixins/server_response'
     import Item from './Item.vue'
     import Form from './Form'
     import Actions from '../layout/Actions.vue'
     export default{
         mixins: [
-            server_response
+            ServerResponse
         ],
         props: {
             value: Object,
@@ -87,7 +86,7 @@
                     })
                 }
             },
-            canEdit(f) {
+            canEdit (f) {
                 return ! (f.widget instanceof Function)
             },
             genValuesWithFunctionWidget () {

diff --git a/src/components/layout/Actions.vue b/src/components/layout/Actions.vue
@@ -22,7 +22,7 @@
     </el-button-group>
 </template>
 <script>
-    import array_normalize from '../../utils/array_normalize'
+    import arrayNormalize from '../../utils/array_normalize'
     export default{
         props: {
             items: Array,
@@ -52,7 +52,7 @@
             normalizeItem(a)
             {
                 if(a instanceof Array) {
-                    return array_normalize(a, this.map, this.normalizeItem)
+                    return arrayNormalize(a, this.map, this.normalizeItem)
                 }
                 if (!a.show && this.permissionFunction && a.permission) {
                     a.show = () => this.permissionFunction(a.permission)
@@ -64,7 +64,7 @@
                 return icon && (icon.includes(' ') ? icon : `fa fa-${icon}`) || undefined
             },
             normalizeItems() {
-                this._items = array_normalize(this.items, this.map, this.normalizeItem)
+                this._items = arrayNormalize(this.items, this.map, this.normalizeItem)
             },
         },
         computed: {

diff --git a/src/components/mobile/model/List.vue b/src/components/mobile/model/List.vue
@@ -17,7 +17,9 @@
     import Panel from './Panel.vue'
     import Cells from './Cells.vue'
     import {Register} from '../../../utils/app_model'
+    import ServerResponse from '../../../mixins/server_response'
     export default{
+        mixins: [ServerResponse],
         props: {
             appModel: String,
             owner: Object,
@@ -55,7 +57,7 @@
                         ds = this.prepare(ds)
                     }
                     this.data = ds
-                })
+                }).catch(this.onServerResponseError)
             },
             loadMore (loaded) {
                 if (this.currentPageSize < this.count) {

diff --git a/src/components/model/Form.vue b/src/components/model/Form.vue
@@ -17,15 +17,14 @@
     </div>
 </template>
 <script>
-    import {Register} from '../../utils/app_model'
     import XForm from '../form/Form.vue'
     import Model from './Model'
-    import server_response from '../../mixins/server_response'
-    import array_normalize from '../../utils/array_normalize'
+    import ServerResponse from '../../mixins/server_response'
+    import arrayNormalize from '../../utils/array_normalize'
     import Actions from '../layout/Actions.vue'
     import RelatedSelect from './Select.vue'
     export default{
-        mixins: [server_response],
+        mixins: [ServerResponse],
         components: {XForm, Actions},
         props: {
             appModel: String,
@@ -141,7 +140,7 @@
             normalizeItems() {
                 this.getItems().then(items => {
                     let qns = Object.keys(this.defaults)
-                    this.formItems = array_normalize(items, this.model.fieldConfigs, this.normalizeItem).filter(a => !qns.includes(a.name))
+                    this.formItems = arrayNormalize(items, this.model.fieldConfigs, this.normalizeItem).filter(a => !qns.includes(a.name))
                 })
 
             },
@@ -197,7 +196,7 @@
                 return this.mid ? "put" : "post"
             },
             _topActions(){
-                return array_normalize(this.topActions, this.avairableActions)
+                return arrayNormalize(this.topActions, this.avairableActions)
             },
             disabled () {
                 return !(this.checkPermission('update', this.model) || this.checkPermission('create', this.model))

diff --git a/src/components/model/Grid.vue b/src/components/model/Grid.vue
@@ -4,9 +4,8 @@
 <script>
     import Grid from '../table/Grid.vue'
     import Model from './Model'
-    import {mergeOptions} from '../table/Table'
-    import array_normalize from '../../utils/array_normalize'
-    import server_response from '../../mixins/server_response'
+    import arrayNormalize from '../../utils/array_normalize'
+    import ServerResponse from '../../mixins/server_response'
     import Qs from 'qs'
     import {get} from 'lodash'
     import BatchActions from '../layout/BatchActions.vue'
@@ -19,7 +18,7 @@
 
     export default{
         name: 'ModelTable',
-        mixins: [server_response],
+        mixins: [ServerResponse],
         props: {
             appModel: String,
             items: Array,
@@ -176,7 +175,7 @@
             normalizeItems(){
                 this.getConfig().then(config => {
 
-                    this.batchActionItems = array_normalize(config.batchActions, this.avairableActions, (a) => {
+                    this.batchActionItems = arrayNormalize(config.batchActions, this.avairableActions, (a) => {
                         if (!a.do) {
                             a.do = this.defaultBatchActionDo(a)
                         }
@@ -185,7 +184,7 @@
 
                     let qns = Object.keys(this._baseQueries)
                     let orderingFields = get(this.model.options, 'actions.SEARCH.ordering_fields', [])
-                    let rs = array_normalize(config.listItems, this.model.fieldConfigs, (a) => {
+                    let rs = arrayNormalize(config.listItems, this.model.fieldConfigs, (a) => {
                         Object.assign(a, {field: this.model.fieldConfigs[a.name]})
 
                         if (!a.useFormWidget) {

diff --git a/src/components/model/Relations.vue b/src/components/model/Relations.vue
@@ -8,8 +8,7 @@
 </template>
 <script>
     import Model from './Model'
-    import array_normalize from '../../utils/array_normalize'
-    import queue_limit from '../../utils/async_queue'
+    import arrayNormalize from '../../utils/array_normalize'
     import ModelTable from './Table.vue'
     export default{
         props: {
@@ -28,7 +27,7 @@
         methods: {
             normalizeItems () {
                 let items = this.items || this.parent.viewsConfig.relations || []
-                this.modelItems = array_normalize(items, {}, (a) => {
+                this.modelItems = arrayNormalize(items, {}, (a) => {
                     let m = a.model = Model(a.name)
                     a.icon = a.icon || m.config.icon
                     a.label = a.label || m.config.verbose_name

diff --git a/src/components/model/Search.vue b/src/components/model/Search.vue
@@ -41,7 +41,7 @@
     import DateRange from '../form/widgets/DateRange.vue'
     import ModelSelect from './Select.vue'
     import ArrayInput from '../widgets/ArrayInput.vue'
-    import array_normalize from '../../utils/array_normalize'
+    import arrayNormalize from '../../utils/array_normalize'
     export default{
         props: {
             model: Object,
@@ -70,7 +70,7 @@
                 let search = this.model.options.actions.SEARCH
                 this.searchFields = search.search_fields
                 let items = this.items || search.filter_fields
-                let ffields = array_normalize(items, this.model.fieldConfigs, (a) => {
+                let ffields = arrayNormalize(items, this.model.fieldConfigs, (a) => {
                     let label = this.map[a.name] && this.map[a.name].label || a.label
                     return {multiple: false, ...a, label, widget: this.defaultWidget(a)}
                 })

diff --git a/src/components/model/Table.vue b/src/components/model/Table.vue
@@ -31,9 +31,8 @@
 <script>
     import RemoteTable from '../table/RemoteTable.vue'
     import Model from './Model'
-    import {mergeOptions} from '../table/Table'
-    import array_normalize from '../../utils/array_normalize'
-    import server_response from '../../mixins/server_response'
+    import arrayNormalize from '../../utils/array_normalize'
+    import ServerResponse from '../../mixins/server_response'
     import Qs from 'qs'
     import {get} from 'lodash'
     import BatchActions from '../layout/BatchActions.vue'
@@ -47,7 +46,7 @@
 
     export default{
         name: 'ModelTable',
-        mixins: [server_response],
+        mixins: [ServerResponse],
         props: {
             appModel: String,
             items: Array,
@@ -191,7 +190,7 @@
             normalizeItems(){
                 this.getConfig().then(config => {
 
-                    this.batchActionItems = array_normalize(config.batchActions, this.avairableActions, (a) => {
+                    this.batchActionItems = arrayNormalize(config.batchActions, this.avairableActions, (a) => {
                         if (!a.do) {
                             a.do = this.defaultBatchActionDo(a)
                         }
@@ -200,7 +199,7 @@
 
                     let qns = Object.keys(this._baseQueries)
                     let orderingFields = get(this.model.options, 'actions.SEARCH.ordering_fields', [])
-                    let rs = array_normalize(config.listItems, this.model.fieldConfigs, (a) => {
+                    let rs = arrayNormalize(config.listItems, this.model.fieldConfigs, (a) => {
                         Object.assign(a, {field: this.model.fieldConfigs[a.name]})
                         if(!a.formatter) {
                             a.formatter = this.genDefaultFormatter(a)

diff --git a/src/components/sheets/ActionLabel.vue b/src/components/sheets/ActionLabel.vue
@@ -41,4 +41,3 @@
         }
     }
 </script>
-<style></style>
diff --git a/src/components/sheets/Block.vue b/src/components/sheets/Block.vue
@@ -72,4 +72,3 @@
         computed: {}
     }
 </script>
-<style></style>
diff --git a/src/components/stats/ChartGrid.vue b/src/components/stats/ChartGrid.vue
@@ -14,7 +14,7 @@
 </template>
 <script>
     import Qs from 'qs'
-    import server_response from 'vue-django/src/mixins/server_response'
+    import ServerResponse from 'vue-django/src/mixins/server_response'
     import DataTable from 'vue-django/src/components/table/Table.vue'
     import {zipObject} from 'lodash'
     let OPTIONS_TOOLBOX = {
@@ -35,7 +35,7 @@
     }
 
     export default{
-        mixins: [server_response],
+        mixins: [ServerResponse],
         props: {
             period: Array,
             url: String,

diff --git a/src/components/stats/ChartGrid2.vue b/src/components/stats/ChartGrid2.vue
@@ -13,7 +13,7 @@
 </template>
 <script>
     import Qs from 'qs'
-    import server_response from 'vue-django/src/mixins/server_response'
+    import ServerResponse from 'vue-django/src/mixins/server_response'
     import XTable from 'vue-django/src/components/table/Table.vue'
     import {zipObject} from 'lodash'
     import arrayNormalize from 'vue-django/src/utils/array_normalize'
@@ -35,7 +35,7 @@
     }
 
     export default{
-        mixins: [server_response],
+        mixins: [ServerResponse],
         props: {
             period: Array,
             url: String,

diff --git a/src/components/table/RemoteTable.vue b/src/components/table/RemoteTable.vue
@@ -22,11 +22,10 @@
 
 </template>
 <script>
-    import {DEFAULT_PAGE_SIZE, DEFAULT_MAX_PAGE_SIZE, mergeOptions} from './Table'
+    import {DEFAULT_PAGE_SIZE, DEFAULT_MAX_PAGE_SIZE} from './Table'
     import Qs from 'qs'
     import XTable from './Table.vue'
     import serverResponse from '../../mixins/server_response'
-    import array_normalize from '../../utils/array_normalize'
     import queueLimit from '../../utils/async_queue'
     import {range} from 'lodash'
     export default{