@aochuang/common 1.0.1 → 1.0.126

package/components/filter/index.js

@@ -2,19 +2,19 @@ import Filter from './filter'
 import FilterGroup from './filter-group'
 import FilterItem from './filter-item'
 
+Filter.install = (Vue) => {
+  Vue.component(Filter.name, Filter)
+  Vue.component(FilterGroup.name, FilterGroup)
+  Vue.component(FilterItem.name, FilterItem)
+}
+
+Filter.FilterItem = FilterItem
+Filter.FilterGroup = FilterGroup
+
 export {
   Filter,
   FilterItem,
   FilterGroup
 }
 
-export default {
-  Filter,
-  FilterItem,
-  FilterGroup,
-  install (Vue) {
-    Vue.component(Filter.name, Filter)
-    Vue.component(FilterGroup.name, FilterGroup)
-    Vue.component(FilterItem.name, FilterItem)
-  }
-}
+export default Filter

package/components/form/form.vue

@@ -20,11 +20,15 @@
     <div class="ui-form__toolbar" v-if="$slots.toolbar" :style="toolbarStyle">
       <slot name="toolbar"></slot>
     </div>
+    <div class="ui-form__loading" v-if="loading">
+      <ui-loading></ui-loading>
+    </div>
   </el-form>
 </template>
 <script>
 import Form from 'element-ui/lib/form'
 import 'element-ui/lib/theme-chalk/form.css'
