🐛 Fixing a bug. too much

ec1fa7aa · 冷冷 · dc2a3baf · ec1fa7aa · ec1fa7aa · ec1fa7aa
Commit ec1fa7aa authored Dec 03, 2018 by 冷冷
20 changed files
--- a/package.json
+++ b/package.json
@@ -10,7 +10,7 @@
    "test:e2e": "vue-cli-service test:e2e"
  },
  "dependencies": {
-    "@smallwei/avue": "^1.4.6-beta2",
+    "@smallwei/avue": "^1.4.6-beta3",
    "avue-plugin-transfer": "^0.0.2",
    "avue-plugin-ueditor": "^0.0.1",
    "axios": "^0.18.0",

--- a/src/const/crud/admin/user.js
+++ b/src/const/crud/admin/user.js
@@ -45,7 +45,6 @@ export const tableOption = {
        editDisabled: true,
        addVisdiplay: false,
    }, {
-        width: 120,
        fixed: true,
        label: '用户名',
        prop: 'username',
@@ -91,7 +90,6 @@ export const tableOption = {
            trigger: "blur"
        }]
    }, {
-        width: 120,
        label: '手机号',
        prop: 'phone',
        type: 'phone',
@@ -104,7 +102,6 @@ export const tableOption = {
            trigger: "blur"
        }]
    },{
-        width: 120,
        label: '角色',
        prop: 'role',
        formsolt: true,
@@ -143,7 +140,6 @@ export const tableOption = {
        valueFormat: 'yyyy-MM-dd HH:mm:ss',
        editDisabled: true,
        addVisdiplay: false,
-        hide: true,
-        span: 24,
+        span: 24
    }]
 }
--- a/src/main.js
+++ b/src/main.js
@@ -21,7 +21,7 @@ import {
 import * as filters from './filters' // 全局filter
 import './styles/common.scss';
 // // 引入avue的包
-import '@smallwei/avue/lib/index.js';
+import Avue from '@smallwei/avue/lib/index.js';
 // // 引入avue的样式文件
 import '@smallwei/avue/lib/theme-chalk/index.css';

@@ -35,6 +35,8 @@ import VueClipboard from 'vue-clipboard2'
 import vueJsonTreeView from 'vue-json-tree-view'


+Vue.use(Avue, { menuType : 'text'});
+
 Vue.use(router)

 Vue.use(VueClipboard)
@@ -63,4 +65,4 @@ new Vue({
    router,
    store,
    render: h => h(App)
-}).$mount('#app')
\ No newline at end of file
+}).$mount('#app')
--- a/src/page/wel.vue
+++ b/src/page/wel.vue
@@ -30,7 +30,7 @@
              <div>基于开源LCN 分布式事务解决方案深度定制</div>
              <div>完美兼容2.X，优化集群部署，提升性能</div>
            </el-collapse-item>
-            <el-collapse-item title="SASS多租户" name="4">
+            <el-collapse-item title="SAAS多租户" name="4">
              <div>扩展Spring Cache无缝兼容</div>
              <div>支持开发过程无感知</div>
            </el-collapse-item>

--- a/src/views/activiti/detail.vue
+++ b/src/views/activiti/detail.vue
 <template>
-  <div class="app-container pull-auto">
+  <div class="execution">
    <basic-container>
      <div class="header">
        <p class="header__title">{{name}}</p>

--- a/src/views/activiti/index.vue
+++ b/src/views/activiti/index.vue
@@ -16,7 +16,7 @@
  -->

 <template>
-  <div class="app-container pull-auto">
+  <div class="execution">
    <basic-container>
      <avue-crud ref="crud"
                 :page="page"

--- a/src/views/activiti/leave.vue
+++ b/src/views/activiti/leave.vue
@@ -16,7 +16,7 @@
  -->

 <template>
-  <div class="app-container pull-auto">
+  <div class="execution">
    <basic-container>
      <avue-crud ref="crud"
                 :page="page"

--- a/src/views/activiti/process.vue
+++ b/src/views/activiti/process.vue
@@ -16,7 +16,7 @@
  -->

 <template>
-  <div class="app-container pull-auto">
+  <div class="execution">
    <basic-container>
      <avue-crud
        ref="crud"

