Merge pull request #4 from WeBankFinTech/dev-0.9.0

Dev 0.9.0

web/src/assets/styles/login.scss

@@ -44,7 +44,6 @@
     }
     .login-main {
         width: 380px;
-        height: 300px;
         background-color: $body-background;
         margin-right: 9.5%;
         padding: 20px;
@@ -76,9 +75,15 @@
         }
     }
     .remember-user-name {
-        margin: 5px 0 0 10px;
+        margin: 0px 0 10px 10px;
     }
     .ivu-form-item {
         margin-bottom: 20px;
     }
+    .captcha-wp {
+        display: flex;
+        img{
+            height: 44px;
+        }
+    }
 }

web/src/assets/styles/workspace.scss

@@ -213,6 +213,8 @@
             display: flex;
             align-items: center;
             margin-top: -10px;
+            margin-right: 50px;
+            flex-wrap: wrap;
 
             .title-sub {
               margin-right: 10px;

web/src/commonData/i18n/common/en.json

@@ -22,7 +22,7 @@
         "project": {
             "projectName": "Project Name",
             "gotoScriptis": "Visit Scriptis",
-            "createproject": "Create Project",
+            "createProject": "Create Project",
             "editorProject": "Edit Project",
             "search": "Search Project",
             "deleteProject": "Delete Project",
@@ -134,7 +134,7 @@
         "workflow": {
             "infoHeader": "Welcome to Workflow!",
             "workflow": "Workflow",
-            "createworkflow": "Create workflow",
+            "createWorkflow": "Create workflow",
             "gotoVisualis": "Enter Visualis",
             "publishProject": "Publish project",
             "searchWorkflow": "Search for workflow",
@@ -800,7 +800,8 @@
             "password": "Please enter password！",
             "loginSuccess": "Login Success",
             "haveLogin": "You have already logged in, please do not login repeatedly",
-            "vaildFaild": "Authentication failed!"
+            "vaildFaild": "Authentication failed!",
+            "captcha": "Please enter captcha"
         },
         "userMenu": {
             "title": "Warning",
@@ -1065,7 +1066,8 @@
                 "running": "running",
                 "stop": "disable",
                 "searchPlaceholder": "Search application",
-                "tips": "No data or no addition"
+                "tips": "No data or no addition",
+                "repeat": "You cannot add the same application repeatedly"
             }
         },
         "database": {

web/src/commonData/i18n/common/zh.json

@@ -23,7 +23,7 @@
         "project": {
             "projectName": "工程名",
             "gotoScriptis": "进入Scriptis",
-            "createproject": "创建工程",
+            "createProject": "创建工程",
             "editorProject": "修改工程",
             "search": "搜索工程",
             "deleteProject": "删除工程",
@@ -134,7 +134,7 @@
         "workflow": {
             "infoHeader": "欢迎来到工作流！",
             "workflow": "工作流",
-            "createworkflow": "创建工作流",
+            "createWorkflow": "创建工作流",
             "gotoVisualis": "进入Visualis",
             "publishProject": "发布工程",
             "searchWorkflow": "搜索工作流",
@@ -800,7 +800,8 @@
             "password": "请输入密码！",
             "loginSuccess": "登录成功",
             "haveLogin": "您已经登录，请不要重复登录",
-            "vaildFaild": "验证未通过！"
+            "vaildFaild": "验证未通过！",
+            "captcha": "请输入验证码"
         },
         "userMenu": {
             "title": "警告",
@@ -1065,7 +1066,8 @@
                 "running": "运行中",
                 "stop": "不可用",
                 "searchPlaceholder": "搜索应用系统",
-                "tips": "没有数据或者未添加"
+                "tips": "没有数据或者未添加",
+                "repeat": "不能重复添加相同的应用"
             }
         },
         "database": {

web/src/js/component/navMenu/index.vue

@@ -47,166 +47,7 @@ export default {
   data() {
     return {
       menuList: [
-        {
-          "id": 1,
-          "title": "应用开发",
-          "order": null,
-          "appInstances": [
-            {
-              "id": 1,
-              "title": "工作流开发",
-              "description": "工作流开发是微众银行微数域(WeDataSphere)打造的数据应用开发工具，以任意桥(Linkis)做为内核，将满足从数据交换、脱敏清洗、分析挖掘、质量检测、可视化展现、定时调度到数据输出等数据应用开发全流程场景需求。",
-              "labels": "工作流,数仓开发",
-              "accessButton": "进入工作流开发",
-              "accessButtonUrl": "/project",
-              "manualButton": "用户手册",
-              "manualButtonUrl": "https://www.baidu.com",
-              "projectUrl": "/workflow",
-              "name": "workflow",
-              "icon": "fi-scriptis|rgb(102, 102, 255)",
-              "order": null,
-              "active": true
-            },
-            {
-              "id": 2,
-              "title": "StreamSQL开发",
-              "description": "实时应用开发是微众银行微数域(WeDataSphere)、Boss直聘大数据团队 和 中国电信天翼云大数据团队 社区联合共建的流式解决方案，以 Linkis 做为内核，基于 Flink Engine 构建的批流统一的 Flink SQL，助力实时化转型。",
-              "labels": "流式,实时",
-              "accessButton": "联合共建中",
-              "accessButtonUrl": "/streamSQL",
-              "manualButton": "相关资讯",
-              "manualButtonUrl": "https://www.baidu.com",
-              "projectUrl": "/streamSQL/project",
-              "name": "streamSQL",
-              "icon": "fi-scriptis|rgb(102, 102, 255)",
-              "order": null,
-              "active": false
-            },
-            {
-              "id": 3,
-              "title": "数据服务开发",
-              "description": "数据服务是微众银行微数域(WeDataSphere)与 艾佳生活大数据团队 社区联合共建的统一API服务，以 Linkis 和 DataSphere Studio 做为内核，提供快速将 Scriptis 脚本生成数据API的能力，协助企业统一管理对内对外的API服务。",
-              "labels": "API,数据服务",
-              "accessButton": "联合共建中",
-              "accessButtonUrl": "/dataService",
-              "manualButton": "相关资讯",
-              "manualButtonUrl": "https://www.baidu.com",
-              "projectUrl": "/dataService/project",
-              "name": "dataService",
-              "icon": "fi-scriptis|rgb(102, 102, 255)",
-              "order": null,
-              "active": false
-            }]
-        },
-        {
-          "id": 2,
-          "title": "数据分析",
-          "order": null,
-          "appInstances": [
-            {
-              "id": 4,
-              "title": "Scriptis",
-              "description": "Scriptis是微众银行微数域(WeDataSphere)打造的一站式交互式数据探索分析工具，以任意桥(Linkis)做为内核，提供多种计算存储引擎(如Spark、Hive、TiSpark等)、Hive数据库管理功能、资源(如Yarn资源、服务器资源)管理、应用管理和各种用户资源(如UDF、变量等)管理的能力。",
-              "labels": "脚本开发,IDE",
-              "accessButton": "进入Scriptis",
-              "accessButtonUrl": "/home",
-              "manualButton": "用户手册",
-              "manualButtonUrl": "https://www.baidu.com",
-              "projectUrl": "/home",
-              "name": "scriptis",
-              "icon": "fi-scriptis|rgb(102, 102, 255)",
-              "order": null,
-              "active": true
-            },
-            {
-              "id": 5,
-              "title": "Visualis",
-              "description": "Visualis是基于宜信开源项目Davinci开发的数据可视化BI工具，以任意桥(Linkis)做为内核，支持拖拽式报表定义、图表联动、钻取、全局筛选、多维分析、实时查询等数据开发探索的分析模式，并做了水印、数据质量校验等金融级增强。",
-              "labels": "可视化,报表",
-              "accessButton": "进入Visualis",
-              "accessButtonUrl": "http://42.123.106.20:8088/dss/visualis/#/projects ",
-              "manualButton": "用户手册",
-              "manualButtonUrl": "https://www.baidu.com",
-              "projectUrl": "http://42.123.106.20:8088/dss/visualis/#/project/${projectId}",
-              "name": "visualis",
-              "icon": "fi-scriptis|rgb(102, 102, 255)",
-              "order": null,
-              "active": true
-            }]
-        },
-        {
-          "id": 3,
-          "title": "生产运维",
-          "order": null,
-          "appInstances": [
-            {
-              "id": 6,
-              "title": "Schedulis",
-              "description": "Scriptis是微众银行微数域(WeDataSphere)打造的一站式交互式数据探索分析工具，以任意桥(Linkis)做为内核，提供多种计算存储引擎(如Spark、Hive、TiSpark等)、Hive数据库管理功能、资源(如Yarn资源、服务器资源)管理、应用管理和各种用户资源(如UDF、变量等)管理的能力。",
-              "labels": "调度,工作流",
-              "accessButton": "进入Schedulis",
-              "accessButtonUrl": "http://10.161.3.24:8091/homepage",
-              "manualButton": "用户手册",
-              "manualButtonUrl": "https://www.baidu.com",
-              "projectUrl": "http://10.161.3.24:8091/manager?project=${projectName}",
-              "name": "schedulis",
-              "icon": "fi-scriptis|rgb(102, 102, 255)",
-              "order": null,
-              "active": true
-            },
-            {
-              "id": 7,
-              "title": "应用运维中心",
-              "description": "Scriptis是微众银行微数域(WeDataSphere)打造的一站式交互式数据探索分析工具，以任意桥(Linkis)做为内核，提供多种计算存储引擎(如Spark、Hive、TiSpark等)、Hive数据库管理功能、资源(如Yarn资源、服务器资源)管理、应用管理和各种用户资源(如UDF、变量等)管理的能力。",
-              "labels": "生产,运维",
-              "accessButton": "进入应用运维中心",
-              "accessButtonUrl": "/devops",
-              "manualButton": "用户手册",
-              "manualButtonUrl": "https://www.baidu.com",
-              "projectUrl": "/devops/project",
-              "name": "devops",
-              "icon": "fi-scriptis|rgb(102, 102, 255)",
-              "order": null,
-              "active": false
-            }]
-        },
-        {
-          "id": 4,
-          "title": "数据质量",
-          "order": null,
-          "appInstances": [
-            {
-              "id": 8,
-              "title": "Qualitis",
-              "description": "Qualitis是一套金融级、一站式的数据质量管理平台，提供了数据质量模型定义，数据质量结果可视化、可监控等功能，并用一整套统一的流程来定义和检测数据集的质量并及时报告问题。",
-              "labels": "生产,运维",
-              "accessButton": "进入Qualitis",
-              "accessButtonUrl": "http://10.161.3.24:8090/#/dashboard",
-              "manualButton": "用户手册",
-              "manualButtonUrl": "https://www.baidu.com",
-              "projectUrl": "http://10.161.3.24:8090/#/projects/list?id=${projectId}&flow=true",
-              "name": "qualitis",
-              "icon": "fi-scriptis|rgb(102, 102, 255)",
-              "order": null,
-              "active": true
-            },
-            {
-              "id": 9,
-              "title": "Exchangis",
-              "description": "Exchangis是一个轻量级的、高扩展性的数据交换平台，支持对结构化及无结构化的异构数据源之间的数据传输，在应用层上具有数据权限管控、节点服务高可用和多租户资源隔离等业务特性，而在数据层上又具有传输架构多样化、模块插件化和组件低耦合等架构特点。",
-              "labels": "生产,运维",
-              "accessButton": "进入Exchangis",
-              "accessButtonUrl": "http://42.123.106.20:9503",
-              "manualButton": "用户手册",
-              "manualButtonUrl": "https://www.baidu.com",
-              "projectUrl": "http://42.123.106.20:19503",
-              "name": "exchangis",
-              "icon": "fi-scriptis|rgb(102, 102, 255)",
-              "order": null,
-              "active": true
-            }]
-        }]
-      ,
+      ],
       current: null
     }
   },

web/src/js/component/workflowContentItem/index.vue

@@ -15,7 +15,7 @@
             class="icon-blod"
             size="60"
           ></Icon>
-          <span>{{$t(`message.${source}.create${source}`)}}</span>
+          <span>{{$t(`message.${source}`)}}</span>
         </div>
       </i-col>
       <i-col

web/src/js/module/project/index.vue

@@ -15,7 +15,7 @@
         :data-list="item.dssProjectList"
         :current-data="item"
         :precent-list="precentList"
-        source="project"
+        source="project.createProject"
         tag-prop="business"
         @goto="gotoWorkflow"
         @add="addProject"
@@ -220,7 +220,7 @@ export default {
       this.loading = true;
       if (this.actionType === 'add') {
         api.fetch('/dss/addProject', projectData, 'post').then(() => {
-          this.$Message.success(`${this.$t('message.project.createproject')}${this.$t('message.newConst.success')}`);
+          this.$Message.success(`${this.$t('message.project.createProject')}${this.$t('message.newConst.success')}`);
           this.getclassListData().then((data) => {
             // 新建完工程进到工作流页
             const currentProject = data[0].dssProjectList.filter((project) => project.name === projectData.name)[0];

web/src/js/module/workflow/index.vue

@@ -16,7 +16,7 @@
           :current-data="item"
           :data-list="item.dssFlowList"
           :readonly="myReadonly"
-          source="workflow"
+          source="workflow.createWorkflow"
           tag-prop="uses"
           @add="addProject"
           @goto="gotoWorkflow"