vue2-client 1.2.29 → 1.2.30

package/src/base-client/components/common/ScrollList/SrcollList.vue

@@ -1,113 +1,113 @@
-<template>
-  <a-list
-    :data-source="model.rows"
-    :bordered="bordered"
-    v-infinite-scroll="handleInfiniteOnLoad"
-    class="srcoll-list-infinite-container"
-    :infinite-scroll-disabled="busy"
-    :infinite-scroll-distance="distance"
-  >
-    <a-list-item slot="renderItem" class="srcoll_list_li" slot-scope="item,index" @click="selectItem(index,item)">
-      <slot :item="item" :index="index" >
-      </slot>
-    </a-list-item>
-    <div v-if="loading && !busy" class="srcoll-list-loading-container">
-      <a-spin />
-    </div>
-  </a-list>
-</template>
-
-<script>
-  import infiniteScroll from 'vue-infinite-scroll'
-  import { post } from '@vue2-client/services/api/restTools'
-
-  export default {
-    name: 'SrcollList1',
-    directives: { infiniteScroll },
-    props: {
-      'busy': { // 是否执行回调
-        type: Boolean,
-        default: false
-      },
-      'distance': { // 距底部多少像素触发回调
-        type: Number,
-        default: 1
-      },
-      'bordered': { // 是否显示列表边框
-        type: Boolean,
-        default: true
-      },
-      'model': {
-        type: Object,
-        default: () => {
-          return {}
-        }
-      }
-    },
-    data () {
-      return {
-        selectRow: {},
-        loading: false
-      }
-    },
-    mounted () {
-    },
-    methods: {
-      selectItem (index, item) {
-        this.$emit('selectItem', index, item)
-      },
-      handleInfiniteOnLoad () {
-        this.loading = true
-        if (this.model.pageNo < this.model.totalPage || this.model.pageNo == 0) {
-          this.model.pageNo = this.model.pageNo + 1
-          post(this.model.url, { data: this.model }).then((res) => {
-            this.model.rows = this.model.rows.concat(res.data).map((item, index) => ({ ...item, index }))
-            this.loading = false
-            this.model.totalPage = res.totalPage
-            this.model.totalCount = res.totalCount
-          })
-        } else {
-          this.loading = false
-        }
-      },
-      search () {
-        this.model.pageNo = 0
-        this.model.rows = []
-        this.handleInfiniteOnLoad()
-      }
-    }
-  }
-</script>
-
-<style scoped>
-  .srcoll-list-infinite-container {
-    border-radius: 4px;
-    height: 100%;
-    overflow-y: scroll;
-  }
-  /*滚动条样式*/
-  .srcoll-list-infinite-container::-webkit-scrollbar {
-    width: 4px;
-    /*height: 4px;*/
-  }
-  .srcoll-list-infinite-container::-webkit-scrollbar-thumb {
-    border-radius: 10px;
-    -webkit-box-shadow: inset 0 0 5px rgba(0,0,0,0.2);
-    background: rgba(0,0,0,0.2);
-  }
-  .srcoll-list-infinite-container::-webkit-scrollbar-track {
-    -webkit-box-shadow: inset 0 0 5px rgba(0,0,0,0.2);
-    border-radius: 0;
-    background: rgba(0,0,0,0.1);
-
-  }
-  .srcoll-list-loading-container {
-    position: absolute;
-    bottom: 10%;
-    width: 100%;
-    text-align: center;
-  }
-  .srcoll_list_li:hover{
-    background-color: rgb(203,234,241);
-  }
-</style>
+<template>
+  <a-list
+    :data-source="model.rows"
+    :bordered="bordered"
+    v-infinite-scroll="handleInfiniteOnLoad"
+    class="srcoll-list-infinite-container"
+    :infinite-scroll-disabled="busy"
+    :infinite-scroll-distance="distance"
+  >
+    <a-list-item slot="renderItem" class="srcoll_list_li" slot-scope="item,index" @click="selectItem(index,item)">
+      <slot :item="item" :index="index" >
+      </slot>
+    </a-list-item>
+    <div v-if="loading && !busy" class="srcoll-list-loading-container">
+      <a-spin />
+    </div>
+  </a-list>
+</template>
+
+<script>
+  import infiniteScroll from 'vue-infinite-scroll'
+  import { post } from '@vue2-client/services/api/restTools'
+
+  export default {
+    name: 'SrcollList1',
+    directives: { infiniteScroll },
+    props: {
+      'busy': { // 是否执行回调
+        type: Boolean,
+        default: false
+      },
+      'distance': { // 距底部多少像素触发回调
+        type: Number,
+        default: 1
+      },
+      'bordered': { // 是否显示列表边框
+        type: Boolean,
+        default: true
+      },
+      'model': {
+        type: Object,
+        default: () => {
+          return {}
+        }
+      }
+    },
+    data () {
+      return {
+        selectRow: {},
+        loading: false
+      }
+    },
+    mounted () {
+    },
+    methods: {
+      selectItem (index, item) {
+        this.$emit('selectItem', index, item)
+      },
+      handleInfiniteOnLoad () {
+        this.loading = true
+        if (this.model.pageNo < this.model.totalPage || this.model.pageNo == 0) {
+          this.model.pageNo = this.model.pageNo + 1
+          post(this.model.url, { data: this.model }).then((res) => {
+            this.model.rows = this.model.rows.concat(res.data).map((item, index) => ({ ...item, index }))
+            this.loading = false
+            this.model.totalPage = res.totalPage
+            this.model.totalCount = res.totalCount
+          })
+        } else {
+          this.loading = false
+        }
+      },
+      search () {
+        this.model.pageNo = 0
+        this.model.rows = []
+        this.handleInfiniteOnLoad()
+      }
+    }
+  }
+</script>
+
+<style scoped>
+  .srcoll-list-infinite-container {
+    border-radius: 4px;
+    height: 100%;
+    overflow-y: scroll;
+  }
+  /*滚动条样式*/
+  .srcoll-list-infinite-container::-webkit-scrollbar {
+    width: 4px;
+    /*height: 4px;*/
+  }
+  .srcoll-list-infinite-container::-webkit-scrollbar-thumb {
+    border-radius: 10px;
+    -webkit-box-shadow: inset 0 0 5px rgba(0,0,0,0.2);
+    background: rgba(0,0,0,0.2);
+  }
+  .srcoll-list-infinite-container::-webkit-scrollbar-track {
+    -webkit-box-shadow: inset 0 0 5px rgba(0,0,0,0.2);
+    border-radius: 0;
+    background: rgba(0,0,0,0.1);
+
+  }
+  .srcoll-list-loading-container {
+    position: absolute;
+    bottom: 10%;
+    width: 100%;
+    text-align: center;
+  }
+  .srcoll_list_li:hover{
+    background-color: rgb(203,234,241);
+  }
+</style>

