diff --git a/.DS_Store b/.DS_Store index 2c234be..c928e71 100644 Binary files a/.DS_Store and b/.DS_Store differ diff --git a/com.actionsoft.apps.coe.pal.datamigration/.gitignore b/com.actionsoft.apps.coe.pal.datamigration/.gitignore index d451ff1..a6a16fc 100644 --- a/com.actionsoft.apps.coe.pal.datamigration/.gitignore +++ b/com.actionsoft.apps.coe.pal.datamigration/.gitignore @@ -3,3 +3,6 @@ node_modules dist dist-ssr *.local +AWSDevParams.js +AWSDevParams.js.bak +babel.config.js \ No newline at end of file diff --git a/com.actionsoft.apps.coe.pal.datamigration/AWSDevServiceParams.js b/com.actionsoft.apps.coe.pal.datamigration/AWSDevServiceParams.js index 3c3ea02..d0c36fc 100644 --- a/com.actionsoft.apps.coe.pal.datamigration/AWSDevServiceParams.js +++ b/com.actionsoft.apps.coe.pal.datamigration/AWSDevServiceParams.js @@ -1,9 +1,9 @@ module.exports = { AWSPortalUrl: "http://localhost:8088/portal/",//aws平台启动地址，用于开发时获取平台静态资源，请求数据等（注意最后的/,不要删） - AWSReleasePath: "/Users/actionsoft/Documents/workspace/IDEA/yili/release/", /*C:/work/workspace/release/*/ //aws的平台路径，暂时写绝对路径，用于build生成的主文件位置（注意最后的/,不要删） + AWSReleasePath: "/Users/shangguochao/Desktop/Actionsoft/aws6/yiliProject/release/", /*C:/work/workspace/release/*/ //aws的平台路径，暂时写绝对路径，用于build生成的主文件位置（注意最后的/,不要删） devUserInfo: {//开发时通过用户名及密码获取sessionId，！！前提必须需要安装并启动app：com.actionsoft.apps.getsession.app userid: "admin", //具有后台管理的用户名 - pwd: "admin", //密码 + pwd: "2", //密码 deviceType: "pc", } } \ No newline at end of file diff --git a/com.actionsoft.apps.coe.pal.datamigration/src/components/data-import.vue b/com.actionsoft.apps.coe.pal.datamigration/src/components/data-import.vue index f78feff..ae9032c 100644 --- a/com.actionsoft.apps.coe.pal.datamigration/src/components/data-import.vue +++ b/com.actionsoft.apps.coe.pal.datamigration/src/components/data-import.vue @@ -19,7 +19,8 @@ :on-remove="handleRemove" :before-remove="beforeRemove" :on-success="handleSuccess" - :limit="1" + :limit="100" + multiple :on-exceed="handleExceed" :show-file-list="false" > diff --git a/com.actionsoft.apps.coe.pal/.gitignore b/com.actionsoft.apps.coe.pal/.gitignore new file mode 100644 index 0000000..acba5d6 --- /dev/null +++ b/com.actionsoft.apps.coe.pal/.gitignore @@ -0,0 +1,8 @@ +node_modules +.DS_Store +dist +dist-ssr +*.local +AWSDevParams.js +AWSDevParams.js.bak +babel.config.js diff --git a/com.actionsoft.apps.coe.pal/AWSDevParams.js b/com.actionsoft.apps.coe.pal/AWSDevParams.js index 3312f65..6ae5c43 100644 --- a/com.actionsoft.apps.coe.pal/AWSDevParams.js +++ b/com.actionsoft.apps.coe.pal/AWSDevParams.js @@ -1,6 +1,6 @@ module.exports = { AWSPortalUrl: "http://localhost:8088/portal/",//aws平台启动地址，用于开发时获取平台静态资源，请求数据等（注意最后的/,不要删） - AWSReleasePath: "D:/worktools/6.4.2/release/", /*C:/work/workspace/release/*/ //aws的平台路径，暂时写绝对路径，用于build生成的主文件位置（注意最后的/,不要删） + AWSReleasePath: "/Users/shangguochao/Desktop/Actionsoft/aws6/yiliProject/release/", /*C:/work/workspace/release/*/ //aws的平台路径，暂时写绝对路径，用于build生成的主文件位置（注意最后的/,不要删） moduleTemplateInAWS: "apps/install/com.actionsoft.apps.coe.pal/template/page/main.htm", /*apps/install/_bpm.platform/template/page/console.m.dw.design.vue.htm*/ //build后生成到平台的模板位置及名称 outputDir: "/apps/install/com.actionsoft.apps.coe.pal/web/com.actionsoft.apps.coe.pal/main", /*webserver/webapps/portal/apps/_bpm.platform/dw/designer/main*/ //build后js或css生成到平台的位置 publicPath: "../apps/com.actionsoft.apps.coe.pal/main", /*../apps/_bpm.platform/dw/designer/main*/ //build到平台后生成到模板中，引入js文件的相对平台的位置 @@ -24,7 +24,7 @@ module.exports = { ], devUserInfo: {//开发时通过用户名及密码获取sessionId，！！前提必须需要安装并启动app：com.actionsoft.apps.getsession.app userid: "admin", //具有后台管理的用户名 - pwd: "123456", //密码 + pwd: "2", //密码 deviceType: "pc", systemType: "C" } diff --git a/com.actionsoft.apps.coe.pal/src/views/repository/RepositoryList.vue b/com.actionsoft.apps.coe.pal/src/views/repository/RepositoryList.vue index 8d1b5d1..94175f8 100644 --- a/com.actionsoft.apps.coe.pal/src/views/repository/RepositoryList.vue +++ b/com.actionsoft.apps.coe.pal/src/views/repository/RepositoryList.vue @@ -109,6 +109,7 @@

{{scope.row.name}} + ( {{ scope.row.versionStatus.versionNo }} )

@@ -121,6 +122,7 @@

{{scope.row.updateUser}} 于 {{scope.row.updateDate}}修改 + ( {{ scope.row.versionStatus.state }} )

@@ -552,16 +554,24 @@ }; // 查询数据 awsuiAxios.post(data).then(function (ro) { - debugger; if(ro.result == 'ok') { //isClickTreeRoot - if(ro.data.mainRepository=="undefined"){ - if(ro.data.mainRepository.folder==false){ - bus.$emit("getisDisabled",true); + // if(ro.data.mainRepository=="undefined"){ + // if(ro.data.mainRepository.folder==false){ + // bus.$emit("getisDisabled",true); + // }else{ + // bus.$emit("getisDisabled",false); + // } + // } + if(ro.data.mainRepository!=undefined){ + if(ro.data.mainRepository.folder==false){ + bus.$emit("getisDisabled",true); + }else{ + bus.$emit("getisDisabled",false); + } }else{ bus.$emit("getisDisabled",false); } - } const repositoryPathData = ro.data.repositoryPathData; @@ -569,6 +579,29 @@ that.isClickTreeRoot = ro.data.isClickTreeRoot; that.category = ro.data.category; that.moveRepository.categorys = ro.data.category; + for (let i = 0; i < ro.data.tableData.length; i++) { + if (ro.data.tableData[i].versionStatus.isApproval) { + ro.data.tableData[i].versionStatus.stateColor = '#1AA477'; + ro.data.tableData[i].versionStatus.state = '审批中'; + ro.data.tableData[i].versionStatus.stateCode = 'approval'; + } else if (ro.data.tableData[i].versionStatus.isStop) { + ro.data.tableData[i].versionStatus.stateColor = '#D9001B'; + ro.data.tableData[i].versionStatus.state = '已停用'; + ro.data.tableData[i].versionStatus.stateCode = 'stop'; + } else if (ro.data.tableData[i].versionStatus.isPublish) { + ro.data.tableData[i].versionStatus.stateColor = '#1AA477'; + ro.data.tableData[i].versionStatus.state = '已发布'; + ro.data.tableData[i].versionStatus.stateCode = 'publish'; + } else if (ro.data.tableData[i].versionStatus.isUse) { + ro.data.tableData[i].versionStatus.stateColor = '#4E7FF9'; + ro.data.tableData[i].versionStatus.state = '设计中'; + ro.data.tableData[i].versionStatus.stateCode = 'use'; + } else { + ro.data.tableData[i].versionStatus.stateColor = '#4E7FF9'; + ro.data.tableData[i].versionStatus.state = '设计中'; + ro.data.tableData[i].versionStatus.stateCode = 'designer'; + } + } that.tableData = ro.data.tableData; that.mainRepository = ro.data.mainRepository; diff --git a/com.actionsoft.apps.coe.pal/src/views/repository/RepositoryMain.vue b/com.actionsoft.apps.coe.pal/src/views/repository/RepositoryMain.vue index 2f9004c..41d23d1 100644 --- a/com.actionsoft.apps.coe.pal/src/views/repository/RepositoryMain.vue +++ b/com.actionsoft.apps.coe.pal/src/views/repository/RepositoryMain.vue @@ -129,7 +129,7 @@ :close-on-press-escape=true :before-close="handleCloseSystem" width="600px"> -
+
@@ -225,6 +225,7 @@ //制度弹框 ModelsetUpDialog: { + loading: false, dialogVisible: false, systemMethod: 'default',// 文件夹类型，default默认文件夹，custom自定义文件夹（扩展的文件夹类型的建模方法） systemTitle: '名称录入',// 新建文件夹时自定义标题 @@ -235,6 +236,7 @@ repositoryPathData:"", method:"", systemType: '1', + category:"", SystemTypeOptions: [ { "label" : '制度', @@ -289,12 +291,13 @@ mounted() { bus.$on("getisDisabled",data =>{ this.dis=data; - }); }, methods: { initData() { const that = this; + that.loadingText = '加载中'; + that.loading = true; if (that.$store.getters.getTeamIdFn && that.$store.getters.getTeamIdFn != '') { const data = { url: 'jd', @@ -549,13 +552,13 @@ //ModelsetUpDialog createModelsetUp(method) {// 创建文件夹 this.ModelsetUpDialog.systemMethod = method; + this.ModelsetUpDialog.systemForm.method = method; this.ModelsetUpDialog.systemTitle = '名称录入'; this.ModelsetUpDialog.dialogVisible = true; this.closeCreatePopover(); }, createFolderSave(formName) {// 保存新建的文件夹 - debugger; const that = this; that.$refs[formName].validate((valid) => { if (valid) { @@ -604,30 +607,47 @@ // createSystemSave(formName) {// 保存新建的文件夹 const that = this; + + + that.$refs[formName].validate((valid) => { if (valid) { - debugger; + const checkdata = { url:'jd', data:{ cmd: 'com.actionsoft.apps.coe.pal_pl_repository_designer_checkname', - title: that.ModelsetUpDialog.systemForm.name + title: that.ModelsetUpDialog.systemForm.name, + method:that.ModelsetUpDialog.systemForm.method, } }; // 查询数据 awsuiAxios.post(checkdata).then(function (ro) { if (ro.data.result == 'ok') { + + const nodeData = that.$refs.tree.getCurrentNode(); + const parentId = nodeData.id; + const wsId = that.$store.getters.getWsIdFn; + const teamId = that.$store.getters.getTeamIdFn; const data = { - url:'jd', - data:{ - cmd: 'com.actionsoft.apps.coe.pal_pl_repository_designer_updatetitle', - uuid: that.ModelsetUpDialog.systemForm.uuid, - title: that.ModelsetUpDialog.systemForm.name, + url: 'jd', + data: { + cmd: 'com.actionsoft.apps.coe.pal_processlevel_repository_create_save_Designer', + wsId: wsId, + teamId: teamId, + category: that.ModelsetUpDialog.systemForm.category, + method: that.ModelsetUpDialog.systemForm.method, + parentId: parentId, + container: '_blank',// 模板，暂时不做模板 + name:that.ModelsetUpDialog.systemForm.name } }; // 查询数据 awsuiAxios.post(data).then(function (ro) { + if (ro.result == 'ok') { + that.ModelsetUpDialog.systemForm.uuid=ro.data.id; + that.ModelsetUpDialog.systemForm.parentId=parentId; const data = { url:'jd', data:{ @@ -641,6 +661,7 @@ }; // 查询数据 awsuiAxios.post(data).then(function (ro) { + if (ro.result == 'ok') { that.ModelsetUpDialog.dialogVisible = false; that.openRepositoryList(that.ModelsetUpDialog.systemForm.parentId); @@ -656,10 +677,8 @@ console.log(error); }) - } else { - that.$message.error(ro.msg); } - }).catch(error=>{ + }).catch(error => { console.log(error); }) } else { @@ -695,43 +714,29 @@ this.securityFileList.push(file); this.securityType = "create"; this.securityVisible = true; - }else{ - - const form = this.ModelsetUpDialog.systemForm; - form.method = method; - + }else { const nodeData = that.$refs.tree.getCurrentNode(); - const parentId = nodeData.id; - const wsId = that.$store.getters.getWsIdFn; - const teamId = that.$store.getters.getTeamIdFn; const data = { url: 'jd', data: { - cmd: 'com.actionsoft.apps.coe.pal_processlevel_repository_create_save', - wsId: wsId, - teamId: teamId, - category: category, - method: method, + cmd: 'com.actionsoft.apps.coe.getArchitecturePath', parentId: parentId, - container: '_blank'// 模板，暂时不做模板 + } }; // 查询数据 awsuiAxios.post(data).then(function (ro) { - if (ro.result == 'ok') { - // 返回id - that.ModelsetUpDialog.systemForm.repositoryPathData=ro.data.repositoryPathData; - that.ModelsetUpDialog.systemForm.uuid=ro.data.id; - that.ModelsetUpDialog.systemForm.parentId=parentId; - that.createModelsetUp(method); + // 返回id + that.ModelsetUpDialog.systemForm.repositoryPathData = ro.data.repositoryPathData; + that.ModelsetUpDialog.systemForm.parentId = parentId; + that.createModelsetUp(method); - - } }).catch(error => { console.log(error); }) + } }, uploadServer(){ diff --git a/com.actionsoft.apps.coe.pal/src/views/repository/RepositoryMainList.vue b/com.actionsoft.apps.coe.pal/src/views/repository/RepositoryMainList.vue index 11e46dc..6a5d0fd 100644 --- a/com.actionsoft.apps.coe.pal/src/views/repository/RepositoryMainList.vue +++ b/com.actionsoft.apps.coe.pal/src/views/repository/RepositoryMainList.vue @@ -46,6 +46,7 @@

