Bump junrar from 7.4.0 to 7.4.1

.gitignore

@@ -37,6 +37,7 @@ package-lock.json
 **/lib/dist/
 **/lib/assets/
 **/lib/fonts/
+.vscode
 .yalc
 yarn.lock
 yalc.lock

.gitlab-ci.yml

@@ -1,129 +1 @@
-image: registry.cn-shanghai.aliyuncs.com/c7n/cibase:0.11.4
-
-stages:
-  - build
-  - release
-
-build front:
-  stage: build
-  script:
-    - npm config set "//${NPM_REPO}:_authToken" "${NPM_TOKEN}"
-    - npm config set "//${NPM_REGISTRY}:_authToken" "${NPM_TOKEN}"
-    - npm config set always-auth true
-    - npm install --registry "https://${NPM_REPO}"
-    - chmod -R 755 node_modules
-    - npm run compile
-    - npm publish --registry "https://${NPM_REGISTRY}"
-    - curl -sX POST -F token=${FRONT_REPOSITORY_TOKEN} -F ref=${REF_NAME} https://code.choerodon.com.cn/api/v4/projects/7909/trigger/pipeline
-  except:
-    changes:
-      - pom.xml
-      - src/**/*
-      - docker/**/*
-      - chart/**/*
-      - init-mysql-database.sh
-      - .circleci/**/*
-      - .gitignore
-      - .github/**/*
-      - .gitlab-ci.yml
-      - "*.md"
-  only:
-    refs:
-      - master
-      - /^.*bugfix.*$/
-      - /^.*hotfix.*$/
-      - /^.*release.*$/
-
-#tag front:
-#  stage: build
-#  script:
-#    - npm config set "//${NPM_REPO}:_authToken" "${NPM_TOKEN}"
-#    - npm config set "//${NPM_REGISTRY}:_authToken" "${NPM_TOKEN}"
-#    - npm config set always-auth true
-#    - yarn install --registry "https://${NPM_REPO}" --sass-binary-site=http://npm.taobao.org/mirrors/node-sass
-#    - chmod -R 755 node_modules
-#    - npm run compile
-#    - npm publish --registry "https://${NPM_REGISTRY}"
-#  only:
-#    refs:
-#      - tags
-
-build backend:
-  stage: build
-  script:
-    - update_pom_version
-    - mvn clean org.jacoco:jacoco-maven-plugin:prepare-agent test -Dmaven.test.failure.ignore=true -DskipTests=true -U
-    - mvn package spring-boot:repackage
-    - mv target/app.jar $PWD/docker
-    - saveImageMetadata
-    - kaniko -c $PWD/docker -f $PWD/docker/Dockerfile -d ${DOCKER_REGISTRY}/${GROUP_NAME}/${PROJECT_NAME}:${CI_COMMIT_TAG}
-  except:
-    changes:
-      - .editorconfig
-      - .eslintrc.json
-      - .stylelintrc.json
-      - gulpfile.js
-      - package.json
-      - react/**/*
-      - .gitignore
-      - .github/**/*
-      - .gitlab-ci.yml
-      - "*.md"
-  only:
-    refs:
-      - master
-      - /^.*bugfix.*$/
-      - /^.*hotfix.*$/
-      - /^.*release.*$/
-
-tag backend:
-  stage: build
-  script:
-    - update_pom_version
-    - mvn clean org.jacoco:jacoco-maven-plugin:prepare-agent test -Dmaven.test.failure.ignore=true -DskipTests=true -U
-    - mvn package spring-boot:repackage
-    - mv target/app.jar $PWD/docker
-    - saveImageMetadata
-    - docker build --platform linux/arm64 -t ${DOCKER_REGISTRY}/${GROUP_NAME}/${PROJECT_NAME}:${CI_COMMIT_TAG}-arm -f $PWD/docker/Dockerfile $PWD/docker
-    - docker push ${DOCKER_REGISTRY}/${GROUP_NAME}/${PROJECT_NAME}:${CI_COMMIT_TAG}-arm
-    - kaniko -c $PWD/docker -f $PWD/docker/Dockerfile -d ${DOCKER_REGISTRY}/${GROUP_NAME}/${PROJECT_NAME}:${CI_COMMIT_TAG}
-  only:
-    refs:
-      - tags
-
-
-release backend:
-  stage: release
-  script:
-    - chart_build
-  except:
-    changes:
-      - .editorconfig
-      - .eslintrc.json
-      - .stylelintrc.json
-      - gulpfile.js
-      - package.json
-      - react/**/*
-      - .gitignore
-      - .github/**/*
-      - .gitlab-ci.yml
-      - "*.md"
-
-
-tag release:
-  stage: release
-  script:
-    - chart_build
-  only:
-    - tags
-
-.auto_devops: &auto_devops |
-  http_status_code=`curl -o .auto_devops.sh -s -m 10 --connect-timeout 10 -w %{http_code} "${CHOERODON_URL}/devops/ci?token=${Token}&type=microservice"`
-  if [ "$http_status_code" != "200" ]; then
-    cat .auto_devops.sh
-    exit 1
-  fi
-  source .auto_devops.sh
-
-before_script:
-  - *auto_devops
+include: https://api.choerodon.com.cn/devops/v1/projects/261445508798373888/ci_contents/pipelines/14f3cd14-dd16-4a47-a974-2dd158ccd998/content.yaml

