vue2-client 1.2.61 → 1.2.64

package/src/base-client/components/common/XFormTable/index.md

@@ -45,7 +45,8 @@ export default {
 | isExports          | 是否显示导出按钮                | Boolean | true  |
 | viewMode           | 是否为预览模式                 | Boolean | false |
 | @action            | 表格详情列的单击事件              | event   | -     |
-| @afterSubmit       | 增删改提交后的回调方法             | event   | -     |
+| @afterSubmit       | 增改提交后的回调方法             | event   | -     |
+| @afterDelete       | 删除提交后的回调方法             | event   | -     |
 | @afterSearchSubmit | 查询提交后的回调方法              | event   | -     |
  | @afterQuery        | 表格查询后的回调方法              | event   | -     |
 ## 例子1

package/src/base-client/components/common/XTable/XTable.vue

@@ -22,7 +22,7 @@
             <a-button @click="showDrawer">
               <a-icon :style="iconStyle" type="table" />
             </a-button>
-            <a-button @click="exports">
+            <a-button @click="exports" v-if="!buttonState || buttonState.export">
               <a-icon :style="iconStyle" type="cloud-download"/>
             </a-button>
           </a-button-group>
@@ -164,6 +164,13 @@ export default {
       default: () => {
         return {}
       }
+    },
+    // 按钮
+    buttonState: {
+      type: Object,
+      default: () => {
+        return undefined
+      }
     }
   },
   computed: {

package/src/pages/CreateQueryPage.vue

@@ -1,58 +1,58 @@
-<template>
-  <div>
-    <create-query
-      :visible.sync="visible"
-      @saveQueryParams="saveQueryParams"
-    />
-    <create-simple-form-query
-      :visible.sync="createSimpleFormVisible"
-      @saveSimpleFormQueryParams="saveSimpleFormQueryParams"
-    />
-    <a-button type="primary" style="margin-top: 10px;margin-left: 10px;" @click="showDrawer">打开完整查询配置生成工具</a-button>
-    <a-button type="primary" style="margin-top: 10px;margin-left: 10px;" @click="showSimpleFormQueryParamsDrawer">打开基础表单配置生成工具</a-button>
-  </div>
-</template>
-
-<script>
-import { post } from '@vue2-client/services/api/restTools'
-
-export default {
-  name: 'CreateQueryPage',
-  data () {
-    return {
-      visible: false,
-      createSimpleFormVisible: false
-    }
-  },
-  methods: {
-    showDrawer () {
-      this.visible = true
-    },
-    showSimpleFormQueryParamsDrawer () {
-      this.createSimpleFormVisible = true
-    },
-    // 存储查询配置信息
-    saveQueryParams (source) {
-      return post('/webmeterapi/addOrEditQueryParams', {
-        source: source
-      }).then(res => {
-        this.$message.success('保存查询配置成功')
-      }, err => {
-        console.error(err)
-      })
-    },
-    // 存储基础表单配置信息
-    saveSimpleFormQueryParams (source) {
-      return post('/webmeterapi/addOrEditSimpleFormQueryParams', {
-        source: source
-      }).then(res => {
-        this.$message.success('保存基础表单配置成功')
-      }, err => {
-        console.error(err)
-      })
-    }
-  }
-}
-</script>
-<style lang="less" scoped>
-</style>
+<template>
+  <div>
+    <create-query
+      :visible.sync="visible"
+      @saveQueryParams="saveQueryParams"
+    />
+    <create-simple-form-query
+      :visible.sync="createSimpleFormVisible"
+      @saveSimpleFormQueryParams="saveSimpleFormQueryParams"
+    />
+    <a-button type="primary" style="margin-top: 10px;margin-left: 10px;" @click="showDrawer">打开完整查询配置生成工具</a-button>
+    <a-button type="primary" style="margin-top: 10px;margin-left: 10px;" @click="showSimpleFormQueryParamsDrawer">打开基础表单配置生成工具</a-button>
+  </div>
+</template>
+
+<script>
+import { post } from '@vue2-client/services/api/restTools'
+
+export default {
+  name: 'CreateQueryPage',
+  data () {
+    return {
+      visible: false,
+      createSimpleFormVisible: false
+    }
+  },
+  methods: {
+    showDrawer () {
+      this.visible = true
+    },
+    showSimpleFormQueryParamsDrawer () {
+      this.createSimpleFormVisible = true
+    },
+    // 存储查询配置信息
+    saveQueryParams (source) {
+      return post('/webmeterapi/addOrEditQueryParams', {
+        source: source
+      }).then(res => {
+        this.$message.success('保存查询配置成功')
+      }, err => {
+        console.error(err)
+      })
+    },
+    // 存储基础表单配置信息
+    saveSimpleFormQueryParams (source) {
+      return post('/webmeterapi/addOrEditSimpleFormQueryParams', {
+        source: source
+      }).then(res => {
+        this.$message.success('保存基础表单配置成功')
+      }, err => {
+        console.error(err)
+      })
+    }
+  }
+}
+</script>
+<style lang="less" scoped>
+</style>

package/vue.config.js

@@ -1,153 +1,153 @@
-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
-      },
-      '/webmeterresourceapi': {
-        pathRewrite: { '^/webmeterresourceapi': '/rs/resource' },
-        target: local,
-        changeOrigin: true
-      },
-      '/resource': {
-        pathRewrite: { '^/resource': '/' },
-        target: 'http://127.0.0.1:4789',
-        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
+      },
+      '/webmeterresourceapi': {
+        pathRewrite: { '^/webmeterresourceapi': '/rs/resource' },
+        target: local,
+        changeOrigin: true
+      },
+      '/resource': {
+        pathRewrite: { '^/resource': '/' },
+        target: 'http://127.0.0.1:4789',
+        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
+}