package/src/base-client/components/common/ScrollList/index.js

@@ -1,3 +1,3 @@
-import SrcollList from './SrcollList'
-
-export default SrcollList
+import SrcollList from './SrcollList'
+
+export default SrcollList

package/src/base-client/components/common/XForm/XFormItem.vue

@@ -161,7 +161,49 @@
     </a-form-model-item>
   </x-form-col>
   <!-- TODO 文件上传 -->
+  <x-form-col
+    :xl="24"
+    :xxl="24"
+    :xs="24"
+    :sm="24"
+    :md="24"
+    :lg="24"
+    v-else-if="attr.type === 'file'">
+    <a-form-model-item :ref="attr.model" :label="attr.name" :prop="attr.model">
+      <a-upload-dragger
+        name="file"
+        :multiple="true"
+        :action="'/webmeteruploadapi/upload/'+attr.resUploadMode">
+        <p class="ant-upload-drag-icon">
+          <a-icon type="inbox"/>
+        </p>
+        <p class="ant-upload-text">
+          点击或拖动文件到该区域上传
+        </p>
+        <p class="ant-upload-hint">
+          支持单个或多个文件
+        </p>
+      </a-upload-dragger>
+    </a-form-model-item>
+  </x-form-col>
   <!-- TODO 图片上传 -->
+  <x-form-col
+    :xl="24"
+    :xxl="24"
+    :xs="24"
+    :sm="24"
+    :md="24"
+    :lg="24"
+    v-else-if="attr.type === 'image'">
+    <a-form-model-item :ref="attr.model" :label="attr.name" :prop="attr.model">
+      <a-upload list-type="picture-card" :file-list="[]">
+        <a-icon type="plus"/>
+        <div class="ant-upload-text">
+          Upload
+        </div>
+      </a-upload>
+    </a-form-model-item>
+  </x-form-col>
 </template>
 <script>
 

package/src/config/CreateQueryConfig.js

