diff --git a/core/frontend/src/components/business/DeLayoutContent.vue b/core/frontend/src/components/business/DeLayoutContent.vue index 197849f166..93e47e3b43 100644 --- a/core/frontend/src/components/business/DeLayoutContent.vue +++ b/core/frontend/src/components/business/DeLayoutContent.vue @@ -66,7 +66,7 @@ export default { position: relative; .route-title { - font-family: PingFang SC; + font-family: AlibabaPuHuiTi; font-size: 20px; font-weight: 500; line-height: 28px; diff --git a/core/frontend/src/components/canvas/components/Toolbar.vue b/core/frontend/src/components/canvas/components/Toolbar.vue index d7d86f2530..6a0283ee98 100644 --- a/core/frontend/src/components/canvas/components/Toolbar.vue +++ b/core/frontend/src/components/canvas/components/Toolbar.vue @@ -735,7 +735,7 @@ export default { display: inline-block; font-weight: 400 !important; font-size: 16px; - font-family: PingFang SC; + font-family: AlibabaPuHuiTi; line-height: 1; white-space: nowrap; cursor: pointer; diff --git a/core/frontend/src/components/deCustomCm/DeBtn.vue b/core/frontend/src/components/deCustomCm/DeBtn.vue index 55df2934bb..437a0af20c 100644 --- a/core/frontend/src/components/deCustomCm/DeBtn.vue +++ b/core/frontend/src/components/deCustomCm/DeBtn.vue @@ -155,7 +155,7 @@ $B: null; } } @include b(button) { - font-family: PingFang SC; + font-family: AlibabaPuHuiTi; font-size: 14px; font-weight: 400; line-height: 1; diff --git a/core/frontend/src/components/gridTable/index.vue b/core/frontend/src/components/gridTable/index.vue index 22c40b389e..a7338a118b 100644 --- a/core/frontend/src/components/gridTable/index.vue +++ b/core/frontend/src/components/gridTable/index.vue @@ -216,7 +216,7 @@ export default { } ::v-deep .el-pagination__total { - font-family: "PingFang SC"; + font-family: "AlibabaPuHuiTi"; font-style: normal; font-weight: 400; font-size: 14px; diff --git a/core/frontend/src/custom-theme.css b/core/frontend/src/custom-theme.css index 1bf5908091..f477a08585 100755 --- a/core/frontend/src/custom-theme.css +++ b/core/frontend/src/custom-theme.css @@ -1,7 +1,7 @@ .vjs-custom-skin > .video-js { width: 100%; background-color: rgba(0, 0, 0, 0); - font-family: "PingFang SC","Helvetica Neue","Hiragino Sans GB","Segoe UI","Microsoft YaHei","微软雅黑",sans-serif; + font-family: "AlibabaPuHuiTi","Helvetica Neue","Hiragino Sans GB","Segoe UI","Microsoft YaHei","微软雅黑",sans-serif; } .vjs-custom-skin > .video-js .vjs-menu-button-inline.vjs-slider-active,.vjs-custom-skin > .video-js .vjs-menu-button-inline:focus,.vjs-custom-skin > .video-js .vjs-menu-button-inline:hover,.video-js.vjs-no-flex .vjs-menu-button-inline { @@ -108,7 +108,7 @@ padding: 0; line-height: 2em; font-size: 1.1em; - font-family: "PingFang SC","Helvetica Neue","Hiragino Sans GB","Segoe UI","Microsoft YaHei","微软雅黑",sans-serif; + font-family: "AlibabaPuHuiTi","Helvetica Neue","Hiragino Sans GB","Segoe UI","Microsoft YaHei","微软雅黑",sans-serif; } .vjs-custom-skin > .video-js .vjs-time-tooltip, diff --git a/core/frontend/src/layout/components/Sidebar/index.vue b/core/frontend/src/layout/components/Sidebar/index.vue index 21eb6f2916..bdd7c112b4 100644 --- a/core/frontend/src/layout/components/Sidebar/index.vue +++ b/core/frontend/src/layout/components/Sidebar/index.vue @@ -98,7 +98,7 @@ export default { align-items: center; justify-content: center; //styleName: 中文/桌面端/正文 14 22 Regular; - font-family: PingFang SC; + font-family: AlibabaPuHuiTi; font-size: 14px; font-weight: 400; color: var(--SiderTextColor, #646a73); diff --git a/core/frontend/src/styles/index.scss b/core/frontend/src/styles/index.scss index c76b43b777..6c5fe6d9e7 100644 --- a/core/frontend/src/styles/index.scss +++ b/core/frontend/src/styles/index.scss @@ -5,7 +5,12 @@ @import './theme/dark.scss'; @import "~element-ui/packages/theme-chalk/src/index"; } */ - +@font-face { + font-family: 'AlibabaPuHuiTi'; + src: url('../../static/fonts/AlibabaPuHuiTi.otf'); + font-weight: normal; + font-style: normal; +} @import '~normalize.css/normalize.css'; @@ -27,7 +32,7 @@ body { -moz-osx-font-smoothing: grayscale; -webkit-font-smoothing: antialiased; text-rendering: optimizeLegibility; - font-family: Helvetica Neue, Helvetica, PingFang SC, Hiragino Sans GB, Microsoft YaHei, Arial, FangSong, SimHei, STHeiti, STKaiti, STSong, STFangsong sans-serif; + font-family: AlibabaPuHuiTi, Helvetica Neue, Helvetica, PingFang SC, Hiragino Sans GB, Microsoft YaHei, Arial, FangSong, SimHei, STHeiti, STKaiti, STSong, STFangsong sans-serif; } label { @@ -895,7 +900,7 @@ div:focus { box-shadow: 0px 4px 8px 0px #1f23291a; span { - font-family: PingFang SC; + font-family: AlibabaPuHuiTi; font-size: 14px; font-weight: 500; line-height: 22px; @@ -954,7 +959,7 @@ div:focus { } .el-pagination__total { - font-family: "PingFang SC"; + font-family: "AlibabaPuHuiTi"; font-style: normal; font-weight: 400; font-size: 14px; @@ -1020,7 +1025,7 @@ div:focus { } .el-textarea .el-input__count { - font-family: PingFang SC; + font-family: AlibabaPuHuiTi; font-size: 12px; font-weight: 400; color: #8F959E; @@ -1080,7 +1085,7 @@ div:focus { .el-message-box__message { //styleName: 中文/桌面端/四级标题 16 24 Medium; - font-family: PingFang SC; + font-family: AlibabaPuHuiTi; font-size: 16px; font-weight: 500; line-height: 24px; @@ -1097,7 +1102,7 @@ div:focus { height: 32px; width: 80px; border-radius: 4px; - font-family: PingFang SC; + font-family: AlibabaPuHuiTi; font-size: 14px; font-weight: 400; line-height: 22px; @@ -1123,7 +1128,7 @@ div:focus { .use-html { //styleName: 中文/桌面端/正文 14 22 Regular; - font-family: PingFang SC; + font-family: AlibabaPuHuiTi; font-size: 14px; font-weight: 400; line-height: 22px; @@ -1232,7 +1237,7 @@ div:focus { .el-drawer__header { padding: 16px 24px; margin: 0; - font-family: PingFang SC; + font-family: AlibabaPuHuiTi; font-size: 16px; font-weight: 500; line-height: 24px; @@ -1281,7 +1286,7 @@ div:focus { > :nth-child(1) { color: var(--deTextSecondary, #1f2329); - font-family: "PingFang SC"; + font-family: "AlibabaPuHuiTi"; font-style: normal; font-weight: 400; font-size: 14px; @@ -1295,7 +1300,7 @@ div:focus { .item, .more { - font-family: PingFang SC; + font-family: AlibabaPuHuiTi; white-space: nowrap; font-size: 14px; font-weight: 400; @@ -1360,7 +1365,7 @@ div:focus { display: flex; align-items: center; position: relative; - font-family: PingFang SC; + font-family: AlibabaPuHuiTi; font-size: 14px; font-weight: 500; line-height: 22px; @@ -1510,7 +1515,7 @@ div:focus { } .de-text-btn { - font-family: PingFang SC; + font-family: AlibabaPuHuiTi; font-size: 14px; font-weight: 400; line-height: 22px; @@ -1582,7 +1587,7 @@ div:focus { display: flex; align-items: center; margin: 17px 0; - font-family: "PingFang SC"; + font-family: "AlibabaPuHuiTi"; font-weight: 400; .sum { @@ -1734,7 +1739,7 @@ div:focus { top: 0; z-index: 15; .title { - font-family: PingFang SC; + font-family: AlibabaPuHuiTi; font-size: 16px; font-weight: 500; line-height: 24px; diff --git a/core/frontend/src/views/chart/components/ChartTitleUpdate.vue b/core/frontend/src/views/chart/components/ChartTitleUpdate.vue index 17103546b2..344ac16e56 100644 --- a/core/frontend/src/views/chart/components/ChartTitleUpdate.vue +++ b/core/frontend/src/views/chart/components/ChartTitleUpdate.vue @@ -407,7 +407,7 @@ export default { .chart-input-title { word-break: break-word; font: 12px / 1.231 -apple-system, BlinkMacSystemFont, 'Helvetica Neue', Arial, - 'Microsoft YaHei', 'PingFang SC', sans-serif, 'Segoe UI Symbol'; + 'Microsoft YaHei', 'AlibabaPuHuiTi', sans-serif, 'Segoe UI Symbol'; overflow: visible; margin: 0; padding: 0; diff --git a/core/frontend/src/views/dataset/Form.vue b/core/frontend/src/views/dataset/Form.vue index be43c40416..0c87d5ae22 100644 --- a/core/frontend/src/views/dataset/Form.vue +++ b/core/frontend/src/views/dataset/Form.vue @@ -278,7 +278,7 @@ export default { box-shadow: 0 2px 2px 0 rgb(0 0 0 / 10%); .name { - font-family: PingFang SC; + font-family: AlibabaPuHuiTi; font-size: 16px; font-weight: 500; display: flex; @@ -299,7 +299,7 @@ export default { } .oprate { .table-num { - font-family: PingFang SC; + font-family: AlibabaPuHuiTi; font-size: 14px; font-weight: 400; margin-right: 16px; diff --git a/core/frontend/src/views/dataset/add/AddApi.vue b/core/frontend/src/views/dataset/add/AddApi.vue index 7f903da83e..3b930f4c16 100644 --- a/core/frontend/src/views/dataset/add/AddApi.vue +++ b/core/frontend/src/views/dataset/add/AddApi.vue @@ -498,7 +498,7 @@ export default { height: 100%; width: 240px; padding: 16px 12px; - font-family: PingFang SC; + font-family: AlibabaPuHuiTi; border-right: 1px solid rgba(31, 35, 41, 0.15); .select-ds { @@ -536,7 +536,7 @@ export default { align-items: center; box-sizing: border-box; padding: 12px; - font-family: PingFang SC; + font-family: AlibabaPuHuiTi; font-size: 14px; font-weight: 400; color: var(--deTextPrimary, #1f2329); @@ -581,7 +581,7 @@ export default { } .table-detail { - font-family: PingFang SC; + font-family: AlibabaPuHuiTi; flex: 1; overflow: hidden; @@ -629,7 +629,7 @@ export default { .result-num { font-weight: 400; display: inline-block; - font-family: PingFang SC; + font-family: AlibabaPuHuiTi; color: var(--deTextSecondary, #646a73); margin-bottom: 16px; } diff --git a/core/frontend/src/views/dataset/add/AddDB.vue b/core/frontend/src/views/dataset/add/AddDB.vue index 40533c8c20..62762efd2e 100644 --- a/core/frontend/src/views/dataset/add/AddDB.vue +++ b/core/frontend/src/views/dataset/add/AddDB.vue @@ -520,7 +520,7 @@ export default { height: 100%; width: 240px; padding: 16px 12px; - font-family: PingFang SC; + font-family: AlibabaPuHuiTi; border-right: 1px solid rgba(31, 35, 41, 0.15); .select-ds { @@ -558,7 +558,7 @@ export default { align-items: center; box-sizing: border-box; padding: 12px; - font-family: PingFang SC; + font-family: AlibabaPuHuiTi; font-size: 14px; font-weight: 400; color: var(--deTextPrimary, #1f2329); @@ -603,7 +603,7 @@ export default { } .table-detail { - font-family: PingFang SC; + font-family: AlibabaPuHuiTi; flex: 1; overflow: hidden; @@ -651,7 +651,7 @@ export default { .result-num { font-weight: 400; display: inline-block; - font-family: PingFang SC; + font-family: AlibabaPuHuiTi; color: var(--deTextSecondary, #646a73); margin-bottom: 16px; } diff --git a/core/frontend/src/views/dataset/add/AddExcel.vue b/core/frontend/src/views/dataset/add/AddExcel.vue index ae124321d1..54112684f7 100644 --- a/core/frontend/src/views/dataset/add/AddExcel.vue +++ b/core/frontend/src/views/dataset/add/AddExcel.vue @@ -680,7 +680,7 @@ export default { height: 100%; width: 240px; padding: 16px 12px; - font-family: PingFang SC; + font-family: AlibabaPuHuiTi; border-right: 1px solid rgba(31, 35, 41, 0.15); .select-ds { @@ -749,7 +749,7 @@ export default { } .table-detail { - font-family: PingFang SC; + font-family: AlibabaPuHuiTi; flex: 1; overflow-x: auto; @@ -780,7 +780,7 @@ export default { overflow-y: auto; .result-num { - font-family: PingFang SC; + font-family: AlibabaPuHuiTi; font-size: 14px; font-weight: 400; color: var(--deTextSecondary, #646a73); diff --git a/core/frontend/src/views/dataset/add/AddSQL.vue b/core/frontend/src/views/dataset/add/AddSQL.vue index f4be2b1bac..2bccec5ce1 100644 --- a/core/frontend/src/views/dataset/add/AddSQL.vue +++ b/core/frontend/src/views/dataset/add/AddSQL.vue @@ -1193,7 +1193,7 @@ export default { background: #e1eaff; position: relative; padding: 9px 0 9px 40px; - font-family: PingFang SC; + font-family: AlibabaPuHuiTi; font-size: 14px; font-weight: 400; @@ -1233,7 +1233,7 @@ export default { border-left: 1px solid var(--deCardStrokeColor, #dee0e3); .no-select-datasource { - font-family: PingFang SC; + font-family: AlibabaPuHuiTi; font-size: 14px; color: var(--deTextPrimary, #1f2329); font-weight: 400; @@ -1243,7 +1243,7 @@ export default { } .table-database-name { - font-family: PingFang SC; + font-family: AlibabaPuHuiTi; font-size: 16px; font-weight: 500; color: var(--deTextPrimary, #1f2329); @@ -1346,7 +1346,7 @@ export default { } .sql-result { - font-family: PingFang SC; + font-family: AlibabaPuHuiTi; font-size: 14px; overflow-y: auto; box-sizing: border-box; @@ -1396,7 +1396,7 @@ export default { .el-empty__bottom, .el-empty__description p { - font-family: PingFang SC; + font-family: AlibabaPuHuiTi; font-size: 14px; font-weight: 400; margin-top: 0; diff --git a/core/frontend/src/views/dataset/add/AddUnion.vue b/core/frontend/src/views/dataset/add/AddUnion.vue index b1273d8b07..84e54b121d 100644 --- a/core/frontend/src/views/dataset/add/AddUnion.vue +++ b/core/frontend/src/views/dataset/add/AddUnion.vue @@ -425,7 +425,7 @@ export default { .preview-container { flex: 1; - font-family: PingFang SC; + font-family: AlibabaPuHuiTi; font-size: 14px; overflow-y: auto; box-sizing: border-box; diff --git a/core/frontend/src/views/dataset/add/union/UnionEdit.vue b/core/frontend/src/views/dataset/add/union/UnionEdit.vue index 4e8d829828..976d91361f 100644 --- a/core/frontend/src/views/dataset/add/union/UnionEdit.vue +++ b/core/frontend/src/views/dataset/add/union/UnionEdit.vue @@ -110,7 +110,7 @@ export default { width: 50%; & > p { - font-family: PingFang SC; + font-family: AlibabaPuHuiTi; font-size: 14px; font-weight: 500; margin: 0; diff --git a/core/frontend/src/views/dataset/add/union/UnionFieldList.vue b/core/frontend/src/views/dataset/add/union/UnionFieldList.vue index 254807a00c..f172d76b39 100644 --- a/core/frontend/src/views/dataset/add/union/UnionFieldList.vue +++ b/core/frontend/src/views/dataset/add/union/UnionFieldList.vue @@ -154,7 +154,7 @@ export default { .field-block-style { height: 100%; width: 100%; - font-family: PingFang SC; + font-family: AlibabaPuHuiTi; .field-block-head { height: 46px; display: flex; diff --git a/core/frontend/src/views/dataset/add/union/UnionItemEdit.vue b/core/frontend/src/views/dataset/add/union/UnionItemEdit.vue index 299dd6af9f..15e9c846fd 100644 --- a/core/frontend/src/views/dataset/add/union/UnionItemEdit.vue +++ b/core/frontend/src/views/dataset/add/union/UnionItemEdit.vue @@ -250,7 +250,7 @@ export default {