{{scope.row.name}} + ( {{ scope.row.versionStatus.versionNo }} )

@@ -58,6 +59,7 @@

{{scope.row.updateUser}} 于 {{scope.row.updateDate}}修改 + ( {{ scope.row.versionStatus.state }} )

@@ -131,6 +133,7 @@

{{scope.row.name}} + ( {{ scope.row.versionStatus.versionNo }} )

@@ -143,6 +146,7 @@

{{scope.row.updateUser}} 于 {{scope.row.updateDate}}修改 + ( {{ scope.row.versionStatus.state }} )

@@ -364,7 +368,43 @@ awsuiAxios.post(data).then(function (ro) { if(ro.result == 'ok') { that.defaultCategoryName = ro.data.defaultCategoryName; + for (let i = 0; i < ro.data.recentData.length; i++) { + if (ro.data.recentData[i].versionStatus.isApproval) { + ro.data.recentData[i].versionStatus.stateColor = '#1AA477'; + ro.data.recentData[i].versionStatus.state = '审批中'; + } else if (ro.data.recentData[i].versionStatus.isStop) { + ro.data.recentData[i].versionStatus.stateColor = '#D9001B'; + ro.data.recentData[i].versionStatus.state = '已停用'; + } else if (ro.data.recentData[i].versionStatus.isPublish) { + ro.data.recentData[i].versionStatus.stateColor = '#1AA477'; + ro.data.recentData[i].versionStatus.state = '已发布'; + } else if (ro.data.recentData[i].versionStatus.isUse) { + ro.data.recentData[i].versionStatus.stateColor = '#4E7FF9'; + ro.data.recentData[i].versionStatus.state = '设计中'; + } else { + ro.data.recentData[i].versionStatus.stateColor = '#4E7FF9'; + ro.data.recentData[i].versionStatus.state = '设计中'; + } + } that.recentData = ro.data.recentData; + for (let i = 0; i < ro.data.commonData.length; i++) { + if (ro.data.commonData[i].versionStatus.isApproval) { + ro.data.commonData[i].versionStatus.stateColor = '#1AA477'; + ro.data.commonData[i].versionStatus.state = '审批中'; + } else if (ro.data.commonData[i].versionStatus.isStop) { + ro.data.commonData[i].versionStatus.stateColor = '#D9001B'; + ro.data.commonData[i].versionStatus.state = '已停用'; + } else if (ro.data.commonData[i].versionStatus.isPublish) { + ro.data.commonData[i].versionStatus.stateColor = '#1AA477'; + ro.data.commonData[i].versionStatus.state = '已发布'; + } else if (ro.data.commonData[i].versionStatus.isUse) { + ro.data.commonData[i].versionStatus.stateColor = '#4E7FF9'; + ro.data.commonData[i].versionStatus.state = '设计中'; + } else { + ro.data.commonData[i].versionStatus.stateColor = '#4E7FF9'; + ro.data.commonData[i].versionStatus.state = '设计中'; + } + } that.commonData = ro.data.commonData; that.havingWritePerm = ro.data.havingWritePerm; that.dataLoading = false;