Merge branch 'master' of ssh://10.0.82.50:2222/piflow/piflow-web

vue-piflow-web/public/drawingBoard/my_js/flow/initFlowGraph.js

@@ -8,6 +8,7 @@ var pathsCells = [];
 var thisEditor = null;
 var graphGlobal = null;
 var currentNode = null;   //当前选中节点
+var saveTimer
 
 //init data
 function initFlowDrawingBoardData(loadId, parentAccessPath) {
@@ -1152,7 +1153,15 @@ function fillDatasource(datasource, stop_id, stops_page_id) {
 }
 
 //Save XML file and related information
-function saveXml(paths, operType, cells) {
+function saveXml(...params){
+    if(saveTimer){  
+        window.clearTimeout(saveTimer)
+    }
+    saveTimer =  setTimeout(()=>{saveXmlAjax(...params)},1000)
+}
+
+//Save XML file and related information
+function saveXmlAjax(paths, operType, cells) {
     var getXml = thisEditor.getGraphXml();
     var xml_outer_html = getXml.outerHTML;
     var time, time1
@@ -1189,7 +1198,6 @@ function saveXml(paths, operType, cells) {
                 layer.msg(operType + " save fail", {icon: 2, shade: 0, time: 2000});
                 console.log(operType + " save fail");
                 // $('#fullScreen').hide();
-                window.parent.postMessage(false);
             }
 
         },
@@ -2336,13 +2344,13 @@ function loadingXml(id, loadId) {
         async: true,
         url: "/flowTemplate/loadingXmlPage",
         success: function (data) {
+            window.parent.postMessage(false);
             var dataMap = JSON.parse(data);
             var icon_code = 2;
             if (200 === dataMap.code) {
                 icon_code = 1;
             }
             // $('#fullScreen').hide();
-            window.parent.postMessage(false);
             layer.msg(dataMap.errorMsg, {icon: icon_code, shade: 0.7, time: 2000}, function () {
                 window.location.reload();
             });
@@ -2367,6 +2375,7 @@ function runFlow(runMode) {
             runMode: runMode
         },
         success: function (data) {//After the request is successful
+            window.parent.postMessage(false);
             var dataMap = JSON.parse(data);
             if (200 === dataMap.code) {
                 layer.msg(dataMap.errorMsg, {icon: 1, shade: 0, time: 2000}, function () {
@@ -2379,7 +2388,6 @@ function runFlow(runMode) {
                 });
             }
             // $('#fullScreen').hide();
-            window.parent.postMessage(false);
         },
         error: function (request) {//Operation after request failure
             //alert("Request Failed");

vue-piflow-web/src/apis/stops.js

@@ -0,0 +1,9 @@
+import axios from 'axios';
+
+// 根据FlowId获取组件列表
+export function getStopsInfoByFlowId (id) {
+    return axios({
+        method:'get',
+        url:`/stops/getStopsInfoByFlowId?flowId=${id}`,
+    })
+}

vue-piflow-web/src/assets/language/en-US.js

@@ -20,6 +20,7 @@ module.exports = {
         stopsComponent: 'StopsComponent',
         globalVariable: 'GlobalVariable',
         user:"User",
+        myCenter:'My Center',
         log:"Log",
         modification:"Modification",
         bindingAccount:"BindingAccount",
@@ -32,6 +33,9 @@ module.exports = {
         selectSource:"Select Label",
         pythonMirror:"Image Management",
         visualization: "Visualization",
+        FlowSchedule:"Flow Schedule",
+        FileSchedule:"File Schedule",
+        TimingSchedule:"Timing Schedule",
         database:'MySQLConfig',
         datasource:'VisualizationSource',
         visualconfig:'Visualization',
@@ -41,41 +45,41 @@ module.exports = {
         next_text: "Next"
     },
     index: {
-        cpu: "cores",
+        cpu: "Cores",
         loading: "Loading..."
     },
     tip: {
         title: "πFlow system tips",
         existed: "UserName Existed！",
         fault_content: "An unknown error occurred in the background run！",
-        update_success_content: "update succeeded！",
-        update_fail_content: "update failed or admin information cannot be changed！",
-        save_success_content: "template saved successfully！",
-        save_fail_content: "template save failed！",
-        add_success_content: "added succeeded！",
-        add_fail_content: "add failed！",
-        run_success_content: "run succeeded！",
-        run_fail_content: "run failed！",
-        mount_success_content: "mount succeeded！",
-        mount_fail_content: "mount failed！",
-        stop_success_content: "stop succeeded！",
-        stop_fail_content: "stop failed！",
-        unmount_success_content: "unmount succeeded！",
-        unmount_fail_content: "unmount failed！",
+        update_success_content: "Update succeeded！",
+        update_fail_content: "Update failed or admin information cannot be changed！",
+        save_success_content: "Template saved successfully！",
+        save_fail_content: "Template save failed！",
+        add_success_content: "Added succeeded！",
+        add_fail_content: "Add failed！",
+        run_success_content: "Run succeeded！",
+        run_fail_content: "Run failed！",
+        mount_success_content: "Mount succeeded！",
+        mount_fail_content: "Mount failed！",
+        stop_success_content: "Stop succeeded！",
+        stop_fail_content: "Stop failed！",
+        unmount_success_content: "Unmount succeeded！",
+        unmount_fail_content: "Unmount failed！",
         get_success_content: "Data acquisition successful！",
         get_fail_content: "Data acquisition failed！",
         get_user_content:"User does not have this permission!",
-        debug_success_content: "debug succeeded！",
-        debug_fail_content: "debug failed！",
-        delete_success_content: "deleted successfully！",
-        delete_fail_content: "deletion failed！",
+        debug_success_content: "Debug succeeded！",
+        debug_fail_content: "Debug failed！",
+        delete_success_content: "Deleted successfully！",
+        delete_fail_content: "Deletion failed！",
         request_fail_content: "Data request failed！",
-        reference_content: "referenced, not allowed to delete!",
+        reference_content: "Referenced, not allowed to delete!",
 
         upload_success_content: "Template upload successful！",
         upload_fail_content: "Template upload failed！",
-        download_success_content: "download successful！",
-        download_fail_content: "download failed！",
+        download_success_content: "Download successful！",
+        download_fail_content: "Download failed！",
 
         data_fail_content: "Data acquisition failed！",
     },
@@ -138,7 +142,8 @@ module.exports = {
         addProperty: "AddProperty",
         name: "Name",
         description: "Description",
-        CreateTime: "CreateTime",
+        createTime: "CreateTime",
+        lastUpdateTime:"LastUpdateTime",
         dataSourceType: "DataSourceType",
         action: "Actions",
         isLinked: "Do you synchronize the changes? Related components are：",
@@ -212,7 +217,7 @@ module.exports = {
         create_title: "Create User",
         update_title: "Update User",
         name: "Name",
-        username: "userName",
+        username: "UserName",
         status: "Status",
         createTime: "CreateTime",
         action: "Actions",
@@ -228,8 +233,8 @@ module.exports = {
         role:'Role'
     },
     modification_columns:{
-        oldPasswd: "old Password",
-        passwd: "new Password",
+        oldPasswd: "Old Password",
+        passwd: "New Password",
         passwdCheck: "Confirm",
         Reset: "Reset",
         Submit: "Submit"
@@ -239,12 +244,42 @@ module.exports = {
         Reset: "Reset",
         Submit: "Submit"
     },
+    flow_schedule:{
+        create_title: "Create Schedule",
+        update_title: "Update Schedule",
+        scheduleType: "Schedule Type",
+        startDate: "StartDate",
+        endDate: "EndDate",
+        flowIsGroup: "Flow",
+        name:'Name',
+        type:'Type',
+        cron:'Cron',
+        file:"File",
+        path:"File Path",
+        prefix:"Prefix Matching",
+        suffix:"Suffix Matching",
+        startTime:'StartTime',
+        endTime:'EndTime',
+        status:'Status',
+        description: "Description",
+        trigger:'Trigger',
+        parallel:'Parallel',
+        serial:'Serial',
+        serialRule:'Serial Rule',
+        fileUpdata:'Last updated time of the file',
+        fileName:'File Name',
+        serialOrder:'Serial Order',
+        ascendingOrder:'Ascending Order',
+        descendingOrder:'Descending Order',
+        regex:'Regex',
+        action:'Actions',
+    },
     log_columns:{
-        username: "userName",
-        lastLoginIp:"ip",
-        createTime: "createTime",
-        lastUpdateTime:"lastUpdateTime",
-        action: "action"
+        username: "UserName",
+        lastLoginIp:"Ip",
+        createTime: "CreateTime",
+        lastUpdateTime:"LastUpdateTime",
+        action: "Actions"
     },
     stopsComponent_columns: {
         name: "Name",
@@ -263,10 +298,10 @@ module.exports = {
         introduction_title: "Introduction",
         monitor_title: "Monitor",
         statistics_title: "Statistics",
-        CPU_Disk: 'CPU disk usage',
-        Memory_Disk: 'Memory disk usage',
-        HDFS_Disk: 'HDFS disk usage',
-        totalCapacity: 'total capacity',
+        CPU_Disk: 'CPU Disk Usage',
+        Memory_Disk: 'Memory Disk Usage',
+        HDFS_Disk: 'HDFS Disk Usage',
+        totalCapacity: 'Total Capacity',
         Used: 'Used',
         introduction_Info:window.$SYSTEM_INTRODUCTION_INFO_EN,
         flowStatistics: "Pipeline statistics, include the number of pipeline flows, the number of processors in the running state, and the number of processors in each running state.",
@@ -294,17 +329,18 @@ module.exports = {
         componentClass:"Component class",
         chineseName:"Chinese name",
         Instructions:"Instructions",
-        description:"description",
-        author:"author",
-        email:"email",
+        description:"Description",
+        author:"Author",
+        email:"Email",
         algorithm:"Collaborative model algorithm",
-        added:"added",
-        unadded:"unadded",
+        added:"Added",
+        unadded:"Unadded",
         upload: 'Upload',
         language: 'Language',
         version_lang: 'Version',
-        stopsHubName: 'stopsHubName',
-        uploadZip:'Upload zip',
+        stopsHubName: 'StopsHubName',
+        uploadZip:'Upload .zip',
+        uploadZipJar:'Upload .jar or .zip',
         InteractiveProgramming:'Interactive programming',
         base_image:"Base Image",
         image:"Algorithm Image",

vue-piflow-web/src/assets/language/zh-CN.js

@@ -20,6 +20,7 @@ module.exports = {
         stopsComponent: '组件显示',
         globalVariable: '全局变量',
         user:'用户管理',
+        myCenter:'个人中心',
         log:'通知管理',
         modification:"修改密码",
         bindingAccount:"绑定开发者账号",
@@ -28,6 +29,9 @@ module.exports = {
         LocalModelAlgorithm:"本地模型算法",
         Example:"流水线样例",
         admin:"管理员",
+        FlowSchedule:'流水线调度',
+        TimingSchedule:'定时调度',
+        FileSchedule:"文件触发调度",
         LabelManagement:"标签管理",
         selectSource:"选择数据源",
         pythonMirror:"基础镜像管理",
@@ -138,7 +142,8 @@ module.exports = {
         addProperty: "添加属性",
         name: "名称",
         description: "描述信息",
-        CreateTime: "创建时间",
+        createTime: "创建时间",
+        lastUpdateTime:"操作时间",
         dataSourceType: "数据源类型",
         action: "操作",
         isLinked: "是否同步更改?相关的组件：",
@@ -185,6 +190,36 @@ module.exports = {
         fileDescription: "点 击 或 拖 动 文件 在 此 处 上 传",
         uploadPrompt: "若您上传的CSV文件包含中文字符，请使用UTF-8编码"
     },
+    flow_schedule:{
+        create_title: "新建流水线调度",
+        update_title: "更改流水线调度",
+        scheduleType: "调度类型",
+        startDate: "开始时间",
+        endDate: "结束时间",
+        flowIsGroup: "流水线",
+        name:'名称',
+        type:'类型',
+        file:'文件触发',
+        cron:'CRON表达式',
+        path:"文件所在目录",
+        prefix:"前缀匹配",
+        suffix:"后缀匹配",
+        startTime:'开始时间',
+        endTime:'结束时间',
+        status:'状态',
+        action:'操作',
+        trigger:'触发模式',
+        parallel:'并行',
+        serial:'串行',
+        serialRule:'串行规则',
+        fileUpdata:'文件最后更新时间',
+        fileName:'文件名',
+        serialOrder:'串行顺序',
+        ascendingOrder:'升序',
+        descendingOrder:'降序',
+        regex:'匹配规则',
+        description: "描述信息",
+    },
     code_columns: {
         create_title: "新建在线运行",
         update_title: "更改在线运行",
@@ -304,7 +339,8 @@ module.exports = {
         language: '算法语言',
         version_lang: '语言版本',
         stopsHubName: '组件包名称',
-        uploadZip:'zip包上传',
+        uploadZip:'上传 .zip',
+        uploadZipJar:'上传 .jar 或 .zip',
         InteractiveProgramming:'交互式编程',
         base_image:"基础镜像",
         image:"算法镜像",