ocpview-pro 0.1.20 → 0.1.22

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "ocpview-pro",
-  "version": "0.1.20",
+  "version": "0.1.22",
   "title": "ocpviewPlus",
   "description": "A high quality Service UI components Library with Vue.js",
   "homepage": "",

package/src/components/masterplate/listbtntoolbar.vue

@@ -3,14 +3,14 @@
     <Col span="18">
         <Row v-if="!notpowerFlag" type="flex" :gutter="0" justify="start" align="middle">
             <Col  v-if="addDataBtnFlag">
-                <Button  :custom-icon="mainButtonCustomIcon" :icon="mainButtonIcon"  type="primary" class="mainBtn" :disabled="!!addReadOnly"  @click="addData" >{{myConfig.mainButtonText}}</Button>
+                <Button  :custom-icon="mainButtonCustomIcon" :icon="mainButtonIcon"  type="primary" class="mainBtn" :disabled="!!addReadOnly"  @click="addData" >{{$t(myConfig.mainButtonText)}}</Button>
             </Col>
             <Col v-if="addDataBtnFlag">
                 <Divider  type="vertical" class="dividercommon"/>
             </Col>
             <template v-for="(item,index) in btnItems"  :key="'btn_' + index">
             <Col  v-if="!moreFlag || index < myConfig.showNum"  style="margin-right:10px">
-            <Button :icon="item.icon" :custom-icon="item.customIcon"   @click="action(item.name)" :disabled="!!item.readOnly">{{item.text}}</Button>
+            <Button :icon="item.icon" :custom-icon="item.customIcon"   @click="action(item.name)" :disabled="!!item.readOnly">{{item.text ? $t(item.text) : item.text}}</Button>
             </Col>
             </template>
             <Col v-if="moreFlag">
@@ -65,7 +65,7 @@ export default {
                 modulecode:'',
                 items:[],
                 mainButton:'addData',
-                mainButtonText:this.$t('新增'),
+                mainButtonText:'新增',
                 mainButtonIcon:null,
                 mainButtonCustomIcon:'iconfont icon-custom-add'
             },

package/src/components/tree/basetree.vue

@@ -428,7 +428,7 @@ export default {
 
             if (this.myConfig.showRootNode) {
                 let root = {
-                    title: '  ' + this.myConfig.rootNode.name,
+                    title: '  ' + this.$t(this.myConfig.rootNode.name),
                     expand: true,
                     disabled: this.myConfig.readOnly,
                     children: tree,

package/src/index.js

@@ -223,6 +223,7 @@ if (typeof window !== 'undefined' && window.Vue) {
 const API = {
     version: pkg.version, // eslint-disable-line no-undef
     install,
+    localeReady: localePlus.localeReady,
     //...ViewUI,
     ...components
 };

package/src/localePlus/index.js

@@ -65,6 +65,9 @@ const getReportLocaleMessage = async () => {
 };
 const localeMap = { CN: "zh-CN", TR: "zh-TW", EN: "en-US" };
 
+// 动态语言包合并完成的 Promise，供业务在 app.mount 前 await，保证组件 created 期 $t() 已包含动态 key
+let localeReadyPromise = Promise.resolve();
+
 const install = function (app, options = {}) {
     if (options.defaultLocale) {
         i18n.global.locale.value = options.defaultLocale;
@@ -73,12 +76,15 @@ const install = function (app, options = {}) {
     app.config.globalProperties.$localeMap = localeMap;
 
     if (options.fetchDynamic !== false) {
-        getReportLocaleMessage();
+        localeReadyPromise = getReportLocaleMessage();
     }
 };
 
+export const localeReady = () => localeReadyPromise;
+
 export default {
     install,
     i18n,
     getReportLocaleMessage,
+    localeReady,
 };

package/src/method/case/case.js

@@ -928,12 +928,14 @@ caseMethod.getToken = function(_self) {
     }
     if (Cookies.get('token')) {
         token = Cookies.get('token');
-    } else {
+    }
+    // 不能从url取，清理缓存会导致用户信息丢失，应该强制重新登录
+    /*else {
         let temp = caseMethod.getUrlParam('token');
         if (temp) {
             token = temp;
         }
-    }
+    }*/
     return token;
 };