+import UiLoading from '../loading'
 
 export default {
   name: 'UiForm',
@@ -34,6 +38,7 @@ export default {
     }
   },
   components: {
+    UiLoading,
     ElForm: Form
   },
   props: {
@@ -82,10 +87,14 @@ export default {
     fixedToolbarOffset: {
       type: Number,
       default: 0
+    },
+    queryMethod: {
+      type: Function
     }
   },
   data () {
     return {
+      loading: false,
       toolbarRect: {},
       dynamicRules: {}
     }
@@ -136,8 +145,20 @@ export default {
   mounted () {
     this.doLayout()
     window.addEventListener('resize', this.handleWindowResize)
+    if (this.queryMethod) {
+      this.reload()
+    }
   },
   methods: {
+    reload () {
+      if (!this.queryMethod) {
+        return
+      }
+      this.loading = true
+      return this.queryMethod().finally(() => {
+        this.loading = false
+      })
+    },
     handleWindowResize () {
       this.doLayout()
     },
@@ -250,7 +271,17 @@ export default {
   background-color: #fff;
   z-index: 10;
 }
-.ui-form--column {
-
+.ui-form__loading{
+  position: absolute;
+  left: 0;
+  right: 0;
+  top: 0;
+  bottom: 0;
+  z-index: 100;
+  background-color: #fff;
+  display: flex;
+  flex-direction: column;
+  align-items: center;
+  justify-content: center;
 }
 </style>

package/components/form/index.js

@@ -10,4 +10,15 @@ Form.install = (Vue) => {
   Vue.component(FormCell.name, FormCell)
 }
 
+Form.FormGroup = FormGroup
+Form.FormRow = FormRow
+Form.FormCell = FormCell
+
+export {
+  Form,
+  FormGroup,
+  FormRow,
+  FormCell
+}
+
 export default Form

package/components/grid/grid-column.vue

@@ -15,6 +15,7 @@
       <slot name="header">
         <div class="ui-grid-column__main">
           <div class="ui-grid-column__main-left">
+            <slot name="icon"></slot>
             <span class="ui-grid-column__title" :title="scope.column.title">
               {{ scope.column.title }}
             </span>

package/components/grid/grid-table.vue

@@ -38,6 +38,7 @@
       <vxe-column
         v-if="multiple"
         type="checkbox"
+        :show-overflow="false"
         width="60px"
         fixed="left"
         align="center"
@@ -48,7 +49,7 @@
               <vex-checkbox
                 :value="checked"
                 :indeterminate="indeterminate"
-                :style="{ width: '18px', 'margin-right': '3px' }"
+                :style="{ width: '18px' }"
                 @input="handleCheckAllChange"
                 @click.native.stop
               >
@@ -268,7 +269,7 @@ export default {
       return {
         keyField: this.idField,
         isHover: true,
-        height: this.rowHeight && this.rowHeight !== 'auto' ? this.rowHeight : null,
+        height: this.rowHeight && this.rowHeight !== 'auto' ? parseInt(this.rowHeight) : null,
         isCurrent: this.selectable && this.multiple === false
       }
     },
@@ -303,10 +304,11 @@ export default {
     },
     checkboxConfig() {
       return {
-        // trigger: 'row',
+        trigger: 'cell', // cell（点击单元格触发）, row（点击行触发）
         checkStrictly: this.checkStrictly, // 暂时这么写，后面再看
         visibleMethod: this.rowVisibleMethod,
-        checkMethod: this.rowCheckMethod
+        checkMethod: this.rowCheckMethod,
+        reserve: true
       }
     }
   },

package/components/grid/grid.vue

@@ -5,7 +5,7 @@
     :style="gridStyle"
   >
     <div v-if="ready && showWrap" ref="wrap" class="ui-grid__wrap">
-      <div ref="header" class="ui-grid__header">
+      <div ref="header" class="ui-grid__header" v-show="exportFieldsShow">
         <div class="ui-grid__filter">
           <ui-filter ref="filter" v-model="filterPropsValue" :ready="filterReady" :imediate="imediate" :tableLoading="tableLoading" @change="handleFilterChange">
             <template v-if="simpleFilterGroups && simpleFilterGroups.length">
@@ -138,7 +138,10 @@
             :width="rowToolbarWidth"
           >
             <template slot-scope="{ row, $rowIndex }">
-              <grid-row-toolbar :row="row" :row-index="$rowIndex" :items="rowToolbar"></grid-row-toolbar>
+              <div style="display: flex;">
+                <grid-row-toolbar :row="row" :row-index="$rowIndex" :items="rowToolbar"></grid-row-toolbar>
+                <slot name="AIIcon" :row="row"></slot>
+              </div>
             </template>
           </vxe-column>
           <slot name="append"></slot>
@@ -185,6 +188,7 @@
           <ui-pagination
             :page-index="tablePageIndex"
             :page-size="tablePageSize"
+            :page-size-list="pageSizeList"
             :total="tableTotal"
             :title="title"
             :allow-select-page-size="allowSelectPageSize"
@@ -378,6 +382,14 @@ export default {
     showPrevOrNext: {
       type: Boolean,
       default: false
+    },
+    exportFieldsShow: {
+      type: Boolean,
+      default: true
+    },
+    pageSizeList: {
+      type: Array,
+      default: () => [20, 50, 100, 200]
     }
   },
   data() {
@@ -545,7 +557,7 @@ export default {
   },
   created() {
     this.cacheColumns = []
-    if (this.$route.query && this.$route.query.pageindex) {
+    if (this.$route && this.$route.query && this.$route.query.pageindex) {
       this.tablePageIndex = Number(this.$route.query.pageindex)
     }
     if (this.data && this.data.length) {

package/components/grid/index.js

@@ -26,36 +26,35 @@ export {
   GridFilterOperateItem
 }
 
-export default {
-  Grid,
-  GridColumn,
-  GridFilter,
-  GridBatchToolbar,
-  GridGlobalToolbar,
-  GridMoreToolbar,
-  GridFilterItem,
-  GridSort,
-  GridFilterOperate,
-  GridFilterOperateItem,
-  install (Vue, options) {
-    options = Object.assign({
-      setStorage: null,
-      getStorage: null
-    }, options)
-    setStorage(options.setStorage)
-    getStorage(options.getStorage)
-    Vue.component(Grid.name, Grid)
-    Vue.component('UiGridColumn', GridColumn)
-    Vue.component('UiGridTable', GridTableView)
-    Vue.component('UiGridCard', GridCardView)
-    Vue.component('UiGridBatchToolbar', GridBatchToolbar)
-    Vue.component('UiGridGlobalToolbar', GridGlobalToolbar)
-    Vue.component('UiGridMoreToolbar', GridMoreToolbar)
-    Vue.component('UiGridFilter', GridFilter)
-    Vue.component('UiGridFilterItem', GridFilterItem)
-    Vue.component('UiGridFilterGroup', GridFilterGroup)
-    Vue.component('UiGridSort', GridSort)
-    Vue.component('UiGridFilterOperate', GridFilterOperate)
-    Vue.component('UiGridFilterOperateItem', GridFilterOperateItem)
-  }
+Grid.GridColumn = GridColumn
+Grid.GridFilter = GridFilter
+Grid.GridBatchToolbar = GridBatchToolbar
+Grid.GridGlobalToolbar = GridGlobalToolbar
+Grid.GridMoreToolbar = GridMoreToolbar
+Grid.GridSort = GridSort
+Grid.GridFilterOperate = GridFilterOperate
+Grid.GridFilterOperateItem = GridFilterOperateItem
+
+Grid.install = (Vue, options) => {
+  options = Object.assign({
+    setStorage: null,
+    getStorage: null
+  }, options)
+  setStorage(options.setStorage)
+  getStorage(options.getStorage)
+  Vue.component(Grid.name, Grid)
+  Vue.component('UiGridColumn', GridColumn)
+  Vue.component('UiGridTable', GridTableView)
+  Vue.component('UiGridCard', GridCardView)
+  Vue.component('UiGridBatchToolbar', GridBatchToolbar)
+  Vue.component('UiGridGlobalToolbar', GridGlobalToolbar)
+  Vue.component('UiGridMoreToolbar', GridMoreToolbar)
+  Vue.component('UiGridFilter', GridFilter)
+  Vue.component('UiGridFilterItem', GridFilterItem)
+  Vue.component('UiGridFilterGroup', GridFilterGroup)
+  Vue.component('UiGridSort', GridSort)
+  Vue.component('UiGridFilterOperate', GridFilterOperate)
+  Vue.component('UiGridFilterOperateItem', GridFilterOperateItem)
 }
+
+export default Grid