centaline-data-driven-v3 0.0.51 → 0.0.53

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "centaline-data-driven-v3",
-  "version": "0.0.51",
+  "version": "0.0.53",
   "private": false,
   "description": "centaline-data-driven-v3",
   "main": "dist/centaline-data-driven-v3.umd.js",

package/src/components/app/FormList.vue

@@ -96,7 +96,7 @@
                                 <template v-else>
                                     <tr class="ct-tr" ref="headTr">
                                         <td class="ct-td" :colspan="colspansum" style="text-align: center;">
-                                            <span> 暂无数据 </span>
+                                            <span>  {{common.LocalizedString('暂无数据','暫無數據')}}</span>
                                         </td>
                                     </tr>
                                 </template>

package/src/components/app/PhotoSelect.vue

@@ -119,7 +119,7 @@ function handleOpen() {
         chooseList.push(n);
     });
     var dialogOption = {
-        title: "选择" + model.value.controlLabel || "选择图片",
+        title: common.LocalizedString('选择','選擇') + model.value.controlLabel || common.LocalizedString('选择图片','選擇圖片'),
         pane: common.getParentPane(),
         content: [{
             component: "ct-photoselectlist",

package/src/components/app/PhotoSelectList.vue

@@ -39,13 +39,13 @@
                 </template>
             </template>
             <template v-else>
-                <van-empty description="没有数据" />
+                <van-empty :description="common.LocalizedString('没有数据','沒有數據')" />
             </template>
         </div>
         <div class="PhotoSelectList-bottom">
-            <van-checkbox @change="allchoose" v-model="allcheck" shape="square" icon-size="14px">全选</van-checkbox>
+            <van-checkbox @change="allchoose" v-model="allcheck" shape="square" icon-size="14px">{{common.LocalizedString('全选','全選')}}</van-checkbox>
             <van-button type="primary" class="van-button-app" size="small" style="display: flex;margin-left: 30%;"
-                @click="handleClick()">确定</van-button>
+                @click="handleClick()">{{common.LocalizedString('确定','確認')}}</van-button>
         </div>
     </div>
     <van-popup v-model:show="showPicker" position="bottom" :safe-area-inset-bottom="true">

package/src/components/app/SearchList/SearchTable.vue

@@ -10,7 +10,7 @@
         <div ref="refTableParent" class="ct-tableParentAPP" :style="'height:' + model.tableHeight + 'px'"
             @scroll="scrollHandle($event)">
             <van-pull-refresh v-model="refreshing" @refresh="onRefresh">
-                <van-list v-if="!tableError" v-model:loading="tableLoading" error-text="没有查到数据，点我刷新"
+                <van-list v-if="!tableError" v-model:loading="tableLoading" :error-text="common.LocalizedString('没有查到数据，点我刷新','沒有查到數據，點我刷新')"
                     :finished="finished" @load="onLoad" :immediate-check="false"
                     :style="'min-height:' + model.tableHeight + 'px'">
                     <template v-if="flagPopupSearchlist && singleSelectio">
@@ -43,7 +43,7 @@
                         </van-checkbox-group>
                     </template>
                 </van-list>
-                <van-empty v-else description="没有查到数据" />
+                <van-empty v-else :description="common.LocalizedString('没有查到数据','沒有查到數據')" />
             </van-pull-refresh>
             <div v-if="isoperate || flagPopupSearchlist" style="height: 50px;"></div>
             <div class="safe-area-inset-bottom" style="background-color: #fafafa;"></div>
@@ -59,7 +59,7 @@
         </div>
         <div class="ct-checkboxtips" v-if="isoperate || flagPopupSearchlist">
             <van-checkbox v-if="!singleSelectio" v-model="model.selectAll" shape="square" checked-color="#EE6B6B"
-                icon-size="14px" :indeterminate="model.isIndeterminate" @click="selectAll()">本页全选（已选{{ selectCount }}）
+                icon-size="14px" :indeterminate="model.isIndeterminate" @click="selectAll()">{{common.LocalizedString('本页全选（已选','本頁全選（已選')}}{{ selectCount }}）
             </van-checkbox>
             <div style="display: flex;flex: 1; justify-content: right;">
                 <template v-if="!flagPopupSearchlist">
@@ -71,7 +71,7 @@
                 </template>
                 <template v-else>
                     <van-button color="#EE6B6B" size="small" @click="confirmClickHandler()"
-                        style=" width: 25%;margin-left: 10px;">确认</van-button>
+                        style=" width: 25%;margin-left: 10px;">{{common.LocalizedString('确认','確認')}}</van-button>
                 </template>
             </div>
         </div>

package/src/components/app/ViewerFile.vue

@@ -14,25 +14,25 @@
                     <div class="cont" v-if="file.mediaUrl">
                         <div style="padding-right:10px;">
                             <div class="enlarge-picture " v-if="file.mediaLabelName">
-                                <span class="" style="width:80px;">附件类型 : </span>
+                                <span class="" style="width:80px;">{{common.LocalizedString('附件类型','附件類型')}} : </span>
                                 <span style="font-weight: bold;flex: 1;">{{ file.mediaLabelName }}</span>
                             </div>
                             <div class="enlarge-picture" v-if="file.mediaDescCN">
-                                <span style="width:80px;">中文描述 : </span>
+                                <span style="width:80px;">{{common.LocalizedString('中文描述','中文描述')}} : </span>
                                 <span style="font-weight: bold;flex: 1;">{{ file.mediaDescCN }}</span>
                             </div>
                             <div class="enlarge-picture" v-if="file.mediaDescEN">
-                                <span style="width:80px;">英文描述 : </span>
+                                <span style="width:80px;">{{common.LocalizedString('英文描述','英文描述')}} : </span>
                                 <span style="font-weight: bold;flex: 1;">{{ file.mediaDescEN }}</span>
                             </div>
                             <div class="enlarge-picture" v-if="file.mediaUploadEmployeeDesc">
-                                <span style="width:80px;">来源描述 : </span>
+                                <span style="width:80px;">{{common.LocalizedString('来源描述','來源描述')}} : </span>
                                 <span style="font-weight: bold;flex: 1;">{{ file.mediaUploadEmployeeDesc }}</span>
                             </div>
                         </div>
                     </div>
                     <template v-if="file.mediaTypeID == '1'">
-                        <iframe :src="file.mediaUrl" height="100%" width="100%" style="border-width: 0px;">
+                        <iframe :src="file.mediaUrl" height="100%" width="100%" style="border-width: 0px;" allowfullscreen allowvr>
                         </iframe>
                     </template>
                     <!--Photo-->

package/src/components/web/FormList.vue

@@ -134,6 +134,9 @@
 
                         </template>
                     </el-table-column>
+                    <template #empty>
+                        {{common.LocalizedString('暂无数据','暫無數據')}}
+                    </template>
                 </el-table>
             </template>
         </template>

package/src/components/web/PhotoSelect.vue

@@ -129,7 +129,7 @@ function handleOpen() {
         chooseList.push(n);
     });
     var dialogOption = {
-        title: "选择" + model.value.controlLabel || "选择图片",
+        title: common.LocalizedString('选择','選擇') + model.value.controlLabel || common.LocalizedString('选择图片','選擇圖片'),
         pane: common.getParentPane(),
         content: [{
             component: "ct-photoselectlist",

package/src/components/web/PhotoSelectList.vue

@@ -2,7 +2,7 @@
     <div v-loading="loading" style="width: 100%;height: 100%;">
         <div style="width: 100%;height: 100%;position: relative;" class="ct-photoSelectList" v-if="FlagPhoto">
             <div style="padding: 10px 0 0 20px" v-if="paramName">
-                <el-select-v2 v-model="mediaLabelID" :props="optionAttrs" :options="options" placeholder="类别"
+                <el-select-v2 v-model="mediaLabelID" :props="optionAttrs" :options="options" :placeholder="common.LocalizedString('类别','類別')"
                     style="width: 150px;" @change="change" clearable />
             </div>
             <el-main :style="paramName ? 'top: 40px' : 'top: 10px'"
@@ -53,14 +53,14 @@
                     </template>
                 </template>
                 <template v-else>
-                    <el-empty description="没有数据" />
+                    <el-empty :description="common.LocalizedString('没有数据','沒有數據')" />
                 </template>
             </el-main>
 
             <div style="width:100%;text-align:center">
                 <el-checkbox style="position:absolute;bottom:10px;left: 15px;" @change="allchoose"
-                    v-model="allcheck">全选</el-checkbox>
-                <el-button type="primary" style="position:absolute;bottom:10px;" @click="handleClick()">确定</el-button>
+                    v-model="allcheck">{{common.LocalizedString('全选','全選')}}</el-checkbox>
+                <el-button type="primary" style="position:absolute;bottom:10px;" @click="handleClick()">{{common.LocalizedString('确定','確認')}}</el-button>
             </div>
         </div>
     </div>

package/src/components/web/SearchList/SearchTable.vue

@@ -217,7 +217,7 @@
             style="margin-top: 10px;width: 100%;display: inline-block;height: 30px;margin-bottom: 10px;">
             <el-button size="mini" @click="popupClickHandler()" class="max-search-btn" style="float:right;"
                 type="primary">
-                确认
+                 {{common.LocalizedString('确认','確認')}}
             </el-button>
         </div>
         <div v-if="isLoading" v-loading="isLoading" style="top: 30px"></div>

package/src/components/web/ViewerFile.vue

@@ -32,19 +32,19 @@
                 <div class="cont" v-if="resultObject">
                     <div style="padding-right:10px;" v-if="mediaLabelShow">
                         <div class="enlarge-picture " v-if="itemFile.mediaLabelName">
-                            <span class="" style="width:80px;">附件类型 : </span>
+                            <span class="" style="width:80px;">{{common.LocalizedString('附件类型','附件類型')}} : </span>
                             <lable style="font-weight: bold;">{{ itemFile.mediaLabelName }}</lable>
                         </div>
                         <div class="enlarge-picture" v-if="itemFile.mediaDescCN">
-                            <span style="width:80px;">中文描述 : </span>
+                            <span style="width:80px;">{{common.LocalizedString('中文描述','中文描述')}} : </span>
                             <lable style="font-weight: bold;">{{ itemFile.mediaDescCN }}</lable>
                         </div>
                         <div class="enlarge-picture" v-if="itemFile.mediaDescEN">
-                            <span style="width:80px;">英文描述 : </span>
+                            <span style="width:80px;">{{common.LocalizedString('英文描述','英文描述')}} : </span>
                             <lable style="font-weight: bold;">{{ itemFile.mediaDescEN }}</lable>
                         </div>
                         <div class="enlarge-picture" v-if="itemFile.mediaUploadEmployeeDesc">
-                            <span style="width:80px;">来源描述 : </span>
+                            <span style="width:80px;">{{common.LocalizedString('来源描述','來源描述')}} : </span>
                             <lable style="font-weight: bold;">{{ itemFile.mediaUploadEmployeeDesc }}</lable>
                         </div>
                     </div>

package/src/components/web/other/PopupSearchListTable.vue

@@ -36,15 +36,15 @@
             </el-table>
             <div style="margin-top: 20px;width: 100%;display: inline-block;height: 30px;margin-bottom: 10px;">
                 <span class="ct-table-tip-small" v-if="!loading && model" v-html="model.footer"></span> <span
-                    class="ct-table-tip-small" v-if="!loading && !singleSelectio && model" style="color:red;">已勾选
-                    {{ selectCount }} 条</span>
+                    class="ct-table-tip-small" v-if="!loading && !singleSelectio && model" style="color:red;">{{common.LocalizedString('已勾选','已勾選')}}
+                    {{ selectCount }} {{common.LocalizedString('条','條')}}</span>
                 <el-input v-if="jumpBtnName" size="small" v-model="jumpStr" placeholder="定位"
                     style="width:150px"></el-input>
                 <el-button v-if="jumpBtnName" size="small" @click="jumpClickHandler()">{{ jumpBtnName }}</el-button>
                 <el-button v-if="filterBtnName" size="small" @click="filterClickHandler()" style="margin-left: 0px;">{{
                     filterBtnName }}</el-button>
                 <el-button size="small" @click="confirmClickHandler()" class="search-btn" style="float:right;"
-                    type="primary">确认</el-button>
+                    type="primary">{{common.LocalizedString('确认','確認')}}</el-button>
             </div>
         </div>
         <div style="min-height:250px;" v-loading="loadingOne" v-if="loadingOne"></div>

package/src/loader/src/FormList.js

@@ -419,8 +419,8 @@ function fieldsToTableData(fields) {
 }
 //删除行
 function deleteRow(index, model, callback) {
-    common.confirm("确定删除？", "提示", {
-        confirmButtonText: "确定",
+    common.confirm(common.LocalizedString('确定删除？','確認刪除？'), "提示", {
+        confirmButtonText: common.LocalizedString('确定','確認'),
         cancelButtonText: "取消",
     }).then(() => {
         model.rows.forEach((row, i) => {

package/src/main.js

@@ -21,8 +21,8 @@ for (const [key, component] of Object.entries(ElementPlusIconsVue)) {
 }
 
 app.use(centaline, {
-    baseUrl:"http://10.88.22.66/IBS.Mvc/api/",
-    //baseUrl: "http://10.88.22.66:6060/onecard-api/",
+    //baseUrl:"http://10.88.22.66/IBS.Mvc/api/",
+    baseUrl: "http://10.88.22.66:6060/onecard-api/",
     //baseUrl: "http://10.1.245.50:38735/max-uplink-api/",
     //baseUrl: "http://10.1.245.111:38028/",
     flagRouterSelf: true,
@@ -30,6 +30,7 @@ app.use(centaline, {
     zindex: 999,
     showRequestSuccessMessage: true,
     showRequestErrorMessage: true,
+    language:'HK',
     handler: {
         // 打开tab页
         openTab: function (action) {
@@ -62,8 +63,8 @@ app.use(centaline, {
             return {
                 //authObject: '{token:"aplus eyJhbGciOiJIUzI1NiIsInppcCI6IkRFRiJ9.eNrEjjsOwjAQBe-ydVay1xvvOl3sJA2HiPIxElSIJBIIcXdAQEfPFK-YZt4Nlm2EChqtDafOYWqpRG6kxLoTxZhUTSRxHLUPH_DHfOmt5SDWt1gHScieHapNiol94q5pXYoNFJAvJ6isGHWmNMYVcBjWtyCr_iW2JZ93-fqPc8f18MwGIqFRCIO1GXmWGYd9npCZJ6N5JjYZ7g8AAAD__w.HgtNKtHWooj8c9Hy_vB8CfKq-qOeHMp0irnW0DfXtHo"}',
                 //oldToken: 'd92d4a3b-2274-42e8-96f0-100ffb579b6e',
-                //authObject: '{token:"1647-1802885825978044416",platform:"WEB"}',
-                authObject: '{EmpID:"Token_5d2d290d-98da-4c00-adef-bb975c372e46",MachineCode:"7a216b39-84af-43bb-842b-07604ac37a10",SSO_Token:"SSOToken_5d2d290d-98da-4c00-adef-bb975c372e46",Platform:"WEB"}',
+                authObject: '{token:"1-b0ca13fb-3f45-46b0-9d1f-7b028c05f6d3"}',
+                //authObject: '{EmpID:"Token_937f0ada-8862-4c37-bf44-578531920446",MachineCode:"7a216b39-84af-43bb-842b-07604ac37a10",SSO_Token:"SSOToken_937f0ada-8862-4c37-bf44-578531920446",Platform:"WEB"}',
             };
         },
         // 请求完成事件，可判断是否登录过期执行响应操作

package/src/utils/common.js

@@ -282,8 +282,8 @@ const common = {
       if (this.hasHtml(message)) {
         showDialog({ message: message, allowHtml: true });
       }
-      else if(type=='error'){
-        showDialog({ title: '提示', message:message, closeOnClickOverlay: true, confirmButtonText: '确定', className: 'showDialogMessage' });
+      else if (type == 'error') {
+        showDialog({ title: '提示', message: message, closeOnClickOverlay: true, confirmButtonText: '确定', className: 'showDialogMessage' });
       }
       else {
         showToast(message);
@@ -557,6 +557,12 @@ const common = {
   flagApp() {
     return dataDrivenOpts.flagApp;
   },
+  LocalizedString(strCN, strHK) {
+    if (dataDrivenOpts.language && dataDrivenOpts.language == 'HK') {
+      return strHK;
+    }
+    return strCN;
+  },
   //是否微信浏览器
   flagMicroMessenger() {
     var ua = navigator.userAgent.toLowerCase();

package/src/views/SearchList.vue

@@ -1,7 +1,8 @@
 <template>
   <div id="app-search" style="width:100%;height:100%;position: fixed;">
-    <ct-searchlist :apiParam="apiParam" :searchConditionApi="'/propertyTenderList/getLayoutOfSearch'"
-      :searchDataApi="'/propertyTenderList/getListOfSearchModel'"></ct-searchlist>
+    <ct-searchlist :apiParam="apiParam" :searchConditionApi="'/propertyPublishList/getLayoutOfSearch'"
+      :searchDataApi="'/propertyPublishList/getListOfSearchModel'"
+      :searchStatsApi="'/propertyPublishList/getListStats'"></ct-searchlist>
     <ct-dialoglist ref="dialogList"></ct-dialoglist>
 
   </div>