|
|
@@ -30,7 +30,7 @@ import PrintWidget from './print/print-widget.js';
|
|
|
// import Pagination from './pagination/index.js';
|
|
|
|
|
|
import TreeViewNode from './tree/index.js';
|
|
|
-
|
|
|
+import ClientOrganization from './client-organization/index.js';
|
|
|
|
|
|
import langZhCn from './i18n/zh-CN.js';
|
|
|
import langEnUs from './i18n/en-US.js';
|
|
|
@@ -77,6 +77,7 @@ const components = [
|
|
|
PrintEpc,
|
|
|
PrintWidget,
|
|
|
TreeViewNode,
|
|
|
+ ClientOrganization,
|
|
|
// Pagination
|
|
|
];
|
|
|
|
|
|
@@ -98,9 +99,9 @@ const install = function (app, opts = {}) {
|
|
|
// 这里为了防止 beforeCreate 比 vue-i18n 的 beforeCreate 先执行导致 this.$i18n 为空
|
|
|
this.$nextTick(() => {
|
|
|
// 判断是否为根节点,合并国际化信息
|
|
|
- //if (this.$root === this && this.$i18n) {
|
|
|
- console.log('install pc-component-v3 i18n.');
|
|
|
- if (this.$i18n) {
|
|
|
+ if (this.$root === this && this.$i18n) {
|
|
|
+ //if (this.$i18n) {
|
|
|
+ console.log('merge pc-component-v3 i18n.');
|
|
|
_self.$i18n.mergeLocaleMessage('zh-CN', langZhCn);
|
|
|
_self.$i18n.mergeLocaleMessage('en-US', langEnUs);
|
|
|
}
|
|
|
@@ -108,9 +109,6 @@ const install = function (app, opts = {}) {
|
|
|
},
|
|
|
});
|
|
|
|
|
|
- // locale.use(opts.locale);
|
|
|
- // locale.i18n(opts.i18n);
|
|
|
-
|
|
|
components.map(component => {
|
|
|
console.log('install component: ' + component.name);
|
|
|
app.component(component.name, component);
|
|
|
@@ -123,16 +121,8 @@ const install = function (app, opts = {}) {
|
|
|
};
|
|
|
|
|
|
|
|
|
-/* istanbul ignore if */
|
|
|
-// if (typeof window !== 'undefined' && window.Vue) {
|
|
|
-// install(window.Vue);
|
|
|
-// };
|
|
|
-
|
|
|
-
|
|
|
export default {
|
|
|
version: '1.2.9',
|
|
|
- // locale: locale.use,
|
|
|
- // i18n: locale.i18n,
|
|
|
install,
|
|
|
Loading,
|
|
|
Modal,
|
|
|
@@ -160,6 +150,7 @@ export default {
|
|
|
PrintEpc,
|
|
|
PrintWidget,
|
|
|
TreeViewNode,
|
|
|
+ ClientOrganization,
|
|
|
// Pagination,
|
|
|
Uuid,
|
|
|
Common,
|