--- a/src/views/activiti/task.vue
+++ b/src/views/activiti/task.vue
@@ -16,7 +16,7 @@
  -->

 <template>
-  <div class="app-container pull-auto">
+  <div class="execution">
    <basic-container>
      <avue-crud ref="crud"
                 :page="page"

--- a/src/views/admin/client/index.vue
+++ b/src/views/admin/client/index.vue
@@ -16,7 +16,7 @@
  -->

 <template>
-  <div class="app-container pull-auto">
+  <div class="execution">
    <basic-container>
      <avue-crud ref="crud"
                 :page="page"

--- a/src/views/admin/dict/index.vue
+++ b/src/views/admin/dict/index.vue
@@ -16,7 +16,7 @@
  -->

 <template>
-  <div class="app-container pull-auto">
+  <div class="execution">
    <basic-container>
      <avue-crud ref="crud"
                 :page="page"

--- a/src/views/admin/route/index.vue
+++ b/src/views/admin/route/index.vue
@@ -16,7 +16,7 @@
  -->

 <template>
-    <div class="app-container pull-auto">
+    <div class="execution">
        <basic-container>
            <el-alert
                    title="路由配置是非常专业的事情，不建议非工程师操作"

--- a/src/views/admin/social/index.vue
+++ b/src/views/admin/social/index.vue
@@ -16,7 +16,7 @@
  -->

 <template>
-  <div class="app-container pull-auto">
+  <div class="execution">
    <basic-container>
      <avue-crud ref="crud"
                 :page="page"

--- a/src/views/admin/token/index.vue
+++ b/src/views/admin/token/index.vue
@@ -16,7 +16,7 @@
  -->

 <template>
-  <div class="app-container pull-auto">
+  <div class="execution">
    <basic-container>
      <avue-crud ref="crud"
                 :page="page"

--- a/src/views/crud/index.vue
+++ b/src/views/crud/index.vue
@@ -16,7 +16,7 @@
  -->

 <template>
-  <div class="app-container pull-auto">
+  <div class="execution">
    <basic-container>
      <avue-crud ref="crud"
                 :data="tableData"

--- a/src/views/daemon/execution-log/index.vue
+++ b/src/views/daemon/execution-log/index.vue
@@ -16,7 +16,7 @@
  -->

 <template>
-  <div class="app-container pull-auto">
+  <div class="execution">
    <basic-container>
      <avue-crud ref="crud"
                 :page="page"
@@ -61,17 +61,18 @@
      }
    },
    created() {
+       this.page.pageSize=20;
    },
    mounted: function() { },
    computed: {
      ...mapGetters(['permissions'])
    },
    methods: {
-      getList(page, params) {
+      getList(page, params={}) {
        this.tableLoading = true
        fetchList(Object.assign({
-          page: page.currentPage,
-          limit: page.pageSize,
+          current: page.currentPage,
+          size: page.pageSize,
          descs: 'start_time'
        }, params)).then(response => {
          this.tableData = response.data.data.records

--- a/src/views/daemon/status-trace-log/index.vue
+++ b/src/views/daemon/status-trace-log/index.vue
@@ -16,7 +16,7 @@
  -->

 <template>
-  <div class="app-container pull-auto">
+  <div class="execution">
    <basic-container>
      <avue-crud ref="crud"
                 :page="page"

--- a/src/views/gen/index.vue
+++ b/src/views/gen/index.vue
@@ -16,7 +16,7 @@
  -->

 <template>
-  <div class="app-container pull-auto">
+  <div class="execution">
    <basic-container>
      <avue-crud ref="crud"
                 :page="page"

--- a/src/views/tx/index.vue
+++ b/src/views/tx/index.vue
@@ -16,7 +16,7 @@
  -->

 <template>
-  <div class="app-container pull-auto">
+  <div class="execution">
    <basic-container>
      <avue-crud :data="data"
                 :option="option" />

--- a/src/views/tx/model.vue
+++ b/src/views/tx/model.vue
@@ -16,7 +16,7 @@
  -->

 <template>
-  <div class="app-container pull-auto">
+  <div class="execution">
    <basic-container>
      <avue-crud :data="data" :option="option"/>
    </basic-container>