You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@linkis.apache.org by pe...@apache.org on 2022/01/19 14:40:19 UTC
[incubator-linkis] 01/01: Merge pull request #1315 from apache/dev-1.0.3
This is an automated email from the ASF dual-hosted git repository.
peacewong pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/incubator-linkis.git
commit 25a44d77b43428e6971a9fbbe8d4698c8217ba85
Merge: 615dd32 f31ac01
Author: peacewong <wp...@gmail.com>
AuthorDate: Wed Jan 19 22:30:48 2022 +0800
Merge pull request #1315 from apache/dev-1.0.3
Merge the latest code from dev-1.0.3 to master
.github/ISSUE_TEMPLATE/bug_report.yml | 16 +
.github/ISSUE_TEMPLATE/config.yml | 17 +
.github/ISSUE_TEMPLATE/feature_request.yml | 17 +
.github/workflows/build.yml | 2 +-
DISCLAIMER-WIP | 9 -
LICENSE | 12 -
README.md | 4 +-
README_CN.md | 4 +-
.../entrance/conf/EntranceConfiguration.scala | 2 +-
.../engineconn-plugins/flink/pom.xml | 5 +
.../flink/client/context/ExecutionContext.java | 118 +++--
.../sql/operation/impl/DropViewOperation.java | 7 +-
.../client/sql/operation/impl/ResetOperation.java | 7 +-
.../client/sql/operation/impl/SetOperation.java | 16 +-
.../executor/FlinkSQLComputationExecutor.scala | 29 +-
pom.xml | 10 +-
web/patches/iview+3.5.4.patch | 78 ---
web/src/apps/linkis/assets/images/dssLogo5.png | Bin 708382 -> 0 bytes
web/src/apps/linkis/components/cardList/index.vue | 11 +-
web/src/apps/linkis/i18n/common/en.json | 2 +
web/src/apps/linkis/i18n/common/zh.json | 2 +
web/src/apps/linkis/module/ECM/index.vue | 14 +-
.../module/globalHistoryManagement/index.scss | 3 +
web/src/apps/linkis/module/header/index.vue | 2 +-
web/src/components/consoleComponent/toolbar.vue | 8 +-
web/src/components/svgIcon/svg/add.svg | 1 -
web/src/components/svgIcon/svg/api.svg | 1 -
web/src/components/svgIcon/svg/base.svg | 1 -
web/src/components/svgIcon/svg/change.svg | 1 -
web/src/components/svgIcon/svg/charts.svg | 1 -
web/src/components/svgIcon/svg/common.svg | 19 +
web/src/components/svgIcon/svg/control.svg | 1 -
web/src/components/svgIcon/svg/dispatch.svg | 1 -
web/src/components/svgIcon/svg/down.svg | 1 -
web/src/components/svgIcon/svg/downLoad.svg | 1 -
web/src/components/svgIcon/svg/export.svg | 1 -
web/src/components/svgIcon/svg/fi-addproject.svg | 1 -
web/src/components/svgIcon/svg/fi-algorithms.svg | 1 -
web/src/components/svgIcon/svg/fi-application.svg | 1 -
web/src/components/svgIcon/svg/fi-bi.svg | 1 -
web/src/components/svgIcon/svg/fi-cross.svg | 1 -
web/src/components/svgIcon/svg/fi-csv.svg | 1 -
web/src/components/svgIcon/svg/fi-data-develop.svg | 1 -
.../components/svgIcon/svg/fi-data-exchange.svg | 1 -
web/src/components/svgIcon/svg/fi-dir-fold.svg | 1 -
web/src/components/svgIcon/svg/fi-dir-unfold.svg | 1 -
web/src/components/svgIcon/svg/fi-disconnect.svg | 1 -
web/src/components/svgIcon/svg/fi-disk-o.svg | 1 -
web/src/components/svgIcon/svg/fi-disk.svg | 1 -
web/src/components/svgIcon/svg/fi-download.svg | 1 -
web/src/components/svgIcon/svg/fi-exchange.svg | 1 -
web/src/components/svgIcon/svg/fi-expand-right.svg | 1 -
web/src/components/svgIcon/svg/fi-export.svg | 1 -
web/src/components/svgIcon/svg/fi-field.svg | 1 -
web/src/components/svgIcon/svg/fi-file-o.svg | 1 -
web/src/components/svgIcon/svg/fi-file.svg | 1 -
web/src/components/svgIcon/svg/fi-folder-o.svg | 1 -
web/src/components/svgIcon/svg/fi-folder.svg | 1 -
web/src/components/svgIcon/svg/fi-format.svg | 1 -
web/src/components/svgIcon/svg/fi-fx-method.svg | 1 -
web/src/components/svgIcon/svg/fi-fx-udf.svg | 1 -
web/src/components/svgIcon/svg/fi-hive.svg | 1 -
web/src/components/svgIcon/svg/fi-hivedb-open.svg | 1 -
web/src/components/svgIcon/svg/fi-hivedb.svg | 1 -
web/src/components/svgIcon/svg/fi-ide.svg | 1 -
web/src/components/svgIcon/svg/fi-jar.svg | 1 -
web/src/components/svgIcon/svg/fi-jdbc.svg | 1 -
web/src/components/svgIcon/svg/fi-log.svg | 1 -
web/src/components/svgIcon/svg/fi-more-things.svg | 1 -
web/src/components/svgIcon/svg/fi-newproject.svg | 1 -
web/src/components/svgIcon/svg/fi-play.svg | 1 -
web/src/components/svgIcon/svg/fi-python.svg | 1 -
web/src/components/svgIcon/svg/fi-qualitis.svg | 1 -
web/src/components/svgIcon/svg/fi-quit.svg | 1 -
web/src/components/svgIcon/svg/fi-r.svg | 1 -
web/src/components/svgIcon/svg/fi-radio-on2.svg | 1 -
web/src/components/svgIcon/svg/fi-redo.svg | 1 -
web/src/components/svgIcon/svg/fi-resource.svg | 1 -
web/src/components/svgIcon/svg/fi-save.svg | 1 -
web/src/components/svgIcon/svg/fi-scala.svg | 1 -
web/src/components/svgIcon/svg/fi-schedule.svg | 1 -
web/src/components/svgIcon/svg/fi-scriptis.svg | 1 -
web/src/components/svgIcon/svg/fi-search.svg | 1 -
web/src/components/svgIcon/svg/fi-spark-python.svg | 1 -
web/src/components/svgIcon/svg/fi-spark.svg | 1 -
web/src/components/svgIcon/svg/fi-stop.svg | 1 -
web/src/components/svgIcon/svg/fi-storage.svg | 1 -
web/src/components/svgIcon/svg/fi-table.svg | 1 -
web/src/components/svgIcon/svg/fi-tick.svg | 1 -
web/src/components/svgIcon/svg/fi-txt.svg | 1 -
web/src/components/svgIcon/svg/fi-undo.svg | 1 -
web/src/components/svgIcon/svg/fi-visualis.svg | 1 -
web/src/components/svgIcon/svg/fi-warn.svg | 1 -
web/src/components/svgIcon/svg/fi-workflow.svg | 1 -
web/src/components/svgIcon/svg/fi-workflow1.svg | 1 -
web/src/components/svgIcon/svg/fi-xls.svg | 1 -
web/src/components/svgIcon/svg/fi-xlsx.svg | 1 -
web/src/components/svgIcon/svg/file.svg | 1 -
web/src/components/svgIcon/svg/filter.svg | 1 -
web/src/components/svgIcon/svg/history.svg | 1 -
web/src/components/svgIcon/svg/icon-01.svg | 1 -
web/src/components/svgIcon/svg/icon-Dashboard.svg | 1 -
web/src/components/svgIcon/svg/icon-JDBC.svg | 1 -
web/src/components/svgIcon/svg/icon-SparkSQL.svg | 1 -
web/src/components/svgIcon/svg/icon-change.svg | 1 -
web/src/components/svgIcon/svg/icon-datacheck.svg | 1 -
.../components/svgIcon/svg/icon-dituzhongxin.svg | 1 -
.../components/svgIcon/svg/icon-el-icon-delete.svg | 1 -
web/src/components/svgIcon/svg/icon-excel.svg | 1 -
.../components/svgIcon/svg/icon-fenxizhongxin.svg | 1 -
web/src/components/svgIcon/svg/icon-fuzhi.svg | 1 -
.../components/svgIcon/svg/icon-hexinzhibiao.svg | 1 -
web/src/components/svgIcon/svg/icon-lianjie.svg | 1 -
web/src/components/svgIcon/svg/icon-mail.svg | 1 -
.../components/svgIcon/svg/icon-menhuzhongxin.svg | 1 -
web/src/components/svgIcon/svg/icon-pyspark.svg | 1 -
web/src/components/svgIcon/svg/icon-python.svg | 1 -
web/src/components/svgIcon/svg/icon-sender.svg | 1 -
web/src/components/svgIcon/svg/icon-shell.svg | 1 -
.../svgIcon/svg/icon-shengchanzhongxin.svg | 1 -
web/src/components/svgIcon/svg/icon-shezhi.svg | 1 -
.../components/svgIcon/svg/icon-wendang-excel.svg | 1 -
web/src/components/svgIcon/svg/icon-workspace1.svg | 1 -
.../svgIcon/svg/icon-xinhaojieshouqi.svg | 1 -
web/src/components/svgIcon/svg/icon-zhantie.svg | 1 -
.../components/svgIcon/svg/icon-ziyuanguanli.svg | 1 -
web/src/components/svgIcon/svg/lock.svg | 1 -
web/src/components/svgIcon/svg/menu.svg | 1 -
web/src/components/svgIcon/svg/params.svg | 1 -
web/src/components/svgIcon/svg/play-2.svg | 1 -
web/src/components/svgIcon/svg/project.svg | 1 -
web/src/components/svgIcon/svg/publish.svg | 1 -
web/src/components/svgIcon/svg/right-ar.svg | 1 -
web/src/components/svgIcon/svg/save-2.svg | 1 -
web/src/components/svgIcon/svg/stop-2.svg | 1 -
web/src/components/svgIcon/svg/transform.svg | 1 -
web/src/components/svgIcon/svg/unlock.svg | 1 -
web/src/components/svgIcon/svg/user.svg | 1 -
web/src/dss/assets/images/appmap.png | Bin 5928 -> 0 bytes
web/src/dss/assets/images/bg8.png | Bin 28568 -> 0 bytes
web/src/dss/assets/images/dssLogo4.png | Bin 24435 -> 0 bytes
web/src/dss/assets/images/dssLogo5.png | Bin 708382 -> 0 bytes
web/src/dss/assets/images/dssLogo5_1.png | Bin 704461 -> 0 bytes
web/src/dss/assets/images/dssLogo6.png | Bin 167737 -> 0 bytes
web/src/dss/assets/images/handsome.jpg | Bin 3474 -> 0 bytes
web/src/dss/assets/images/login_bg.png | Bin 282917 -> 0 bytes
web/src/dss/assets/images/login_bg_small.png | Bin 955885 -> 0 bytes
web/src/dss/assets/images/logo.png | Bin 28851 -> 0 bytes
web/src/dss/assets/images/newLogo.svg | 25 -
web/src/dss/assets/images/no-data.svg | 18 -
web/src/dss/assets/images/no_data.png | Bin 11130 -> 0 bytes
web/src/dss/assets/images/workspace-top.jpeg | Bin 68670 -> 0 bytes
web/src/dss/assets/images/workspace.png | Bin 43917 -> 0 bytes
web/src/dss/assets/images/workspace.svg | 18 -
web/src/dss/assets/projectIconFont/demo.css | 551 ---------------------
web/src/dss/assets/projectIconFont/iconfont.css | 143 ------
web/src/dss/assets/projectIconFont/iconfont.eot | Bin 9780 -> 0 bytes
web/src/dss/assets/projectIconFont/iconfont.js | 18 -
web/src/dss/assets/projectIconFont/iconfont.json | 191 -------
web/src/dss/assets/projectIconFont/iconfont.svg | 104 ----
web/src/dss/assets/projectIconFont/iconfont.ttf | Bin 9612 -> 0 bytes
web/src/dss/assets/projectIconFont/iconfont.woff | Bin 6436 -> 0 bytes
web/src/dss/assets/projectIconFont/iconfont.woff2 | Bin 5420 -> 0 bytes
web/src/dss/assets/styles/app.scss | 1 -
web/src/dss/module/header/index.vue | 6 +-
web/src/dss/module/header/navMenu/index.vue | 2 +-
web/src/dss/module/resourceSimple/engine.vue | 36 +-
web/src/dss/module/resourceSimple/job.vue | 5 +-
web/src/dss/view/icon.vue | 6 +-
web/vue.config.js | 56 +--
170 files changed, 257 insertions(+), 1449 deletions(-)
---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscribe@linkis.apache.org
For additional commands, e-mail: commits-help@linkis.apache.org