eoss-ui 0.5.63 → 0.5.64
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.
- package/lib/button-group.js +4 -2
- package/lib/button.js +4 -2
- package/lib/checkbox-group.js +4 -2
- package/lib/data-table-form.js +4 -2
- package/lib/data-table.js +4 -2
- package/lib/date-picker.js +4 -2
- package/lib/dialog.js +4 -2
- package/lib/eoss-ui.common.js +202 -168
- package/lib/flow-group.js +4 -2
- package/lib/flow-list.js +4 -2
- package/lib/flow.js +153 -123
- package/lib/form.js +9 -4
- package/lib/handle-user.js +4 -2
- package/lib/handler.js +4 -2
- package/lib/icon.js +4 -2
- package/lib/index.js +1 -1
- package/lib/input-number.js +4 -2
- package/lib/input.js +4 -2
- package/lib/login.js +14 -6
- package/lib/main.js +8 -9
- package/lib/nav.js +4 -2
- package/lib/page.js +4 -2
- package/lib/player.js +4 -2
- package/lib/qr-code.js +13 -13
- package/lib/radio-group.js +4 -2
- package/lib/retrial-auth.js +4 -2
- package/lib/select-ganged.js +4 -2
- package/lib/select.js +4 -2
- package/lib/selector-panel.js +4 -2
- package/lib/selector.js +4 -2
- package/lib/sizer.js +4 -2
- package/lib/steps.js +4 -2
- package/lib/switch.js +4 -2
- package/lib/table-form.js +4 -2
- package/lib/tabs.js +4 -2
- package/lib/theme-chalk/index.css +1 -1
- package/lib/theme-chalk/qr-code.css +1 -1
- package/lib/tips.js +4 -2
- package/lib/tree-group.js +4 -2
- package/lib/tree.js +4 -2
- package/lib/upload.js +4 -2
- package/lib/utils/util.js +4 -2
- package/lib/wujie.js +4 -2
- package/lib/wxlogin.js +4 -2
- package/package.json +1 -1
- package/packages/flow/src/processForm.vue +32 -4
- package/packages/form/src/main.vue +3 -0
- package/packages/login/src/main.vue +4 -1
- package/packages/main/src/main.vue +6 -5
- package/packages/qr-code/src/main.vue +10 -5
- package/packages/theme-chalk/lib/index.css +1 -1
- package/packages/theme-chalk/lib/qr-code.css +1 -1
- package/packages/theme-chalk/src/qr-code.scss +1 -1
- package/src/index.js +1 -1
- package/src/utils/util.js +4 -1
- package/CHANGELOG.md +0 -929
package/lib/input-number.js
CHANGED
|
@@ -2201,7 +2201,7 @@ var isLogined = function isLogined(_ref8) {
|
|
|
2201
2201
|
});
|
|
2202
2202
|
}
|
|
2203
2203
|
}).catch(function (e) {});
|
|
2204
|
-
} else if (token || to.path === '/' || to.path === '/404' || typeof exclude === 'boolean' && exclude || exclude.indexOf(to.path) > -1 || exclude.indexOf(to.name) > -1 || to.path === '/login' || token && to.path === '/main') {
|
|
2204
|
+
} else if (token || to.path === '/' || to.path === '/404' || to.path === '/error' || typeof exclude === 'boolean' && exclude || exclude.indexOf(to.path) > -1 || exclude.indexOf(to.name) > -1 || to.path === '/login' || token && to.path === '/main') {
|
|
2205
2205
|
if (redirect && (to.path === '/main' || to.path === '/login')) {
|
|
2206
2206
|
window.location.replace(urlJoinParams({ url: '.' + to.path + '.html', param: to.query }));
|
|
2207
2207
|
} else {
|
|
@@ -2891,7 +2891,9 @@ var toFunction = function toFunction(str) {
|
|
|
2891
2891
|
* @param {string} [$color] - 颜色值
|
|
2892
2892
|
**/
|
|
2893
2893
|
var updateTheme = function updateTheme(color, send) {
|
|
2894
|
-
|
|
2894
|
+
if (!color) {
|
|
2895
|
+
return false;
|
|
2896
|
+
}
|
|
2895
2897
|
|
|
2896
2898
|
if (send === undefined) {
|
|
2897
2899
|
send = true;
|
package/lib/input.js
CHANGED
|
@@ -2201,7 +2201,7 @@ var isLogined = function isLogined(_ref8) {
|
|
|
2201
2201
|
});
|
|
2202
2202
|
}
|
|
2203
2203
|
}).catch(function (e) {});
|
|
2204
|
-
} else if (token || to.path === '/' || to.path === '/404' || typeof exclude === 'boolean' && exclude || exclude.indexOf(to.path) > -1 || exclude.indexOf(to.name) > -1 || to.path === '/login' || token && to.path === '/main') {
|
|
2204
|
+
} else if (token || to.path === '/' || to.path === '/404' || to.path === '/error' || typeof exclude === 'boolean' && exclude || exclude.indexOf(to.path) > -1 || exclude.indexOf(to.name) > -1 || to.path === '/login' || token && to.path === '/main') {
|
|
2205
2205
|
if (redirect && (to.path === '/main' || to.path === '/login')) {
|
|
2206
2206
|
window.location.replace(urlJoinParams({ url: '.' + to.path + '.html', param: to.query }));
|
|
2207
2207
|
} else {
|
|
@@ -2891,7 +2891,9 @@ var toFunction = function toFunction(str) {
|
|
|
2891
2891
|
* @param {string} [$color] - 颜色值
|
|
2892
2892
|
**/
|
|
2893
2893
|
var updateTheme = function updateTheme(color, send) {
|
|
2894
|
-
|
|
2894
|
+
if (!color) {
|
|
2895
|
+
return false;
|
|
2896
|
+
}
|
|
2895
2897
|
|
|
2896
2898
|
if (send === undefined) {
|
|
2897
2899
|
send = true;
|
package/lib/login.js
CHANGED
|
@@ -2200,7 +2200,7 @@ var isLogined = function isLogined(_ref8) {
|
|
|
2200
2200
|
});
|
|
2201
2201
|
}
|
|
2202
2202
|
}).catch(function (e) {});
|
|
2203
|
-
} else if (token || to.path === '/' || to.path === '/404' || typeof exclude === 'boolean' && exclude || exclude.indexOf(to.path) > -1 || exclude.indexOf(to.name) > -1 || to.path === '/login' || token && to.path === '/main') {
|
|
2203
|
+
} else if (token || to.path === '/' || to.path === '/404' || to.path === '/error' || typeof exclude === 'boolean' && exclude || exclude.indexOf(to.path) > -1 || exclude.indexOf(to.name) > -1 || to.path === '/login' || token && to.path === '/main') {
|
|
2204
2204
|
if (redirect && (to.path === '/main' || to.path === '/login')) {
|
|
2205
2205
|
window.location.replace(urlJoinParams({ url: '.' + to.path + '.html', param: to.query }));
|
|
2206
2206
|
} else {
|
|
@@ -2890,7 +2890,9 @@ var toFunction = function toFunction(str) {
|
|
|
2890
2890
|
* @param {string} [$color] - 颜色值
|
|
2891
2891
|
**/
|
|
2892
2892
|
var updateTheme = function updateTheme(color, send) {
|
|
2893
|
-
|
|
2893
|
+
if (!color) {
|
|
2894
|
+
return false;
|
|
2895
|
+
}
|
|
2894
2896
|
|
|
2895
2897
|
if (send === undefined) {
|
|
2896
2898
|
send = true;
|
|
@@ -3843,7 +3845,7 @@ var bankCard = { pattern: new RegExp('^([1-9]{1})(\\d{14}|\\d{18})$'), message:
|
|
|
3843
3845
|
// ESM COMPAT FLAG
|
|
3844
3846
|
__webpack_require__.r(__webpack_exports__);
|
|
3845
3847
|
|
|
3846
|
-
// CONCATENATED MODULE: ./node_modules/vue-loader/lib/loaders/templateLoader.js??vue-loader-options!./node_modules/vue-loader/lib??vue-loader-options!./packages/login/src/main.vue?vue&type=template&id=
|
|
3848
|
+
// CONCATENATED MODULE: ./node_modules/vue-loader/lib/loaders/templateLoader.js??vue-loader-options!./node_modules/vue-loader/lib??vue-loader-options!./packages/login/src/main.vue?vue&type=template&id=44930eda&
|
|
3847
3849
|
var render = function () {
|
|
3848
3850
|
var _vm = this
|
|
3849
3851
|
var _h = _vm.$createElement
|
|
@@ -4361,7 +4363,10 @@ var render = function () {
|
|
|
4361
4363
|
),
|
|
4362
4364
|
_vm.active == 3 && _vm.identifyingId
|
|
4363
4365
|
? _c("es-qr-code", {
|
|
4364
|
-
attrs: {
|
|
4366
|
+
attrs: {
|
|
4367
|
+
content: _vm.identifyingId,
|
|
4368
|
+
logo: _vm.qrimg,
|
|
4369
|
+
},
|
|
4365
4370
|
})
|
|
4366
4371
|
: _vm._e(),
|
|
4367
4372
|
_vm.active == 9
|
|
@@ -4764,7 +4769,7 @@ var staticRenderFns = []
|
|
|
4764
4769
|
render._withStripped = true
|
|
4765
4770
|
|
|
4766
4771
|
|
|
4767
|
-
// CONCATENATED MODULE: ./packages/login/src/main.vue?vue&type=template&id=
|
|
4772
|
+
// CONCATENATED MODULE: ./packages/login/src/main.vue?vue&type=template&id=44930eda&
|
|
4768
4773
|
|
|
4769
4774
|
// CONCATENATED MODULE: ./node_modules/vue-loader/lib/loaders/templateLoader.js??vue-loader-options!./node_modules/vue-loader/lib??vue-loader-options!./packages/login/src/resetPassword.vue?vue&type=template&id=28f463b9&
|
|
4770
4775
|
var resetPasswordvue_type_template_id_28f463b9_render = function () {
|
|
@@ -5685,6 +5690,7 @@ var mainvue_type_script_lang_js_extends = Object.assign || function (target) { f
|
|
|
5685
5690
|
//
|
|
5686
5691
|
//
|
|
5687
5692
|
//
|
|
5693
|
+
//
|
|
5688
5694
|
|
|
5689
5695
|
|
|
5690
5696
|
|
|
@@ -6306,7 +6312,9 @@ var mainvue_type_script_lang_js_extends = Object.assign || function (target) { f
|
|
|
6306
6312
|
this.downloadSetup = res.downloadSetup;
|
|
6307
6313
|
document.title = res.subsystemName;
|
|
6308
6314
|
this.app = res.appName || res.subsystemName;
|
|
6309
|
-
|
|
6315
|
+
if (res.qrimg || res.qrImg) {
|
|
6316
|
+
this.qrimg = res.qrimg || res.qrImg;
|
|
6317
|
+
}
|
|
6310
6318
|
if (res.loginModel) {
|
|
6311
6319
|
this.loginModel = res.loginModel;
|
|
6312
6320
|
}
|
package/lib/main.js
CHANGED
|
@@ -2200,7 +2200,7 @@ var isLogined = function isLogined(_ref8) {
|
|
|
2200
2200
|
});
|
|
2201
2201
|
}
|
|
2202
2202
|
}).catch(function (e) {});
|
|
2203
|
-
} else if (token || to.path === '/' || to.path === '/404' || typeof exclude === 'boolean' && exclude || exclude.indexOf(to.path) > -1 || exclude.indexOf(to.name) > -1 || to.path === '/login' || token && to.path === '/main') {
|
|
2203
|
+
} else if (token || to.path === '/' || to.path === '/404' || to.path === '/error' || typeof exclude === 'boolean' && exclude || exclude.indexOf(to.path) > -1 || exclude.indexOf(to.name) > -1 || to.path === '/login' || token && to.path === '/main') {
|
|
2204
2204
|
if (redirect && (to.path === '/main' || to.path === '/login')) {
|
|
2205
2205
|
window.location.replace(urlJoinParams({ url: '.' + to.path + '.html', param: to.query }));
|
|
2206
2206
|
} else {
|
|
@@ -2890,7 +2890,9 @@ var toFunction = function toFunction(str) {
|
|
|
2890
2890
|
* @param {string} [$color] - 颜色值
|
|
2891
2891
|
**/
|
|
2892
2892
|
var updateTheme = function updateTheme(color, send) {
|
|
2893
|
-
|
|
2893
|
+
if (!color) {
|
|
2894
|
+
return false;
|
|
2895
|
+
}
|
|
2894
2896
|
|
|
2895
2897
|
if (send === undefined) {
|
|
2896
2898
|
send = true;
|
|
@@ -3826,7 +3828,7 @@ module.exports = require("runtime-import");
|
|
|
3826
3828
|
// ESM COMPAT FLAG
|
|
3827
3829
|
__webpack_require__.r(__webpack_exports__);
|
|
3828
3830
|
|
|
3829
|
-
// CONCATENATED MODULE: ./node_modules/vue-loader/lib/loaders/templateLoader.js??vue-loader-options!./node_modules/vue-loader/lib??vue-loader-options!./packages/main/src/main.vue?vue&type=template&id=
|
|
3831
|
+
// CONCATENATED MODULE: ./node_modules/vue-loader/lib/loaders/templateLoader.js??vue-loader-options!./node_modules/vue-loader/lib??vue-loader-options!./packages/main/src/main.vue?vue&type=template&id=5b54252b&
|
|
3830
3832
|
var render = function () {
|
|
3831
3833
|
var _vm = this
|
|
3832
3834
|
var _h = _vm.$createElement
|
|
@@ -4258,7 +4260,7 @@ var staticRenderFns = []
|
|
|
4258
4260
|
render._withStripped = true
|
|
4259
4261
|
|
|
4260
4262
|
|
|
4261
|
-
// CONCATENATED MODULE: ./packages/main/src/main.vue?vue&type=template&id=
|
|
4263
|
+
// CONCATENATED MODULE: ./packages/main/src/main.vue?vue&type=template&id=5b54252b&
|
|
4262
4264
|
|
|
4263
4265
|
// CONCATENATED MODULE: ./node_modules/vue-loader/lib/loaders/templateLoader.js??vue-loader-options!./node_modules/vue-loader/lib??vue-loader-options!./packages/main/src/userinfo.vue?vue&type=template&id=75d533de&
|
|
4264
4266
|
var userinfovue_type_template_id_75d533de_render = function () {
|
|
@@ -6382,10 +6384,7 @@ var appCode = util["a" /* default */].getParams('appCode') || util["a" /* defaul
|
|
|
6382
6384
|
//菜单展开关闭
|
|
6383
6385
|
icons: Object,
|
|
6384
6386
|
//logo
|
|
6385
|
-
logo:
|
|
6386
|
-
type: String,
|
|
6387
|
-
default: 'errorlogo'
|
|
6388
|
-
},
|
|
6387
|
+
logo: String,
|
|
6389
6388
|
//菜单显示类型
|
|
6390
6389
|
scene: {
|
|
6391
6390
|
type: String,
|
|
@@ -7728,7 +7727,7 @@ var appCode = util["a" /* default */].getParams('appCode') || util["a" /* defaul
|
|
|
7728
7727
|
util["a" /* default */].win.open(page);
|
|
7729
7728
|
} else if (type == 2) {
|
|
7730
7729
|
location.href = page;
|
|
7731
|
-
} else if (type == 3) {
|
|
7730
|
+
} else if (type == 3 || this.loadWujie === false || this.downgrade && isIE) {
|
|
7732
7731
|
this.method = 'iframe';
|
|
7733
7732
|
this.refresh = false;
|
|
7734
7733
|
this.page = util["a" /* default */].handlerUrl(page, param);
|
package/lib/nav.js
CHANGED
|
@@ -2201,7 +2201,7 @@ var isLogined = function isLogined(_ref8) {
|
|
|
2201
2201
|
});
|
|
2202
2202
|
}
|
|
2203
2203
|
}).catch(function (e) {});
|
|
2204
|
-
} else if (token || to.path === '/' || to.path === '/404' || typeof exclude === 'boolean' && exclude || exclude.indexOf(to.path) > -1 || exclude.indexOf(to.name) > -1 || to.path === '/login' || token && to.path === '/main') {
|
|
2204
|
+
} else if (token || to.path === '/' || to.path === '/404' || to.path === '/error' || typeof exclude === 'boolean' && exclude || exclude.indexOf(to.path) > -1 || exclude.indexOf(to.name) > -1 || to.path === '/login' || token && to.path === '/main') {
|
|
2205
2205
|
if (redirect && (to.path === '/main' || to.path === '/login')) {
|
|
2206
2206
|
window.location.replace(urlJoinParams({ url: '.' + to.path + '.html', param: to.query }));
|
|
2207
2207
|
} else {
|
|
@@ -2891,7 +2891,9 @@ var toFunction = function toFunction(str) {
|
|
|
2891
2891
|
* @param {string} [$color] - 颜色值
|
|
2892
2892
|
**/
|
|
2893
2893
|
var updateTheme = function updateTheme(color, send) {
|
|
2894
|
-
|
|
2894
|
+
if (!color) {
|
|
2895
|
+
return false;
|
|
2896
|
+
}
|
|
2895
2897
|
|
|
2896
2898
|
if (send === undefined) {
|
|
2897
2899
|
send = true;
|
package/lib/page.js
CHANGED
|
@@ -2201,7 +2201,7 @@ var isLogined = function isLogined(_ref8) {
|
|
|
2201
2201
|
});
|
|
2202
2202
|
}
|
|
2203
2203
|
}).catch(function (e) {});
|
|
2204
|
-
} else if (token || to.path === '/' || to.path === '/404' || typeof exclude === 'boolean' && exclude || exclude.indexOf(to.path) > -1 || exclude.indexOf(to.name) > -1 || to.path === '/login' || token && to.path === '/main') {
|
|
2204
|
+
} else if (token || to.path === '/' || to.path === '/404' || to.path === '/error' || typeof exclude === 'boolean' && exclude || exclude.indexOf(to.path) > -1 || exclude.indexOf(to.name) > -1 || to.path === '/login' || token && to.path === '/main') {
|
|
2205
2205
|
if (redirect && (to.path === '/main' || to.path === '/login')) {
|
|
2206
2206
|
window.location.replace(urlJoinParams({ url: '.' + to.path + '.html', param: to.query }));
|
|
2207
2207
|
} else {
|
|
@@ -2891,7 +2891,9 @@ var toFunction = function toFunction(str) {
|
|
|
2891
2891
|
* @param {string} [$color] - 颜色值
|
|
2892
2892
|
**/
|
|
2893
2893
|
var updateTheme = function updateTheme(color, send) {
|
|
2894
|
-
|
|
2894
|
+
if (!color) {
|
|
2895
|
+
return false;
|
|
2896
|
+
}
|
|
2895
2897
|
|
|
2896
2898
|
if (send === undefined) {
|
|
2897
2899
|
send = true;
|
package/lib/player.js
CHANGED
|
@@ -2201,7 +2201,7 @@ var isLogined = function isLogined(_ref8) {
|
|
|
2201
2201
|
});
|
|
2202
2202
|
}
|
|
2203
2203
|
}).catch(function (e) {});
|
|
2204
|
-
} else if (token || to.path === '/' || to.path === '/404' || typeof exclude === 'boolean' && exclude || exclude.indexOf(to.path) > -1 || exclude.indexOf(to.name) > -1 || to.path === '/login' || token && to.path === '/main') {
|
|
2204
|
+
} else if (token || to.path === '/' || to.path === '/404' || to.path === '/error' || typeof exclude === 'boolean' && exclude || exclude.indexOf(to.path) > -1 || exclude.indexOf(to.name) > -1 || to.path === '/login' || token && to.path === '/main') {
|
|
2205
2205
|
if (redirect && (to.path === '/main' || to.path === '/login')) {
|
|
2206
2206
|
window.location.replace(urlJoinParams({ url: '.' + to.path + '.html', param: to.query }));
|
|
2207
2207
|
} else {
|
|
@@ -2891,7 +2891,9 @@ var toFunction = function toFunction(str) {
|
|
|
2891
2891
|
* @param {string} [$color] - 颜色值
|
|
2892
2892
|
**/
|
|
2893
2893
|
var updateTheme = function updateTheme(color, send) {
|
|
2894
|
-
|
|
2894
|
+
if (!color) {
|
|
2895
|
+
return false;
|
|
2896
|
+
}
|
|
2895
2897
|
|
|
2896
2898
|
if (send === undefined) {
|
|
2897
2899
|
send = true;
|
package/lib/qr-code.js
CHANGED
|
@@ -2201,7 +2201,7 @@ var isLogined = function isLogined(_ref8) {
|
|
|
2201
2201
|
});
|
|
2202
2202
|
}
|
|
2203
2203
|
}).catch(function (e) {});
|
|
2204
|
-
} else if (token || to.path === '/' || to.path === '/404' || typeof exclude === 'boolean' && exclude || exclude.indexOf(to.path) > -1 || exclude.indexOf(to.name) > -1 || to.path === '/login' || token && to.path === '/main') {
|
|
2204
|
+
} else if (token || to.path === '/' || to.path === '/404' || to.path === '/error' || typeof exclude === 'boolean' && exclude || exclude.indexOf(to.path) > -1 || exclude.indexOf(to.name) > -1 || to.path === '/login' || token && to.path === '/main') {
|
|
2205
2205
|
if (redirect && (to.path === '/main' || to.path === '/login')) {
|
|
2206
2206
|
window.location.replace(urlJoinParams({ url: '.' + to.path + '.html', param: to.query }));
|
|
2207
2207
|
} else {
|
|
@@ -2891,7 +2891,9 @@ var toFunction = function toFunction(str) {
|
|
|
2891
2891
|
* @param {string} [$color] - 颜色值
|
|
2892
2892
|
**/
|
|
2893
2893
|
var updateTheme = function updateTheme(color, send) {
|
|
2894
|
-
|
|
2894
|
+
if (!color) {
|
|
2895
|
+
return false;
|
|
2896
|
+
}
|
|
2895
2897
|
|
|
2896
2898
|
if (send === undefined) {
|
|
2897
2899
|
send = true;
|
|
@@ -3635,7 +3637,7 @@ module.exports = require("axios");
|
|
|
3635
3637
|
// ESM COMPAT FLAG
|
|
3636
3638
|
__webpack_require__.r(__webpack_exports__);
|
|
3637
3639
|
|
|
3638
|
-
// CONCATENATED MODULE: ./node_modules/vue-loader/lib/loaders/templateLoader.js??vue-loader-options!./node_modules/vue-loader/lib??vue-loader-options!./packages/qr-code/src/main.vue?vue&type=template&id=
|
|
3640
|
+
// CONCATENATED MODULE: ./node_modules/vue-loader/lib/loaders/templateLoader.js??vue-loader-options!./node_modules/vue-loader/lib??vue-loader-options!./packages/qr-code/src/main.vue?vue&type=template&id=28375a46&
|
|
3639
3641
|
var render = function () {
|
|
3640
3642
|
var _vm = this
|
|
3641
3643
|
var _h = _vm.$createElement
|
|
@@ -3649,13 +3651,6 @@ var render = function () {
|
|
|
3649
3651
|
staticClass: "es-qrcode-img",
|
|
3650
3652
|
attrs: { width: _vm._width, height: _vm._height, alt: "二维码图片" },
|
|
3651
3653
|
}),
|
|
3652
|
-
_vm.logo
|
|
3653
|
-
? _c("img", {
|
|
3654
|
-
ref: "qrcodeLogo",
|
|
3655
|
-
staticClass: "es-qrcode-logo",
|
|
3656
|
-
attrs: { src: _vm.logo, alt: "二维码logo" },
|
|
3657
|
-
})
|
|
3658
|
-
: _vm._e(),
|
|
3659
3654
|
_c("canvas", {
|
|
3660
3655
|
ref: "canvas",
|
|
3661
3656
|
staticClass: "canvas",
|
|
@@ -3668,7 +3663,7 @@ var staticRenderFns = []
|
|
|
3668
3663
|
render._withStripped = true
|
|
3669
3664
|
|
|
3670
3665
|
|
|
3671
|
-
// CONCATENATED MODULE: ./packages/qr-code/src/main.vue?vue&type=template&id=
|
|
3666
|
+
// CONCATENATED MODULE: ./packages/qr-code/src/main.vue?vue&type=template&id=28375a46&
|
|
3672
3667
|
|
|
3673
3668
|
// EXTERNAL MODULE: ./src/utils/util.js
|
|
3674
3669
|
var util = __webpack_require__(0);
|
|
@@ -3776,7 +3771,7 @@ var QRCode = __webpack_require__(28);
|
|
|
3776
3771
|
var _this3 = this;
|
|
3777
3772
|
|
|
3778
3773
|
var qrcodeImg = this.$refs.qrcodeImg;
|
|
3779
|
-
|
|
3774
|
+
//let qrcodeLogo = this.$refs.qrcodeLogo;
|
|
3780
3775
|
var canvas = this.$refs.canvas;
|
|
3781
3776
|
var option = util["a" /* default */].extend({}, this.option, {
|
|
3782
3777
|
width: this._width,
|
|
@@ -3794,6 +3789,8 @@ var QRCode = __webpack_require__(28);
|
|
|
3794
3789
|
//获取图片
|
|
3795
3790
|
ctx.drawImage(qrcodeImg, 0, 0, _this3._width, _this3._height);
|
|
3796
3791
|
if (_this3.logo && _this3.logo.indexOf('.') > -1) {
|
|
3792
|
+
var logo = new Image();
|
|
3793
|
+
logo.src = _this3.logo;
|
|
3797
3794
|
//设置logo大小
|
|
3798
3795
|
var logoPosition = (_this3._width - 46) / 2; //logo相对于canvas居中定位
|
|
3799
3796
|
//设置获取的logo将其变为圆角以及添加白色背景
|
|
@@ -3811,7 +3808,10 @@ var QRCode = __webpack_require__(28);
|
|
|
3811
3808
|
ctx.arcTo(x, y, x + w, y, r);
|
|
3812
3809
|
ctx.closePath();
|
|
3813
3810
|
ctx.fill(); */
|
|
3814
|
-
|
|
3811
|
+
logo.onload = function () {
|
|
3812
|
+
ctx.drawImage(logo, logoPosition, logoPosition, 46, 46);
|
|
3813
|
+
qrcodeImg.src = canvas.toDataURL();
|
|
3814
|
+
};
|
|
3815
3815
|
} else if (_this3.text) {
|
|
3816
3816
|
//设置字体
|
|
3817
3817
|
var fpadd = 10; //规定内间距
|
package/lib/radio-group.js
CHANGED
|
@@ -2201,7 +2201,7 @@ var isLogined = function isLogined(_ref8) {
|
|
|
2201
2201
|
});
|
|
2202
2202
|
}
|
|
2203
2203
|
}).catch(function (e) {});
|
|
2204
|
-
} else if (token || to.path === '/' || to.path === '/404' || typeof exclude === 'boolean' && exclude || exclude.indexOf(to.path) > -1 || exclude.indexOf(to.name) > -1 || to.path === '/login' || token && to.path === '/main') {
|
|
2204
|
+
} else if (token || to.path === '/' || to.path === '/404' || to.path === '/error' || typeof exclude === 'boolean' && exclude || exclude.indexOf(to.path) > -1 || exclude.indexOf(to.name) > -1 || to.path === '/login' || token && to.path === '/main') {
|
|
2205
2205
|
if (redirect && (to.path === '/main' || to.path === '/login')) {
|
|
2206
2206
|
window.location.replace(urlJoinParams({ url: '.' + to.path + '.html', param: to.query }));
|
|
2207
2207
|
} else {
|
|
@@ -2891,7 +2891,9 @@ var toFunction = function toFunction(str) {
|
|
|
2891
2891
|
* @param {string} [$color] - 颜色值
|
|
2892
2892
|
**/
|
|
2893
2893
|
var updateTheme = function updateTheme(color, send) {
|
|
2894
|
-
|
|
2894
|
+
if (!color) {
|
|
2895
|
+
return false;
|
|
2896
|
+
}
|
|
2895
2897
|
|
|
2896
2898
|
if (send === undefined) {
|
|
2897
2899
|
send = true;
|
package/lib/retrial-auth.js
CHANGED
|
@@ -2201,7 +2201,7 @@ var isLogined = function isLogined(_ref8) {
|
|
|
2201
2201
|
});
|
|
2202
2202
|
}
|
|
2203
2203
|
}).catch(function (e) {});
|
|
2204
|
-
} else if (token || to.path === '/' || to.path === '/404' || typeof exclude === 'boolean' && exclude || exclude.indexOf(to.path) > -1 || exclude.indexOf(to.name) > -1 || to.path === '/login' || token && to.path === '/main') {
|
|
2204
|
+
} else if (token || to.path === '/' || to.path === '/404' || to.path === '/error' || typeof exclude === 'boolean' && exclude || exclude.indexOf(to.path) > -1 || exclude.indexOf(to.name) > -1 || to.path === '/login' || token && to.path === '/main') {
|
|
2205
2205
|
if (redirect && (to.path === '/main' || to.path === '/login')) {
|
|
2206
2206
|
window.location.replace(urlJoinParams({ url: '.' + to.path + '.html', param: to.query }));
|
|
2207
2207
|
} else {
|
|
@@ -2891,7 +2891,9 @@ var toFunction = function toFunction(str) {
|
|
|
2891
2891
|
* @param {string} [$color] - 颜色值
|
|
2892
2892
|
**/
|
|
2893
2893
|
var updateTheme = function updateTheme(color, send) {
|
|
2894
|
-
|
|
2894
|
+
if (!color) {
|
|
2895
|
+
return false;
|
|
2896
|
+
}
|
|
2895
2897
|
|
|
2896
2898
|
if (send === undefined) {
|
|
2897
2899
|
send = true;
|
package/lib/select-ganged.js
CHANGED
|
@@ -2201,7 +2201,7 @@ var isLogined = function isLogined(_ref8) {
|
|
|
2201
2201
|
});
|
|
2202
2202
|
}
|
|
2203
2203
|
}).catch(function (e) {});
|
|
2204
|
-
} else if (token || to.path === '/' || to.path === '/404' || typeof exclude === 'boolean' && exclude || exclude.indexOf(to.path) > -1 || exclude.indexOf(to.name) > -1 || to.path === '/login' || token && to.path === '/main') {
|
|
2204
|
+
} else if (token || to.path === '/' || to.path === '/404' || to.path === '/error' || typeof exclude === 'boolean' && exclude || exclude.indexOf(to.path) > -1 || exclude.indexOf(to.name) > -1 || to.path === '/login' || token && to.path === '/main') {
|
|
2205
2205
|
if (redirect && (to.path === '/main' || to.path === '/login')) {
|
|
2206
2206
|
window.location.replace(urlJoinParams({ url: '.' + to.path + '.html', param: to.query }));
|
|
2207
2207
|
} else {
|
|
@@ -2891,7 +2891,9 @@ var toFunction = function toFunction(str) {
|
|
|
2891
2891
|
* @param {string} [$color] - 颜色值
|
|
2892
2892
|
**/
|
|
2893
2893
|
var updateTheme = function updateTheme(color, send) {
|
|
2894
|
-
|
|
2894
|
+
if (!color) {
|
|
2895
|
+
return false;
|
|
2896
|
+
}
|
|
2895
2897
|
|
|
2896
2898
|
if (send === undefined) {
|
|
2897
2899
|
send = true;
|
package/lib/select.js
CHANGED
|
@@ -2201,7 +2201,7 @@ var isLogined = function isLogined(_ref8) {
|
|
|
2201
2201
|
});
|
|
2202
2202
|
}
|
|
2203
2203
|
}).catch(function (e) {});
|
|
2204
|
-
} else if (token || to.path === '/' || to.path === '/404' || typeof exclude === 'boolean' && exclude || exclude.indexOf(to.path) > -1 || exclude.indexOf(to.name) > -1 || to.path === '/login' || token && to.path === '/main') {
|
|
2204
|
+
} else if (token || to.path === '/' || to.path === '/404' || to.path === '/error' || typeof exclude === 'boolean' && exclude || exclude.indexOf(to.path) > -1 || exclude.indexOf(to.name) > -1 || to.path === '/login' || token && to.path === '/main') {
|
|
2205
2205
|
if (redirect && (to.path === '/main' || to.path === '/login')) {
|
|
2206
2206
|
window.location.replace(urlJoinParams({ url: '.' + to.path + '.html', param: to.query }));
|
|
2207
2207
|
} else {
|
|
@@ -2891,7 +2891,9 @@ var toFunction = function toFunction(str) {
|
|
|
2891
2891
|
* @param {string} [$color] - 颜色值
|
|
2892
2892
|
**/
|
|
2893
2893
|
var updateTheme = function updateTheme(color, send) {
|
|
2894
|
-
|
|
2894
|
+
if (!color) {
|
|
2895
|
+
return false;
|
|
2896
|
+
}
|
|
2895
2897
|
|
|
2896
2898
|
if (send === undefined) {
|
|
2897
2899
|
send = true;
|
package/lib/selector-panel.js
CHANGED
|
@@ -2200,7 +2200,7 @@ var isLogined = function isLogined(_ref8) {
|
|
|
2200
2200
|
});
|
|
2201
2201
|
}
|
|
2202
2202
|
}).catch(function (e) {});
|
|
2203
|
-
} else if (token || to.path === '/' || to.path === '/404' || typeof exclude === 'boolean' && exclude || exclude.indexOf(to.path) > -1 || exclude.indexOf(to.name) > -1 || to.path === '/login' || token && to.path === '/main') {
|
|
2203
|
+
} else if (token || to.path === '/' || to.path === '/404' || to.path === '/error' || typeof exclude === 'boolean' && exclude || exclude.indexOf(to.path) > -1 || exclude.indexOf(to.name) > -1 || to.path === '/login' || token && to.path === '/main') {
|
|
2204
2204
|
if (redirect && (to.path === '/main' || to.path === '/login')) {
|
|
2205
2205
|
window.location.replace(urlJoinParams({ url: '.' + to.path + '.html', param: to.query }));
|
|
2206
2206
|
} else {
|
|
@@ -2890,7 +2890,9 @@ var toFunction = function toFunction(str) {
|
|
|
2890
2890
|
* @param {string} [$color] - 颜色值
|
|
2891
2891
|
**/
|
|
2892
2892
|
var updateTheme = function updateTheme(color, send) {
|
|
2893
|
-
|
|
2893
|
+
if (!color) {
|
|
2894
|
+
return false;
|
|
2895
|
+
}
|
|
2894
2896
|
|
|
2895
2897
|
if (send === undefined) {
|
|
2896
2898
|
send = true;
|
package/lib/selector.js
CHANGED
|
@@ -2201,7 +2201,7 @@ var isLogined = function isLogined(_ref8) {
|
|
|
2201
2201
|
});
|
|
2202
2202
|
}
|
|
2203
2203
|
}).catch(function (e) {});
|
|
2204
|
-
} else if (token || to.path === '/' || to.path === '/404' || typeof exclude === 'boolean' && exclude || exclude.indexOf(to.path) > -1 || exclude.indexOf(to.name) > -1 || to.path === '/login' || token && to.path === '/main') {
|
|
2204
|
+
} else if (token || to.path === '/' || to.path === '/404' || to.path === '/error' || typeof exclude === 'boolean' && exclude || exclude.indexOf(to.path) > -1 || exclude.indexOf(to.name) > -1 || to.path === '/login' || token && to.path === '/main') {
|
|
2205
2205
|
if (redirect && (to.path === '/main' || to.path === '/login')) {
|
|
2206
2206
|
window.location.replace(urlJoinParams({ url: '.' + to.path + '.html', param: to.query }));
|
|
2207
2207
|
} else {
|
|
@@ -2891,7 +2891,9 @@ var toFunction = function toFunction(str) {
|
|
|
2891
2891
|
* @param {string} [$color] - 颜色值
|
|
2892
2892
|
**/
|
|
2893
2893
|
var updateTheme = function updateTheme(color, send) {
|
|
2894
|
-
|
|
2894
|
+
if (!color) {
|
|
2895
|
+
return false;
|
|
2896
|
+
}
|
|
2895
2897
|
|
|
2896
2898
|
if (send === undefined) {
|
|
2897
2899
|
send = true;
|
package/lib/sizer.js
CHANGED
|
@@ -2201,7 +2201,7 @@ var isLogined = function isLogined(_ref8) {
|
|
|
2201
2201
|
});
|
|
2202
2202
|
}
|
|
2203
2203
|
}).catch(function (e) {});
|
|
2204
|
-
} else if (token || to.path === '/' || to.path === '/404' || typeof exclude === 'boolean' && exclude || exclude.indexOf(to.path) > -1 || exclude.indexOf(to.name) > -1 || to.path === '/login' || token && to.path === '/main') {
|
|
2204
|
+
} else if (token || to.path === '/' || to.path === '/404' || to.path === '/error' || typeof exclude === 'boolean' && exclude || exclude.indexOf(to.path) > -1 || exclude.indexOf(to.name) > -1 || to.path === '/login' || token && to.path === '/main') {
|
|
2205
2205
|
if (redirect && (to.path === '/main' || to.path === '/login')) {
|
|
2206
2206
|
window.location.replace(urlJoinParams({ url: '.' + to.path + '.html', param: to.query }));
|
|
2207
2207
|
} else {
|
|
@@ -2891,7 +2891,9 @@ var toFunction = function toFunction(str) {
|
|
|
2891
2891
|
* @param {string} [$color] - 颜色值
|
|
2892
2892
|
**/
|
|
2893
2893
|
var updateTheme = function updateTheme(color, send) {
|
|
2894
|
-
|
|
2894
|
+
if (!color) {
|
|
2895
|
+
return false;
|
|
2896
|
+
}
|
|
2895
2897
|
|
|
2896
2898
|
if (send === undefined) {
|
|
2897
2899
|
send = true;
|
package/lib/steps.js
CHANGED
|
@@ -2201,7 +2201,7 @@ var isLogined = function isLogined(_ref8) {
|
|
|
2201
2201
|
});
|
|
2202
2202
|
}
|
|
2203
2203
|
}).catch(function (e) {});
|
|
2204
|
-
} else if (token || to.path === '/' || to.path === '/404' || typeof exclude === 'boolean' && exclude || exclude.indexOf(to.path) > -1 || exclude.indexOf(to.name) > -1 || to.path === '/login' || token && to.path === '/main') {
|
|
2204
|
+
} else if (token || to.path === '/' || to.path === '/404' || to.path === '/error' || typeof exclude === 'boolean' && exclude || exclude.indexOf(to.path) > -1 || exclude.indexOf(to.name) > -1 || to.path === '/login' || token && to.path === '/main') {
|
|
2205
2205
|
if (redirect && (to.path === '/main' || to.path === '/login')) {
|
|
2206
2206
|
window.location.replace(urlJoinParams({ url: '.' + to.path + '.html', param: to.query }));
|
|
2207
2207
|
} else {
|
|
@@ -2891,7 +2891,9 @@ var toFunction = function toFunction(str) {
|
|
|
2891
2891
|
* @param {string} [$color] - 颜色值
|
|
2892
2892
|
**/
|
|
2893
2893
|
var updateTheme = function updateTheme(color, send) {
|
|
2894
|
-
|
|
2894
|
+
if (!color) {
|
|
2895
|
+
return false;
|
|
2896
|
+
}
|
|
2895
2897
|
|
|
2896
2898
|
if (send === undefined) {
|
|
2897
2899
|
send = true;
|
package/lib/switch.js
CHANGED
|
@@ -2201,7 +2201,7 @@ var isLogined = function isLogined(_ref8) {
|
|
|
2201
2201
|
});
|
|
2202
2202
|
}
|
|
2203
2203
|
}).catch(function (e) {});
|
|
2204
|
-
} else if (token || to.path === '/' || to.path === '/404' || typeof exclude === 'boolean' && exclude || exclude.indexOf(to.path) > -1 || exclude.indexOf(to.name) > -1 || to.path === '/login' || token && to.path === '/main') {
|
|
2204
|
+
} else if (token || to.path === '/' || to.path === '/404' || to.path === '/error' || typeof exclude === 'boolean' && exclude || exclude.indexOf(to.path) > -1 || exclude.indexOf(to.name) > -1 || to.path === '/login' || token && to.path === '/main') {
|
|
2205
2205
|
if (redirect && (to.path === '/main' || to.path === '/login')) {
|
|
2206
2206
|
window.location.replace(urlJoinParams({ url: '.' + to.path + '.html', param: to.query }));
|
|
2207
2207
|
} else {
|
|
@@ -2891,7 +2891,9 @@ var toFunction = function toFunction(str) {
|
|
|
2891
2891
|
* @param {string} [$color] - 颜色值
|
|
2892
2892
|
**/
|
|
2893
2893
|
var updateTheme = function updateTheme(color, send) {
|
|
2894
|
-
|
|
2894
|
+
if (!color) {
|
|
2895
|
+
return false;
|
|
2896
|
+
}
|
|
2895
2897
|
|
|
2896
2898
|
if (send === undefined) {
|
|
2897
2899
|
send = true;
|
package/lib/table-form.js
CHANGED
|
@@ -2201,7 +2201,7 @@ var isLogined = function isLogined(_ref8) {
|
|
|
2201
2201
|
});
|
|
2202
2202
|
}
|
|
2203
2203
|
}).catch(function (e) {});
|
|
2204
|
-
} else if (token || to.path === '/' || to.path === '/404' || typeof exclude === 'boolean' && exclude || exclude.indexOf(to.path) > -1 || exclude.indexOf(to.name) > -1 || to.path === '/login' || token && to.path === '/main') {
|
|
2204
|
+
} else if (token || to.path === '/' || to.path === '/404' || to.path === '/error' || typeof exclude === 'boolean' && exclude || exclude.indexOf(to.path) > -1 || exclude.indexOf(to.name) > -1 || to.path === '/login' || token && to.path === '/main') {
|
|
2205
2205
|
if (redirect && (to.path === '/main' || to.path === '/login')) {
|
|
2206
2206
|
window.location.replace(urlJoinParams({ url: '.' + to.path + '.html', param: to.query }));
|
|
2207
2207
|
} else {
|
|
@@ -2891,7 +2891,9 @@ var toFunction = function toFunction(str) {
|
|
|
2891
2891
|
* @param {string} [$color] - 颜色值
|
|
2892
2892
|
**/
|
|
2893
2893
|
var updateTheme = function updateTheme(color, send) {
|
|
2894
|
-
|
|
2894
|
+
if (!color) {
|
|
2895
|
+
return false;
|
|
2896
|
+
}
|
|
2895
2897
|
|
|
2896
2898
|
if (send === undefined) {
|
|
2897
2899
|
send = true;
|
package/lib/tabs.js
CHANGED
|
@@ -2201,7 +2201,7 @@ var isLogined = function isLogined(_ref8) {
|
|
|
2201
2201
|
});
|
|
2202
2202
|
}
|
|
2203
2203
|
}).catch(function (e) {});
|
|
2204
|
-
} else if (token || to.path === '/' || to.path === '/404' || typeof exclude === 'boolean' && exclude || exclude.indexOf(to.path) > -1 || exclude.indexOf(to.name) > -1 || to.path === '/login' || token && to.path === '/main') {
|
|
2204
|
+
} else if (token || to.path === '/' || to.path === '/404' || to.path === '/error' || typeof exclude === 'boolean' && exclude || exclude.indexOf(to.path) > -1 || exclude.indexOf(to.name) > -1 || to.path === '/login' || token && to.path === '/main') {
|
|
2205
2205
|
if (redirect && (to.path === '/main' || to.path === '/login')) {
|
|
2206
2206
|
window.location.replace(urlJoinParams({ url: '.' + to.path + '.html', param: to.query }));
|
|
2207
2207
|
} else {
|
|
@@ -2891,7 +2891,9 @@ var toFunction = function toFunction(str) {
|
|
|
2891
2891
|
* @param {string} [$color] - 颜色值
|
|
2892
2892
|
**/
|
|
2893
2893
|
var updateTheme = function updateTheme(color, send) {
|
|
2894
|
-
|
|
2894
|
+
if (!color) {
|
|
2895
|
+
return false;
|
|
2896
|
+
}
|
|
2895
2897
|
|
|
2896
2898
|
if (send === undefined) {
|
|
2897
2899
|
send = true;
|