CHANGELOG.en-US.md

@@ -1,6 +1,26 @@
 # Changelog
 All notable changes about agile-service will be documented in this file.
 
+## [1.2.0-alpha] - 2021-12-10
+
+### Added
+
+- Add a Gantt chart view to the workbench.
+- Batch moving of work items to other projects is supported.
+- Kanban configuration supports custom filter.
+- Kanban supports subtasks that have been completed hidden in historical iterations.
+
+### Changed
+
+- Optimize the expected start, expected end, actual start and actual end time in the format of "year month day hour minute".
+- Optimize the list of all work items, and drag and drop to customize the column width experience.
+
+
+### Fixed
+
+- Fix the problem that the quick filter operator did not allocate data correctly.
+
+
 ## [1.1.0] - 2021-11-05
 
 ### Added

CHANGELOG.zh-CN.md

@@ -1,6 +1,26 @@
 # 更新日志
 这个文件记录agile-service所有版本的重大变动。
 
+## [1.2.0-alpha] - 2021-12-10
+
+### 新增
+
+- 工作台新增甘特图视图。 
+- 支持批量移动工作项到其他项目。
+- 看板配置支持自定义filter。
+- 看板支持隐藏在历史迭代已完成的子任务。
+
+### 改变
+
+- 优化预计开始、预计结束、实际开始、实际结束时间为“年-月-日 时-分”格式。
+- 优化所有工作项列表可拖拽自定义列宽体验。
+
+### 修复
+
+- 修复快速筛选筛选经办人为未分配数据错误的问题。
+
+
+
 ## [1.1.0] - 2021-11-05
 
 ### 新增

package.json

