system-clients 1.6.67-foric → 1.6.68-foric

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
Files changed (5) hide show
  1. package/.gradle/3.5.1/file-changes/last-build.bin +0 -0
  2. package/.gradle/3.5.1/taskHistory/taskHistory.lock +0 -0
  3. package/build/webpack.base.conf.js +75 -75
  4. package/package.json +1 -1
  5. package/src/components/server/Login.vue +6 -3
package/build/webpack.base.conf.js CHANGED
@@ -1,75 +1,75 @@
1
- var path = require('path')
2
- var cssLoaders = require('./css-loaders')
3
- var projectRoot = path.resolve(__dirname, '../')
4
-
5
- module.exports = {
6
- entry: {
7
- app: './src/main.js'
8
- },
9
- output: {
10
- path: path.resolve(__dirname, '../dist/static'),
11
- publicPath: 'static/',
12
- filename: '[name].js'
13
- },
14
- resolve: {
15
- extensions: ['', '.js', '.vue'],
16
- fallback: [path.join(__dirname, '../node_modules')],
17
- alias: {
18
- 'test': path.resolve(__dirname, '../test'),
19
- 'src': path.resolve(__dirname, '../src')
20
- }
21
- },
22
- resolveLoader: {
23
- fallback: [path.join(__dirname, '../node_modules')]
24
- },
25
- module: {
26
- loaders: [
27
- {
28
- test: /\.vue$/,
29
- loader: 'vue'
30
- },
31
- {
32
- test: /\.js$/,
33
- loader: 'babel',
34
- include: [
35
- `${projectRoot}\\src`,
36
- `${projectRoot}\\build`,
37
- `${projectRoot}\\examples`,
38
- `${projectRoot}\\test`,
39
- `${projectRoot}\\node_modules\\vue-client\\src`,
40
- `${projectRoot}\\node_modules\\vue-strap\\src`
41
- ]
42
- },
43
- {
44
- test: /\.json$/,
45
- loader: 'json'
46
- },
47
- {
48
- test: /\.html$/,
49
- loader: 'vue-html'
50
- },
51
- {
52
- test: /\.less$/,
53
- loader: 'style!css!less'
54
- },
55
- {
56
- test: /\.(png|jpg|gif|svg|woff2?|eot|ttf)(\?.*)?$/,
57
- loader: 'url',
58
- query: {
59
- limit: 10000,
60
- name: '[name].[ext]?[hash:7]'
61
- }
62
- }
63
- ]
64
- },
65
- vue: {
66
- loaders: cssLoaders({
67
- sourceMap: false,
68
- extract: false
69
- })
70
- },
71
- plugins: [],
72
- eslint: {
73
- formatter: require('eslint-friendly-formatter')
74
- }
75
- }
1
+ var path = require('path')
2
+ var cssLoaders = require('./css-loaders')
3
+ var projectRoot = path.resolve(__dirname, '../')
4
+
5
+ module.exports = {
6
+ entry: {
7
+ app: './src/main.js'
8
+ },
9
+ output: {
10
+ path: path.resolve(__dirname, '../dist/static'),
11
+ publicPath: 'static/',
12
+ filename: '[name].js'
13
+ },
14
+ resolve: {
15
+ extensions: ['', '.js', '.vue'],
16
+ fallback: [path.join(__dirname, '../node_modules')],
17
+ alias: {
18
+ 'test': path.resolve(__dirname, '../test'),
19
+ 'src': path.resolve(__dirname, '../src')
20
+ }
21
+ },
22
+ resolveLoader: {
23
+ fallback: [path.join(__dirname, '../node_modules')]
24
+ },
25
+ module: {
26
+ loaders: [
27
+ {
28
+ test: /\.vue$/,
29
+ loader: 'vue'
30
+ },
31
+ {
32
+ test: /\.js$/,
33
+ loader: 'babel',
34
+ include: [
35
+ `${projectRoot}\\src`,
36
+ `${projectRoot}\\build`,
37
+ `${projectRoot}\\examples`,
38
+ `${projectRoot}\\test`,
39
+ `${projectRoot}\\node_modules\\vue-client\\src`,
40
+ `${projectRoot}\\node_modules\\vue-strap\\src`
41
+ ]
42
+ },
43
+ {
44
+ test: /\.json$/,
45
+ loader: 'json'
46
+ },
47
+ {
48
+ test: /\.html$/,
49
+ loader: 'vue-html'
50
+ },
51
+ {
52
+ test: /\.less$/,
53
+ loader: 'style!css!less'
54
+ },
55
+ {
56
+ test: /\.(png|jpg|gif|svg|woff2?|eot|ttf)(\?.*)?$/,
57
+ loader: 'url',
58
+ query: {
59
+ limit: 10000,
60
+ name: '[name].[ext]?[hash:7]'
61
+ }
62
+ }
63
+ ]
64
+ },
65
+ vue: {
66
+ loaders: cssLoaders({
67
+ sourceMap: false,
68
+ extract: false
69
+ })
70
+ },
71
+ plugins: [],
72
+ eslint: {
73
+ formatter: require('eslint-friendly-formatter')
74
+ }
75
+ }
package/package.json CHANGED
@@ -1,6 +1,6 @@
1
1
  {
2
2
  "name": "system-clients",
3
- "version": "1.6.67-foric",
3
+ "version": "1.6.68-foric",
4
4
  "description": "系统基础框架",
5
5
  "main": "src/index.js",
6
6
  "directories": {
package/src/components/server/Login.vue CHANGED
@@ -84,7 +84,7 @@
84
84
  import co from 'co'
85
85
  import $ from 'jquery'
86
86
 
87
- let saveGen = function *(self) {
87
+ let saveGen = function *(self, goto) {
88
88
  try {
89
89
  yield self.$login.login(self.model.ename, self.model.password)
90
90
  yield self.$appdata.load()
@@ -121,7 +121,10 @@
121
121
  throw new Error('Mac地址验证失败, 请联系管理员！！')
122
122
  }
123
123
  }
124
-
124
+ if (goto) {
125
+ self.$goto(goto, {functions: self.$login.f})
126
+ return
127
+ }
125
128
  self.$goto('home-page', {functions: self.$login.f})
126
129
  } catch (ret) {
127
130
  console.error('登录失败', ret)
@@ -168,7 +171,7 @@
168
171
  this.model.ename = res.data[0].ename
169
172
  this.model.password = res.data[0].password
170
173
  // this.$showMessage("re----" + JSON.stringify(this.model))
171
- let gen = saveGen(this)
174
+ let gen = obj.goto ? saveGen(this, obj.goto) : saveGen(this)
172
175
  return co(gen)
173
176
  }
174
177
  })