Merge pull request #95 in DEC/decision-webui-dcm from ~ALAN/decision-webui-dcm:feature/10.0 to feature/10.0

* commit '6a0a7416d061b767a08da0c35311361c12fb078b':
  fix: 修改key填写错误
  fix: DEC-10141 修改无数据连接时显示的页面

i18n/zh_cn.properties

@@ -109,6 +109,7 @@ Dec-Dcm_Connection_Download_Driver=下载对应驱动
 Dec-Dcm_Connection_Deleted=该数据连接已被删除，无法进行操作
 Dec-Dcm_Connection_Click_Connect_Database=点击连接数据库
 Dec-Dcm_Connection_Read_Mode_List=以读取模式列表
+Dec-Dcm_Connection_NO_Connection_Pool=无数据连接，可在数据连接管理页面添加
 
 BI-Multi_Date_Quarter_End= 季度末
 BI-Multi_Date_Month_Begin= 月初

private/i18n.ts

@@ -108,6 +108,7 @@ export default {
     'Dec-Dcm_Connection_Deleted': '该数据连接已被删除，无法进行操作',
     'Dec-Dcm_Connection_Click_Connect_Database': '点击连接数据库',
     'Dec-Dcm_Connection_Read_Mode_List': '以读取模式列表',
+    'Dec-Dcm_Connection_NO_Connection_Pool': '无数据连接，可在数据连接管理页面添加',
     'BI-Multi_Date_Quarter_End': '季度末',
     'BI-Multi_Date_Month_Begin': '月初',
     'BI-Multi_Date_YMD': '年月日',

src/modules/pages/connection_pool/connection_pool.ts

@@ -24,6 +24,10 @@ export class ConnectionPool extends BI.Widget {
     }
 
     render() {
+        if (BI.size(this.model.connectionJDBC) === 0) {
+            return this.renderNoConnection();
+        }
+        
         return {
             type: Htape,
             items: [
@@ -53,8 +57,7 @@ export class ConnectionPool extends BI.Widget {
                     },
                     width: 275,
                 },
-                this.model.connectionJDBC.length > 0 ?
+                this.renderPool(),
-                    this.renderPool() : this.renderNoConnection(),
             ],
         };
     }
@@ -101,7 +104,7 @@ export class ConnectionPool extends BI.Widget {
                         {
                             type: Label,
                             cls: 'bi-tips',
-                            text: BI.i18nText('Dec-Dcm_Connection_Plase_Add_One'),
+                            text: BI.i18nText('Dec-Dcm_Connection_NO_Connection_Pool'),
                         },
                     ],
                 },

webpack/webpack.dev.js

@@ -48,7 +48,7 @@ module.exports = merge(common, {
         liveReload: true,
         proxy: {
             '/webroot/decision/v10': {
-                target: 'http://api.fanruan.design/mock/135/',
+                target: 'http://localhost:8075',
                 secure: false,
             },
             '/webroot/decision/resources': {