@@ -1,21 +1,18 @@
 {
   "name": "@choerodon/agile",
   "routeName": "agile",
-  "version": "1.1.2",
+  "version": "1.2.0",
   "description": " ",
   "main": "./lib/index.js",
   "install": "./lib/install.js",
   "files": [
     "lib"
   ],
   "dependencies": {
+    "@atlaskit/tree": "^8.4.0",
     "@choerodon/gantt": "0.2.0",
     "@emotion/core": "^10.0.28",
     "@emotion/styled": "^10.0.27",
-    "@fullcalendar/daygrid": "^5.9.0",
-    "@fullcalendar/interaction": "^5.9.0",
-    "@fullcalendar/react": "^5.9.0",
-    "@fullcalendar/timegrid": "^5.9.0",
     "ahooks": "^2.7.1",
     "antd": "4.5.3",
     "copy-to-clipboard": "^3.2.0",
@@ -50,17 +47,16 @@
     "webuploader": "^0.1.8"
   },
   "devDependencies": {
-    "@choerodon/boot": "0.23.3",
+    "@choerodon/boot": "1.2.0-alpha.1",
     "@choerodon/compiler": "^0.0.1",
-    "@choerodon/master": "1.1.0",
+    "@choerodon/master": "1.2.0",
     "@types/classnames": "^2.2.10",
     "@types/echarts": "^4.6.5",
     "@types/file-saver": "^2.0.1",
     "@types/lodash": "^4.14.165",
     "@types/react": "^16.9.35",
     "@types/react-beautiful-dnd": "^13.0.0",
     "@types/react-dom": "^16.9.8",
-    "@types/react-intl": "^2.3.18",
     "@types/react-is": "^16.7.1",
     "@types/react-measure": "^2.0.6",
     "@types/react-router": "^5.1.8",

pom.xml

@@ -5,13 +5,13 @@
     <modelVersion>4.0.0</modelVersion>
 
     <artifactId>agile-service</artifactId>
-    <version>1.1.2.RELEASE</version>
+    <version>1.2.0-SNAPSHOT</version>
 
     <!--加parent-->
     <parent>
         <groupId>io.choerodon</groupId>
         <artifactId>choerodon-framework-parent</artifactId>
-        <version>1.1.0.RELEASE</version>
+        <version>1.2.0.RELEASE</version>
     </parent>
 
     <properties>
@@ -58,6 +58,18 @@
         <dependency>
             <groupId>org.springframework.cloud</groupId>
             <artifactId>spring-cloud-starter-netflix-eureka-client</artifactId>
+            <exclusions>
+                <exclusion>
+                    <groupId>com.thoughtworks.xstream</groupId>
+                    <artifactId>xstream</artifactId>
+                </exclusion>
+            </exclusions>
+        </dependency>
+        <!-- https://mvnrepository.com/artifact/com.thoughtworks.xstream/xstream -->
+        <dependency>
+            <groupId>com.thoughtworks.xstream</groupId>
+            <artifactId>xstream</artifactId>
+            <version>1.4.18</version>
         </dependency>
         <dependency>
             <groupId>mysql</groupId>
@@ -219,7 +231,7 @@
         <dependency>
             <groupId>com.github.junrar</groupId>
             <artifactId>junrar</artifactId>
-            <version>7.4.0</version>
+            <version>7.4.1</version>
         </dependency>
         <dependency>
             <groupId>org.jsoup</groupId>

react/.env

@@ -1,9 +1,9 @@
 HTTP=http
-API_HOST=http://api.c7n.devops.hand-china.com
+API_HOST=http://172.23.16.154:30094
 CLIENT_ID=localhost
 LOCAL=true
 HEADER_TITLE_NAME=Choerodon | 多云应用技术集成平台
 COOKIE_SERVER=localhost:cookieServer
 TITLE_NAME=Choerodon | 多云应用技术集成平台
-WEBSOCKET_SERVER=ws://172.23.16.155:30126
+WEBSOCKET_SERVER=ws://message.c7n.devops.hand-china.com
 outward=/agile/preview,/agile/test,/agile/outside

react/api/Board.ts

@@ -1,9 +1,7 @@
-import { omit } from 'lodash';
-import { axios, stores, Choerodon } from '@choerodon/boot';
-import { getProjectId, getOrganizationId } from '@/utils/common';
+import { axios, Choerodon } from '@choerodon/boot';
+import { getOrganizationId } from '@/utils/common';
 import Api from './Api';
-
-const { AppState } = stores;
+import { ISearchQuickFilter } from './QuickFilter';
 
 interface ICardStatus {
   completed: boolean,
@@ -34,6 +32,10 @@ interface BoardSearchVO {
   personalFilterIds?: string[]
   priorityIds?: string[]
 }
+
+interface IBoardSearchQuickFilter extends ISearchQuickFilter {
+  quickFilterIds: string[]
+}
 export interface IStatusLinkage {
   issueTypeId: string
   statusId: string
@@ -59,7 +61,13 @@ class BoardApi extends Api<BoardApi> {
        * 加载看板列表
        */
   loadAll() {
-    return axios.get(`${this.prefix}/board`);
+    return this.request({
+      method: 'get',
+      url: `${this.prefix}/board`,
+      params: {
+        type: 'agile',
+      },
+    });
   }
 
   getStatusLinkages(): Promise<IStatusLinkage[]> {
@@ -86,11 +94,12 @@ class BoardApi extends Api<BoardApi> {
    * @param boardName
    */
   create(boardName: string) {
-    return axios({
+    return this.request({
       method: 'post',
       url: `${this.prefix}/board`,
       params: {
         boardName,
+        type: 'agile',
       },
     });
   }
@@ -237,6 +246,33 @@ class BoardApi extends Api<BoardApi> {
       },
     });
   }
+
+  getQuickFilterList(boardId: string, data: IBoardSearchQuickFilter, page: number = 1, size = 10) {
+    return this.request({
+      method: 'post',
+      url: `${this.prefix}/board/${boardId}/quick_filter/list`,
+      data,
+      params: {
+        page,
+        size,
+      },
+    });
+  }
+
+  getFilterSelected(boardId: string) {
+    return this.request({
+      method: 'get',
+      url: `${this.prefix}/board/${boardId}/quick_filter`,
+    });
+  }
+
+  updateFilterSelected(boardId: string, filterIds: string[]) {
+    return this.request({
+      method: 'post',
+      url: `${this.prefix}/board/${boardId}/quick_filter/update`,
+      data: filterIds,
+    });
+  }
 }
 
 const boardApi = new BoardApi();

react/api/Common.ts

@@ -65,7 +65,7 @@ class CommonApi extends Api<CommonApi> {
   getProjectsInProgram(projectId?: string) {
     return this.request({
       method: 'get',
-      url: `iam/choerodon/v1/organizations/${getOrganizationId()}/projects/${projectId || getProjectId()}/program`,
+      url: `iam/choerodon/v1/organizations/${this.orgId}/projects/${projectId || getProjectId()}/program`,
       // cache: true,
     });
   }