@@ -1,6 +1,6 @@
 module.exports = {
   // 文件上传类型
-  file_type: [
+  fileType: [
     {
       label: 'word文档',
       accept: '.doc,.docx,'

package/vue.config.js

@@ -1,143 +1,143 @@
-const path = require('path')
-const webpack = require('webpack')
-const ThemeColorReplacer = require('webpack-theme-color-replacer')
-const { getThemeColors, modifyVars } = require('./src/utils/themeUtil')
-const { resolveCss } = require('./src/utils/theme-color-replacer-extend')
-const CompressionWebpackPlugin = require('compression-webpack-plugin')
-
-const productionGzipExtensions = ['js', 'css']
-const isProd = process.env.NODE_ENV === 'production'
-
-const assetsCDN = {
-  // webpack build externals
-  externals: {
-    vue: 'Vue',
-    'vue-router': 'VueRouter',
-    vuex: 'Vuex',
-    axios: 'axios',
-    nprogress: 'NProgress',
-    clipboard: 'ClipboardJS',
-    '@antv/data-set': 'DataSet',
-    'js-cookie': 'Cookies'
-  },
-  css: [
-  ],
-  js: [
-    '//cdn.jsdelivr.net/npm/vue@2.6.11/dist/vue.min.js',
-    '//cdn.jsdelivr.net/npm/vue-router@3.3.4/dist/vue-router.min.js',
-    '//cdn.jsdelivr.net/npm/vuex@3.4.0/dist/vuex.min.js',
-    '//cdn.jsdelivr.net/npm/axios@0.19.2/dist/axios.min.js',
-    '//cdn.jsdelivr.net/npm/nprogress@0.2.0/nprogress.min.js',
-    '//cdn.jsdelivr.net/npm/clipboard@2.0.6/dist/clipboard.min.js',
-    '//cdn.jsdelivr.net/npm/@antv/data-set@0.11.4/build/data-set.min.js',
-    '//cdn.jsdelivr.net/npm/js-cookie@2.2.1/src/js.cookie.min.js'
-  ]
-}
-
-const server = 'http://121.36.106.17:8400'
-// const local = 'http://localhost:8445/webmeter'
-const local = 'http://123.60.214.109:8405/webmeter'
-
-module.exports = {
-  devServer: {
-    // development server port 8000
-    port: 8001,
-    // If you want to turn on the proxy, please remove the mockjs /src/main.jsL11
-    proxy: {
-      '/rs': {
-        target: server,
-        ws: false,
-        changeOrigin: true
-      },
-      '/image': {
-        target: server,
-        ws: false,
-        changeOrigin: true
-      },
-      '/webapps': {
-        target: server,
-        ws: false,
-        changeOrigin: true
-      },
-      '/webmeterapi': {
-        pathRewrite: { '^/webmeterapi': '/rs/logic' },
-        target: local,
-        changeOrigin: true
-      },
-      '/webmeteruploadapi': {
-        pathRewrite: { '^/webmeteruploadapi': '/rs/file' },
-        target: local,
-        changeOrigin: true
-      }
-    }
-  },
-  pluginOptions: {
-    'style-resources-loader': {
-      preProcessor: 'less',
-      patterns: [path.resolve(__dirname, './src/theme/theme.less')]
-    }
-  },
-  configureWebpack: config => {
-    config.entry.app = ['babel-polyfill', 'whatwg-fetch', './src/main.js']
-    config.performance = {
-      hints: false
-    }
-    config.plugins.push(
-      new ThemeColorReplacer({
-        fileName: 'css/theme-colors-[contenthash:8].css',
-        matchColors: getThemeColors(),
-        injectCss: true,
-        resolveCss
-      })
-    )
-    // Ignore all locale files of moment.js
-    config.plugins.push(new webpack.IgnorePlugin(/^\.\/locale$/, /moment$/))
-    // 生产环境下将资源压缩成gzip格式
-    if (isProd) {
-      // add `CompressionWebpack` plugin to webpack plugins
-      config.plugins.push(new CompressionWebpackPlugin({
-        algorithm: 'gzip',
-        test: new RegExp('\\.(' + productionGzipExtensions.join('|') + ')$'),
-        threshold: 10240,
-        minRatio: 0.8
-      }))
-    }
-    // if prod, add externals
-    if (isProd) {
-      config.externals = assetsCDN.externals
-    }
-  },
-  chainWebpack: config => {
-    // 生产环境下关闭css压缩的 colormin 项，因为此项优化与主题色替换功能冲突
-    if (isProd) {
-      config.plugin('optimize-css')
-        .tap(args => {
-            args[0].cssnanoOptions.preset[1].colormin = false
-          return args
-        })
-    }
-    // 生产环境下使用CDN
-    if (isProd) {
-      config.plugin('html')
-        .tap(args => {
-          args[0].cdn = assetsCDN
-        return args
-      })
-    }
-    config.resolve.alias.set('@vue2-client', path.resolve(__dirname, 'src'))
-  },
-  css: {
-    loaderOptions: {
-      less: {
-        lessOptions: {
-          modifyVars: modifyVars(),
-          javascriptEnabled: true
-        }
-      }
-    }
-  },
-  publicPath: process.env.VUE_APP_PUBLIC_PATH,
-  outputDir: 'dist',
-  assetsDir: 'static',
-  productionSourceMap: false
-}
+const path = require('path')
+const webpack = require('webpack')
+const ThemeColorReplacer = require('webpack-theme-color-replacer')
+const { getThemeColors, modifyVars } = require('./src/utils/themeUtil')
+const { resolveCss } = require('./src/utils/theme-color-replacer-extend')
+const CompressionWebpackPlugin = require('compression-webpack-plugin')
+
+const productionGzipExtensions = ['js', 'css']
+const isProd = process.env.NODE_ENV === 'production'
+
+const assetsCDN = {
+  // webpack build externals
+  externals: {
+    vue: 'Vue',
+    'vue-router': 'VueRouter',
+    vuex: 'Vuex',
+    axios: 'axios',
+    nprogress: 'NProgress',
+    clipboard: 'ClipboardJS',
+    '@antv/data-set': 'DataSet',
+    'js-cookie': 'Cookies'
+  },
+  css: [
+  ],
+  js: [
+    '//cdn.jsdelivr.net/npm/vue@2.6.11/dist/vue.min.js',
+    '//cdn.jsdelivr.net/npm/vue-router@3.3.4/dist/vue-router.min.js',
+    '//cdn.jsdelivr.net/npm/vuex@3.4.0/dist/vuex.min.js',
+    '//cdn.jsdelivr.net/npm/axios@0.19.2/dist/axios.min.js',
+    '//cdn.jsdelivr.net/npm/nprogress@0.2.0/nprogress.min.js',
+    '//cdn.jsdelivr.net/npm/clipboard@2.0.6/dist/clipboard.min.js',
+    '//cdn.jsdelivr.net/npm/@antv/data-set@0.11.4/build/data-set.min.js',
+    '//cdn.jsdelivr.net/npm/js-cookie@2.2.1/src/js.cookie.min.js'
+  ]
+}
+
+const server = 'http://121.36.106.17:8400'
+const local = 'http://localhost:8445/webmeter'
+// const local = 'http://123.60.214.109:8405/webmeter'
+
+module.exports = {
+  devServer: {
+    // development server port 8000
+    port: 8001,
+    // If you want to turn on the proxy, please remove the mockjs /src/main.jsL11
+    proxy: {
+      '/rs': {
+        target: server,
+        ws: false,
+        changeOrigin: true
+      },
+      '/image': {
+        target: server,
+        ws: false,
+        changeOrigin: true
+      },
+      '/webapps': {
+        target: server,
+        ws: false,
+        changeOrigin: true
+      },
+      '/webmeterapi': {
+        pathRewrite: { '^/webmeterapi': '/rs/logic' },
+        target: local,
+        changeOrigin: true
+      },
+      '/webmeteruploadapi': {
+        pathRewrite: { '^/webmeteruploadapi': '/rs/file' },
+        target: local,
+        changeOrigin: true
+      }
+    }
+  },
+  pluginOptions: {
+    'style-resources-loader': {
+      preProcessor: 'less',
+      patterns: [path.resolve(__dirname, './src/theme/theme.less')]
+    }
+  },
+  configureWebpack: config => {
+    config.entry.app = ['babel-polyfill', 'whatwg-fetch', './src/main.js']
+    config.performance = {
+      hints: false
+    }
+    config.plugins.push(
+      new ThemeColorReplacer({
+        fileName: 'css/theme-colors-[contenthash:8].css',
+        matchColors: getThemeColors(),
+        injectCss: true,
+        resolveCss
+      })
+    )
+    // Ignore all locale files of moment.js
+    config.plugins.push(new webpack.IgnorePlugin(/^\.\/locale$/, /moment$/))
+    // 生产环境下将资源压缩成gzip格式
+    if (isProd) {
+      // add `CompressionWebpack` plugin to webpack plugins
+      config.plugins.push(new CompressionWebpackPlugin({
+        algorithm: 'gzip',
+        test: new RegExp('\\.(' + productionGzipExtensions.join('|') + ')$'),
+        threshold: 10240,
+        minRatio: 0.8
+      }))
+    }
+    // if prod, add externals
+    if (isProd) {
+      config.externals = assetsCDN.externals
+    }
+  },
+  chainWebpack: config => {
+    // 生产环境下关闭css压缩的 colormin 项，因为此项优化与主题色替换功能冲突
+    if (isProd) {
+      config.plugin('optimize-css')
+        .tap(args => {
+            args[0].cssnanoOptions.preset[1].colormin = false
+          return args
+        })
+    }
+    // 生产环境下使用CDN
+    if (isProd) {
+      config.plugin('html')
+        .tap(args => {
+          args[0].cdn = assetsCDN
+        return args
+      })
+    }
+    config.resolve.alias.set('@vue2-client', path.resolve(__dirname, 'src'))
+  },
+  css: {
+    loaderOptions: {
+      less: {
+        lessOptions: {
+          modifyVars: modifyVars(),
+          javascriptEnabled: true
+        }
+      }
+    }
+  },
+  publicPath: process.env.VUE_APP_PUBLIC_PATH,
+  outputDir: 'dist',
+  assetsDir: 'static',
+  productionSourceMap: false
+}