Merge pull request #7225 from dataease/pr@dev-v2_dzz

Pr@dev v2 dzz
2023-12-20 14:34:57 +08:00 · 2023-12-20 14:34:57 +08:00 · 28eb597381
commit 28eb597381
parent d085ae4565 65ada898cb
63 changed files with 162 additions and 150 deletions
--- a/core/core-frontend/src/assets/font/AlibabaPuHuiTi.otf
+++ b/core/core-frontend/src/assets/font/AlibabaPuHuiTi.otf
--- a/core/core-frontend/src/components/color-scheme/src/ColorScheme.vue
+++ b/core/core-frontend/src/components/color-scheme/src/ColorScheme.vue
@ -187,7 +187,7 @@ const resetCustomColor = () => {
  .custom-title {
    justify-content: space-between;
    color: #646a73;
-    font-family: PingFang SC;
+    font-family: AlibabaPuHuiTi;
    font-size: 12px;
    font-style: normal;
    font-weight: 400;
--- a/core/core-frontend/src/components/column-list/src/ColumnList.vue
+++ b/core/core-frontend/src/components/column-list/src/ColumnList.vue
@ -90,7 +90,7 @@ const handleCheckAllChange = (val: CheckboxValueType) => {

  .title,
  .ed-checkbox {
-    font-family: PingFang SC;
+    font-family: AlibabaPuHuiTi;
    font-size: 14px;
    font-weight: 400;
    padding: 5px 0;
--- a/core/core-frontend/src/components/drawer-filter/src/DrawerEnumFilter.vue
+++ b/core/core-frontend/src/components/drawer-filter/src/DrawerEnumFilter.vue
@ -57,7 +57,7 @@ defineExpose({

  > :nth-child(1) {
    color: var(--deTextSecondary, #1f2329);
-    font-family: 'PingFang SC';
+    font-family: 'AlibabaPuHuiTi';
    font-style: normal;
    font-weight: 400;
    font-size: 14px;
@ -71,7 +71,7 @@ defineExpose({

    .item,
    .more {
-      font-family: PingFang SC;
+      font-family: AlibabaPuHuiTi;
      white-space: nowrap;
      font-size: 14px;
      font-weight: 400;
--- a/core/core-frontend/src/components/drawer-filter/src/DrawerFilter.vue
+++ b/core/core-frontend/src/components/drawer-filter/src/DrawerFilter.vue
@ -66,7 +66,7 @@ defineExpose({

  > :nth-child(1) {
    color: var(--deTextSecondary, #1f2329);
-    font-family: 'PingFang SC';
+    font-family: 'AlibabaPuHuiTi';
    font-style: normal;
    font-weight: 400;
    font-size: 14px;
--- a/core/core-frontend/src/components/drawer-filter/src/DrawerTimeFilter.vue
+++ b/core/core-frontend/src/components/drawer-filter/src/DrawerTimeFilter.vue
@ -100,7 +100,7 @@ defineExpose({

  > :nth-child(1) {
    color: var(--deTextSecondary, #1f2329);
-    font-family: 'PingFang SC';
+    font-family: 'AlibabaPuHuiTi';
    font-style: normal;
    font-weight: 400;
    font-size: 14px;
@ -114,7 +114,7 @@ defineExpose({

    .item,
    .more {
-      font-family: PingFang SC;
+      font-family: AlibabaPuHuiTi;
      white-space: nowrap;
      font-size: 14px;
      font-weight: 400;
--- a/core/core-frontend/src/components/drawer-filter/src/DrawerTreeFilter.vue
+++ b/core/core-frontend/src/components/drawer-filter/src/DrawerTreeFilter.vue
@ -72,7 +72,7 @@ defineExpose({

  > :nth-child(1) {
    color: var(--deTextSecondary, #1f2329);
-    font-family: 'PingFang SC';
+    font-family: 'AlibabaPuHuiTi';
    font-style: normal;
    font-weight: 400;
    font-size: 14px;
--- a/core/core-frontend/src/components/empty-background/src/EmptyBackground.vue
+++ b/core/core-frontend/src/components/empty-background/src/EmptyBackground.vue
@ -55,7 +55,7 @@ const getAssetsFile = {
  color: var(--N600, #646a73);
  text-align: center;
  /* 正文-字号 14，行高 22，字重适中（Regular），用于列表Feed会话 */
-  font-family: PingFang SC;
+  font-family: AlibabaPuHuiTi;
  font-size: 14px;
  font-style: normal;
  font-weight: 400;
--- a/core/core-frontend/src/components/filter-text/src/FilterText.vue
+++ b/core/core-frontend/src/components/filter-text/src/FilterText.vue
@ -71,7 +71,7 @@ watch(
  display: flex;
  align-items: center;
  margin: 17px 0;
-  font-family: 'PingFang SC';
+  font-family: 'AlibabaPuHuiTi';
  font-weight: 400;

  .sum {
--- a/core/core-frontend/src/components/visualization/LinkJumpSet.vue
+++ b/core/core-frontend/src/components/visualization/LinkJumpSet.vue
@ -859,7 +859,7 @@ defineExpose({

  color: var(--neutral-900, #1f2329);
  /* 中文/桌面端/正文 14 22 Regular */
-  font-family: PingFang SC;
+  font-family: AlibabaPuHuiTi;
  font-size: 14px;
  font-style: normal;
  font-weight: 400;
--- a/core/core-frontend/src/components/visualization/linkJump.vue
+++ b/core/core-frontend/src/components/visualization/linkJump.vue
@ -266,7 +266,7 @@ defineExpose({

 <style lang="less">
 .jump-linkage {
-  font-family: PingFang SC;
+  font-family: AlibabaPuHuiTi;
  font-size: 14px;

  .chart-dataset-name {
--- a/core/core-frontend/src/custom-component/v-query/Component.vue
+++ b/core/core-frontend/src/custom-component/v-query/Component.vue
@ -495,7 +495,7 @@ const opacityStyle = computed(() => {
      justify-content: center;
      color: #646a73;
      text-align: center;
-      font-family: PingFang SC;
+      font-family: AlibabaPuHuiTi;
      font-size: 16px;
      font-style: normal;
      font-weight: 400;
@ -511,7 +511,7 @@ const opacityStyle = computed(() => {
  .title {
    color: #1f2329;
    font-feature-settings: 'clig' off, 'liga' off;
-    font-family: PingFang SC;
+    font-family: AlibabaPuHuiTi;
    font-size: 14px;
    font-style: normal;
    font-weight: 500;
@ -570,7 +570,7 @@ const opacityStyle = computed(() => {
          text-overflow: ellipsis;
          white-space: nowrap;
          color: #1f2329;
-          font-family: PingFang SC;
+          font-family: AlibabaPuHuiTi;
          font-size: 14px;
          font-style: normal;
          font-weight: 400;
--- a/core/core-frontend/src/custom-component/v-query/QueryConditionConfiguration.vue
+++ b/core/core-frontend/src/custom-component/v-query/QueryConditionConfiguration.vue
@ -1379,7 +1379,7 @@ defineExpose({

 <style lang="less">
 .dataset-parameters {
-  font-family: PingFang SC;
+  font-family: AlibabaPuHuiTi;
  font-style: normal;
  font-weight: 400;
  .ed-select-dropdown__item {
@ -1411,7 +1411,7 @@ defineExpose({
  }
  .container {
    font-size: 14px;
-    font-family: PingFang SC;
+    font-family: AlibabaPuHuiTi;
    width: 1152px;
    height: 454px;
    border-radius: 4px;
@ -1432,7 +1432,7 @@ defineExpose({
        display: flex;
        align-items: center;
        justify-content: space-between;
-        font-family: PingFang SC;
+        font-family: AlibabaPuHuiTi;
        font-size: 14px;
        font-style: normal;
        font-weight: 500;
@ -1499,7 +1499,7 @@ defineExpose({
      }

      .title {
-        font-family: PingFang SC;
+        font-family: AlibabaPuHuiTi;
        font-size: 14px;
        font-style: normal;
        font-weight: 500;
@ -1563,7 +1563,7 @@ defineExpose({
        color: #646a73;
        height: 16px;
        padding: 0px 4px;
-        font-family: PingFang SC;
+        font-family: AlibabaPuHuiTi;
        font-size: 10px;
        font-style: normal;
        font-weight: 500;
@ -1585,7 +1585,7 @@ defineExpose({
      }
      .title {
        margin-bottom: 16px;
-        font-family: PingFang SC;
+        font-family: AlibabaPuHuiTi;
        font-size: 14px;
        font-style: normal;
        font-weight: 500;
--- a/core/core-frontend/src/hooks/web/useFilter.ts
+++ b/core/core-frontend/src/hooks/web/useFilter.ts
@ -100,12 +100,7 @@ export const searchQuery = (queryComponentList, filter, curComponentId, firstLoa
              displayType,
              multiple
            } = item
-            if (
-              timeType === 'dynamic' &&
-              [1, 7].includes(+displayType) &&
-              firstLoad &&
-              !value?.length
-            ) {
+            if (timeType === 'dynamic' && [1, 7].includes(+displayType) && firstLoad) {
              if (+displayType === 1) {
                selectValue = getDynamicRange(item)
                item.defaultValue = new Date(selectValue[0])
--- a/core/core-frontend/src/layout/components/HeaderSystem.vue
+++ b/core/core-frontend/src/layout/components/HeaderSystem.vue
@ -32,7 +32,7 @@ const backToMain = () => {

 <style lang="less" scoped>
 .system-header {
-  font-family: PingFang SC;
+  font-family: AlibabaPuHuiTi;

  .logo {
    width: 134px;
--- a/core/core-frontend/src/layout/components/HeaderTemplateMarket.vue
+++ b/core/core-frontend/src/layout/components/HeaderTemplateMarket.vue
@ -28,7 +28,7 @@ const backToMain = () => {

 <style lang="less" scoped>
 .system-header {
-  font-family: PingFang SC;
+  font-family: AlibabaPuHuiTi;

  .logo {
    width: 134px;
--- a/core/core-frontend/src/pages/panel/App.vue
+++ b/core/core-frontend/src/pages/panel/App.vue
@ -8,6 +8,10 @@ const DashboardEditor = defineAsyncComponent(() => import('@/views/dashboard/ind

 const Dashboard = defineAsyncComponent(() => import('./DashboardPreview.vue'))
 const ViewWrapper = defineAsyncComponent(() => import('./ViewWrapper.vue'))
+const Dataset = defineAsyncComponent(() => import('@/views/visualized/data/dataset/index.vue'))
+const Datasource = defineAsyncComponent(
+  () => import('@/views/visualized/data/datasource/index.vue')
+)
 const props = defineProps({
  componentName: propTypes.string.def('DashboardEditor')
 })
@ -17,7 +21,9 @@ const componentMap = {
  DashboardEditor,
  VisualizationEditor,
  ViewWrapper,
-  Dashboard
+  Dashboard,
+  Dataset,
+  Datasource
 }

 currentComponent.value = componentMap[props.componentName]
--- a/core/core-frontend/src/style/index.less
+++ b/core/core-frontend/src/style/index.less
@ -1,5 +1,13 @@
+@font-face {
+  font-family: 'AlibabaPuHuiTi';
+  src: url('../assets/font/AlibabaPuHuiTi.otf');
+  font-weight: normal;
+  font-style: normal;
+}
+
 :root {
-  font-family: Helvetica Neue, Helvetica, PingFang SC, Hiragino Sans GB, Microsoft YaHei, \5fae\8f6f\96c5\9ed1, Arial, sans-serif;
+  font-family: AlibabaPuHuiTi, Helvetica Neue, Helvetica, AlibabaPuHuiTi, Hiragino Sans GB, Microsoft YaHei,
+    \5fae\8f6f\96c5\9ed1, Arial, sans-serif;
  line-height: 1.5;
  font-weight: 400;

@ -53,7 +61,6 @@ body {
  white-space: nowrap;
 }

-
 .list-item_primary {
  height: 40px;
  border-radius: 4px;
@ -69,7 +76,7 @@ body {
  .label {
    width: 85%;
    font-size: 14px;
-    .ellipsis
+    .ellipsis;
  }

  &:not(.active):hover {
@ -78,7 +85,7 @@ body {

  &.active {
    background: rgba(51, 112, 255, 0.1);
-    color: #3370FF;
+    color: #3370ff;
  }
 }

@ -100,7 +107,7 @@ body {
 }

 .title-form_primary {
-  font-family: 'PingFang SC';
+  font-family: 'AlibabaPuHuiTi';
  font-style: normal;
  font-weight: 500;
  font-size: 14px;
@ -129,28 +136,28 @@ body {
  background-color: #f5f6f7 !important;

  .ed-table-v2__header-cell {
-    background-color: transparent
+    background-color: transparent;
  }
 }

 .field-icon-text {
-  color: #3370FF;
+  color: #3370ff;
 }

 .field-icon-time {
-  color: #3370FF;
+  color: #3370ff;
 }

 .field-icon-value {
-  color: #04B49C;
+  color: #04b49c;
 }

 .field-icon-location {
-  color: #3370FF;
+  color: #3370ff;
 }

 .field-icon-red {
-  color: #F54A45;
+  color: #f54a45;
 }

 .field-icon-sort {
@ -160,24 +167,22 @@ body {
 }

 .field-icon-dimension {
-  color: #3370FF;
+  color: #3370ff;
 }

 .field-icon-quota {
-  color: #04B49C;
+  color: #04b49c;
 }

-
-
 .hover-icon {
  cursor: pointer;
  height: 24px !important;
  width: 24px !important;
  font-size: 16px !important;
  border-radius: 4px;
-  color: #646A73 !important;
+  color: #646a73 !important;

-  &[aria-expanded="true"] {
+  &[aria-expanded='true'] {
    background: rgba(31, 35, 41, 0.1);
  }

@ -197,25 +202,24 @@ body {
 }

 .hover-icon-in-table {
-  color: #3370FF !important;
-  &[aria-expanded="true"] {
-    background: rgba(51,112,255,.1);
+  color: #3370ff !important;
+  &[aria-expanded='true'] {
+    background: rgba(51, 112, 255, 0.1);
  }
  &:hover {
-    background: rgba(51,112,255,.1);
+    background: rgba(51, 112, 255, 0.1);
  }
 }

-
 .custom-popover-dark {
-  min-width: 50px!important;
+  min-width: 50px !important;
  background: @side-content-background !important;
  padding: 0px 4px 0 4px !important;
  border: 1px solid @side-outline-border-color !important;
 }

 .custom-popover-light {
-  min-width: 50px!important;
+  min-width: 50px !important;
  background: @side-content-background-light !important;
  padding: 0px 4px 0 4px !important;
  border: 1px solid @side-outline-border-color-light !important;
@ -234,7 +238,7 @@ body {
  border-radius: 4px;

  &:hover {
-    background: rgba(235, 235, 235, 0.10);
+    background: rgba(235, 235, 235, 0.1);
  }

  &:active {
@ -280,14 +284,23 @@ body {
 }

 .primary-color {
-  color: var(--ed-color-primary, #3370FF);
+  color: var(--ed-color-primary, #3370ff);
 }

+// .ed-drawer__footer {
+//   height: 64px !important;
+//   padding: 0px !important;
+//   box-shadow: 0 -1px 0px #d7d7d7 !important;
+// }
+
+// .ed-drawer__body {
+//   padding: 0 0 64px 0 !important;
+// }
+
 .ed-tree-node.is-current>.ed-tree-node__content:not(.is-menu):after {
  display: none;
 }

-
 .create-dialog {
  .ed-form-item {
    margin-bottom: 16px;
@ -312,7 +325,6 @@ em {
  text-align: left !important;
 }

-
 .cell {
  .is-text {
    .ed-icon {
@ -326,28 +338,28 @@ em {
  max-height: 100vh;
  overflow-y: auto;
  background: none !important;
-  .ed-dialog__header{
+  .ed-dialog__header {
    padding: 0px;
-    .ed-dialog__headerbtn{
+    .ed-dialog__headerbtn {
      .ed-icon {
        font-size: 24px;
        color: white;
      }
-      background: rgba(31, 35, 41, 0.90);
+      background: rgba(31, 35, 41, 0.9);
      height: 48px;
      width: 48px;
-      top:24px;
+      top: 24px;
      right: 24px;
      padding: 12px;
      border-radius: 50%;
      &:hover {
-        background: #646A73;
+        background: #646a73;
      }
    }
  }
-  .ed-dialog__body{
+  .ed-dialog__body {
    padding: 0px;
-    background-color: #1F232999;
+    background-color: #1f232999;
  }
 }

@ -384,4 +396,3 @@ em {
 .ed-table {
  --ed-table-row-hover-bg-color: #e8e9e9 !important;
 }
-
--- a/core/core-frontend/src/views/about/index.vue
+++ b/core/core-frontend/src/views/about/index.vue
@ -220,7 +220,7 @@ const update = (licKey: string) => {
    margin-top: -7px;

    .item {
-      font-family: PingFang SC;
+      font-family: AlibabaPuHuiTi;
      font-size: 16px;
      font-style: normal;
      font-weight: 400;
--- a/core/core-frontend/src/views/chart/components/editor/editor-senior/Senior.vue
+++ b/core/core-frontend/src/views/chart/components/editor/editor-senior/Senior.vue
@ -390,7 +390,7 @@ span {
 }

 .label-dark {
-  font-family: PingFang SC;
+  font-family: AlibabaPuHuiTi;
  font-style: normal;
  font-weight: 400;
  line-height: 20px;
--- a/core/core-frontend/src/views/chart/components/editor/editor-senior/components/AssistLine.vue
+++ b/core/core-frontend/src/views/chart/components/editor/editor-senior/components/AssistLine.vue
@ -318,7 +318,7 @@ span {
 }

 .label-dark {
-  font-family: PingFang SC;
+  font-family: AlibabaPuHuiTi;
  font-style: normal;
  font-weight: 400;
  line-height: 20px;
--- a/core/core-frontend/src/views/chart/components/editor/editor-senior/components/Threshold.vue
+++ b/core/core-frontend/src/views/chart/components/editor/editor-senior/components/Threshold.vue
@ -767,7 +767,7 @@ span {
  }
 }
 .label-dark {
-  font-family: PingFang SC;
+  font-family: AlibabaPuHuiTi;
  font-style: normal;
  font-weight: 400;
  line-height: 20px;
--- a/core/core-frontend/src/views/chart/components/editor/editor-style/components/TitleSelector.vue
+++ b/core/core-frontend/src/views/chart/components/editor/editor-style/components/TitleSelector.vue
@ -479,7 +479,7 @@ watch(
 }
 .remark-label {
  color: var(--N600, #646a73);
-  font-family: PingFang SC;
+  font-family: AlibabaPuHuiTi;
  font-size: 12px;
  font-style: normal;
  font-weight: 400;
--- a/core/core-frontend/src/views/chart/components/editor/filter/QuotaFilterEditor.vue
+++ b/core/core-frontend/src/views/chart/components/editor/filter/QuotaFilterEditor.vue
@ -202,7 +202,7 @@ span {
    :deep(span) {
      color: var(--N900, #1f2329);
      /* 中文/桌面端/正文 14 22 Regular */
-      font-family: PingFang SC;
+      font-family: AlibabaPuHuiTi;
      font-size: 14px;
      font-style: normal;
      font-weight: 400;
--- a/core/core-frontend/src/views/chart/components/editor/filter/ResultFilterEditor.vue
+++ b/core/core-frontend/src/views/chart/components/editor/filter/ResultFilterEditor.vue
@ -412,7 +412,7 @@ span {
    :deep(span) {
      color: var(--N900, #1f2329);
      /* 中文/桌面端/正文 14 22 Regular */
-      font-family: PingFang SC;
+      font-family: AlibabaPuHuiTi;
      font-size: 14px;
      font-style: normal;
      font-weight: 400;
--- a/core/core-frontend/src/views/chart/components/editor/index.vue
+++ b/core/core-frontend/src/views/chart/components/editor/index.vue
@ -2233,7 +2233,7 @@ const onRefreshChange = val => {
        height: 35px;
        line-height: 35px;
        color: #3370ff;
-        font-family: PingFang SC;
+        font-family: AlibabaPuHuiTi;
        font-size: 12px;
        font-style: normal;
        font-weight: 500;
@ -3097,7 +3097,7 @@ span {
  margin-bottom: 16px !important;

  .text {
-    font-family: PingFang SC;
+    font-family: AlibabaPuHuiTi;
    font-size: 14px;
    font-style: normal;
    font-weight: 400;
@ -3106,7 +3106,7 @@ span {
    --ed-input-height: 32px;

    :deep(.ed-input__inner) {
-      font-family: PingFang SC;
+      font-family: AlibabaPuHuiTi;
      font-size: 14px;
      font-style: normal;
      font-weight: 400;
@ -3117,7 +3117,7 @@ span {
  :deep(.ed-form-item__label) {
    color: #1f2329;

-    font-family: PingFang SC;
+    font-family: AlibabaPuHuiTi;
    font-size: 14px;
    font-style: normal;
    font-weight: 400;
--- a/core/core-frontend/src/views/common/DeResourceGroupOpt.vue
+++ b/core/core-frontend/src/views/common/DeResourceGroupOpt.vue
@ -409,7 +409,7 @@ const emits = defineEmits(['finish'])
      margin-bottom: 8px;
    }
    span {
-      font-family: PingFang SC;
+      font-family: AlibabaPuHuiTi;
      font-size: 14px;
      font-weight: 400;
      line-height: 22px;
--- a/core/core-frontend/src/views/common/DvDetailInfo.vue
+++ b/core/core-frontend/src/views/common/DvDetailInfo.vue
@ -33,7 +33,7 @@ const timestampFormatDate = value => {

 <style lang="less" scoped>
 .info-card {
-  font-family: 'PingFang SC';
+  font-family: 'AlibabaPuHuiTi';
  font-style: normal;
  padding-left: 4px;
  font-weight: 400;
--- a/core/core-frontend/src/views/login/index.vue
+++ b/core/core-frontend/src/views/login/index.vue
@ -407,7 +407,7 @@ onMounted(() => {
    text-align: center;
    margin-top: 8px;
    color: #646a73;
-    font-family: PingFang SC;
+    font-family: AlibabaPuHuiTi;
    font-size: 14px;
    font-style: normal;
    font-weight: 400;
@ -445,7 +445,7 @@ onMounted(() => {

  :deep(.ed-divider__text) {
    color: #8f959e;
-    font-family: PingFang SC;
+    font-family: AlibabaPuHuiTi;
    font-size: 12px;
    font-style: normal;
    font-weight: 400;
--- a/core/core-frontend/src/views/system/parameter/email/EmailEdit.vue
+++ b/core/core-frontend/src/views/system/parameter/email/EmailEdit.vue
@ -139,7 +139,7 @@ defineExpose({
    }

    .pwd {
-      font-family: PingFang SC;
+      font-family: AlibabaPuHuiTi;
      font-size: 14px;
      font-weight: 400;
      line-height: 22px;
@ -158,7 +158,7 @@ defineExpose({
      padding: 0 20px;
      color: #1f2329;
      text-align: center;
-      font-family: PingFang SC;
+      font-family: AlibabaPuHuiTi;
      font-size: 14px;
      font-style: normal;
      font-weight: 400;
--- a/core/core-frontend/src/views/system/parameter/index.vue
+++ b/core/core-frontend/src/views/system/parameter/index.vue
@ -31,7 +31,7 @@ const activeName = ref('basic')
 .router-title {
  color: #1f2329;
  font-feature-settings: 'clig' off, 'liga' off;
-  font-family: PingFang SC;
+  font-family: AlibabaPuHuiTi;
  font-size: 20px;
  font-style: normal;
  font-weight: 500;
--- a/core/core-frontend/src/views/template-market/component/MarketPreview.vue
+++ b/core/core-frontend/src/views/template-market/component/MarketPreview.vue
@ -371,7 +371,7 @@ onMounted(() => {
 .insert-filter {
  display: inline-block;
  font-weight: 400 !important;
-  font-family: PingFang SC;
+  font-family: AlibabaPuHuiTi;
  line-height: 1;
  white-space: nowrap;
  cursor: pointer;
@ -400,7 +400,7 @@ onMounted(() => {
 .insert {
  display: inline-block;
  font-weight: 400 !important;
-  font-family: PingFang SC;
+  font-family: AlibabaPuHuiTi;
  line-height: 1;
  white-space: nowrap;
  cursor: pointer;
--- a/core/core-frontend/src/views/template-market/component/MarketPreviewV2.vue
+++ b/core/core-frontend/src/views/template-market/component/MarketPreviewV2.vue
@ -492,7 +492,7 @@ onMounted(() => {
 .insert-filter {
  display: inline-block;
  font-weight: 400 !important;
-  font-family: PingFang SC;
+  font-family: AlibabaPuHuiTi;
  line-height: 1;
  white-space: nowrap;
  cursor: pointer;
@ -525,7 +525,7 @@ onMounted(() => {
  display: inline-block;
  font-size: 34px;
  font-weight: 400 !important;
-  font-family: PingFang SC;
+  font-family: AlibabaPuHuiTi;
  line-height: 1;
  white-space: nowrap;
  cursor: pointer;
--- a/core/core-frontend/src/views/template/component/DeTemplateItem.vue
+++ b/core/core-frontend/src/views/template/component/DeTemplateItem.vue
@ -132,7 +132,7 @@ const handleCommand = key => {

  .de-model-text {
    margin-left: 8px;
-    font-family: 'PingFang SC';
+    font-family: 'AlibabaPuHuiTi';
    font-style: normal;
    font-weight: 400;
    font-size: 14px;
--- a/core/core-frontend/src/views/template/component/DeTemplateList.vue
+++ b/core/core-frontend/src/views/template/component/DeTemplateList.vue
@ -152,7 +152,7 @@ defineExpose({
    align-items: center;
    border-radius: 4px;
    color: var(--deTextPrimary, #1f2329);
-    font-family: 'PingFang SC';
+    font-family: 'AlibabaPuHuiTi';
    font-style: normal;
    font-weight: 500;
    font-size: 14px;
--- a/core/core-frontend/src/views/template/index.vue
+++ b/core/core-frontend/src/views/template/index.vue
@ -419,7 +419,7 @@ onMounted(() => {
    .active-template {
      height: 56px;
      padding: 0px 24px;
-      font-family: 'PingFang SC';
+      font-family: 'AlibabaPuHuiTi';
      font-style: normal;
      font-weight: 500;
      font-size: 16px;
@ -436,7 +436,7 @@ onMounted(() => {
 .router-title {
  color: #1f2329;
  font-feature-settings: 'clig' off, 'liga' off;
-  font-family: PingFang SC;
+  font-family: AlibabaPuHuiTi;
  font-size: 20px;
  font-style: normal;
  font-weight: 500;
--- a/core/core-frontend/src/views/visualized/data/dataset/DatasetDetail.vue
+++ b/core/core-frontend/src/views/visualized/data/dataset/DatasetDetail.vue
@ -36,7 +36,7 @@ const { t } = useI18n()

 <style lang="less" scoped>
 .info-card {
-  font-family: 'PingFang SC';
+  font-family: 'AlibabaPuHuiTi';
  font-style: normal;
  padding-left: 4px;
  font-weight: 400;
--- a/core/core-frontend/src/views/visualized/data/dataset/auth-tree/AuthTree.vue
+++ b/core/core-frontend/src/views/visualized/data/dataset/auth-tree/AuthTree.vue
@ -149,7 +149,7 @@ const del = (index, child) => {
    z-index: 10;

    .operate-title {
-      font-family: PingFang SC, Hiragino Sans GB, Microsoft YaHei, sans-serif;
+      font-family: AlibabaPuHuiTi, Hiragino Sans GB, Microsoft YaHei, sans-serif;
      word-wrap: break-word;
      box-sizing: border-box;
      color: rgba(0, 0, 0, 0.65);
--- a/core/core-frontend/src/views/visualized/data/dataset/auth-tree/FilterFiled.vue
+++ b/core/core-frontend/src/views/visualized/data/dataset/auth-tree/FilterFiled.vue
@ -553,7 +553,7 @@ const emits = defineEmits(['update:item', 'del'])
  }

  .bottom-line {
-    font-family: PingFang SC, Hiragino Sans GB, Microsoft YaHei, sans-serif;
+    font-family: AlibabaPuHuiTi, Hiragino Sans GB, Microsoft YaHei, sans-serif;
    font-variant: tabular-nums;
    font-feature-settings: 'tnum';
    word-wrap: break-word;
@ -601,7 +601,7 @@ const emits = defineEmits(['update:item', 'del'])
    border-radius: 0;
    box-shadow: none;
    height: 26px;
-    font-family: PingFang SC, Hiragino Sans GB, Microsoft YaHei, sans-serif;
+    font-family: AlibabaPuHuiTi, Hiragino Sans GB, Microsoft YaHei, sans-serif;
    word-wrap: break-word;
    text-align: left;
    color: rgba(0, 0, 0, 0.65);
@ -714,7 +714,7 @@ const emits = defineEmits(['update:item', 'del'])
  }

  .ed-input {
-    font-family: Alibaba-PuHuiTi-Regular, Helvetica Neue, Helvetica, Arial, PingFang SC,
+    font-family: Alibaba-PuHuiTi-Regular, Helvetica Neue, Helvetica, Arial, AlibabaPuHuiTi,
      Hiragino Sans GB, Microsoft YaHei, sans-serif;
    box-sizing: border-box;
    margin: 0;
@ -748,7 +748,7 @@ const emits = defineEmits(['update:item', 'del'])
    box-shadow: none;
    border: 1px solid rgba(0, 0, 0, 0.05);
    .mod-left {
-      font-family: PingFang SC, Hiragino Sans GB, Microsoft YaHei, sans-serif;
+      font-family: AlibabaPuHuiTi, Hiragino Sans GB, Microsoft YaHei, sans-serif;
      color: rgba(0, 0, 0, 0.65);
      font-size: 12px;
      vertical-align: top;
@ -794,7 +794,7 @@ const emits = defineEmits(['update:item', 'del'])
      border-left: 1px solid hsla(0, 0%, 59%, 0.1);
    }
    .autochecker-list {
-      font-family: PingFang SC, Hiragino Sans GB, Microsoft YaHei, sans-serif;
+      font-family: AlibabaPuHuiTi, Hiragino Sans GB, Microsoft YaHei, sans-serif;
      color: rgba(0, 0, 0, 0.65);
      box-sizing: border-box;
      width: 100%;
@ -839,7 +839,7 @@ const emits = defineEmits(['update:item', 'del'])
        }

        label {
-          font-family: PingFang SC, Hiragino Sans GB, Microsoft YaHei, sans-serif;
+          font-family: AlibabaPuHuiTi, Hiragino Sans GB, Microsoft YaHei, sans-serif;
          font-size: 12px;
          direction: ltr;
          color: #333;
--- a/core/core-frontend/src/views/visualized/data/dataset/form/AddSql.vue
+++ b/core/core-frontend/src/views/visualized/data/dataset/form/AddSql.vue
@ -858,7 +858,7 @@ const mousedownDrag = () => {
    height: 100%;
    width: 240px;
    float: left;
-    font-family: PingFang SC;
+    font-family: AlibabaPuHuiTi;
    border-right: 1px solid rgba(31, 35, 41, 0.15);

    .list-item_primary {
@ -960,7 +960,7 @@ const mousedownDrag = () => {
    float: right;
    height: calc(100vh - 156px);
    .sql-result {
-      font-family: PingFang SC;
+      font-family: AlibabaPuHuiTi;
      font-size: 14px;
      overflow-y: auto;
      box-sizing: border-box;
@ -1122,7 +1122,7 @@ const mousedownDrag = () => {
 .sql-tips {
  color: #646a73;
  text-align: center;
-  font-family: PingFang SC;
+  font-family: AlibabaPuHuiTi;
  font-size: 14px;
  font-style: normal;
  font-weight: 400;
@ -1146,7 +1146,7 @@ const mousedownDrag = () => {
      .num {
        margin-left: auto;
        color: #646a73;
-        font-family: PingFang SC;
+        font-family: AlibabaPuHuiTi;
        font-size: 14px;
        font-style: normal;
        font-weight: 400;
@ -1235,7 +1235,7 @@ const mousedownDrag = () => {
    background: #e1eaff;
    position: relative;
    padding: 9px 0 9px 40px;
-    font-family: PingFang SC;
+    font-family: AlibabaPuHuiTi;
    font-size: 14px;
    font-weight: 400;

--- a/core/core-frontend/src/views/visualized/data/dataset/form/CalcFieldEdit.vue
+++ b/core/core-frontend/src/views/visualized/data/dataset/form/CalcFieldEdit.vue
@ -498,7 +498,7 @@ initFunction()
      & > :nth-child(2) {
        margin: 0 -0.67px 0 2px;
        color: #f54a45;
-        font-family: PingFang SC;
+        font-family: AlibabaPuHuiTi;
        font-size: 14px;
        font-style: normal;
        font-weight: 400;
--- a/core/core-frontend/src/views/visualized/data/dataset/form/CreatDsGroup.vue
+++ b/core/core-frontend/src/views/visualized/data/dataset/form/CreatDsGroup.vue
@ -409,7 +409,7 @@ const emits = defineEmits(['finish'])
      margin-bottom: 8px;
    }
    span {
-      font-family: PingFang SC;
+      font-family: AlibabaPuHuiTi;
      font-size: 14px;
      font-weight: 400;
      line-height: 22px;
--- a/core/core-frontend/src/views/visualized/data/dataset/form/DatasetUnion.vue
+++ b/core/core-frontend/src/views/visualized/data/dataset/form/DatasetUnion.vue
@ -952,7 +952,7 @@ const emits = defineEmits(['addComplete', 'joinEditor', 'updateAllfields'])
 .union-item-drawer {
  .ed-drawer__header {
    height: 82px;
-    font-family: 'PingFang SC';
+    font-family: 'AlibabaPuHuiTi';

    .ed-drawer__close-btn {
      top: 26px;
@ -983,7 +983,7 @@ const emits = defineEmits(['addComplete', 'joinEditor', 'updateAllfields'])
  width: 100%;
  border: 1px solid #dee0e3;
  border-radius: 4px;
-  font-family: PingFang SC;
+  font-family: AlibabaPuHuiTi;
  font-size: 14px;
  font-weight: 400;
  color: #1f2329;
@ -1103,7 +1103,7 @@ const emits = defineEmits(['addComplete', 'joinEditor', 'updateAllfields'])
  }

  p {
-    font-family: 'PingFang SC';
+    font-family: 'AlibabaPuHuiTi';
    font-style: normal;
    font-weight: 400;
    font-size: 14px;
--- a/core/core-frontend/src/views/visualized/data/dataset/form/UnionEdit.vue
+++ b/core/core-frontend/src/views/visualized/data/dataset/form/UnionEdit.vue
@ -159,7 +159,7 @@ defineExpose({
  width: 50%;

  & > p {
-    font-family: PingFang SC;
+    font-family: AlibabaPuHuiTi;
    font-size: 14px;
    font-weight: 500;
    margin: 0;
--- a/core/core-frontend/src/views/visualized/data/dataset/form/UnionFieldList.vue
+++ b/core/core-frontend/src/views/visualized/data/dataset/form/UnionFieldList.vue
@ -145,7 +145,7 @@ watch(
 .field-block-style {
  height: 100%;
  width: 100%;
-  font-family: PingFang SC;
+  font-family: AlibabaPuHuiTi;
  .field-block-body {
    height: 327px;
    overflow-y: auto;
--- a/core/core-frontend/src/views/visualized/data/dataset/form/UnionItemEdit.vue
+++ b/core/core-frontend/src/views/visualized/data/dataset/form/UnionItemEdit.vue
@ -171,7 +171,7 @@ init()
 <style lang="less" scoped>
 .union-container {
  height: 275px;
-  font-family: PingFang SC;
+  font-family: AlibabaPuHuiTi;
 }
 .union-header {
  display: flex;
@ -217,7 +217,7 @@ init()
  display: flex;
  align-items: center;
  font-size: 14px;
-  font-family: 'PingFang SC';
+  font-family: 'AlibabaPuHuiTi';
  font-style: normal;
  font-weight: 400;
  margin: 20px 0 8px 0;
--- a/core/core-frontend/src/views/visualized/data/dataset/form/index.vue
+++ b/core/core-frontend/src/views/visualized/data/dataset/form/index.vue
@ -1872,7 +1872,7 @@ const getDsIconName = data => {

    .name {
      color: #fff;
-      font-family: PingFang SC;
+      font-family: AlibabaPuHuiTi;
      font-size: 16px;
      font-weight: 400;
      display: flex;
@ -1968,7 +1968,7 @@ const getDsIconName = data => {
      width: 240px;
      padding-bottom: 16px;

-      font-family: PingFang SC;
+      font-family: AlibabaPuHuiTi;
      border-right: 1px solid rgba(31, 35, 41, 0.15);

      .select-ds {
@ -2041,7 +2041,7 @@ const getDsIconName = data => {
    .drag-right {
      height: calc(100vh - 56px);
      .sql-result {
-        font-family: PingFang SC;
+        font-family: AlibabaPuHuiTi;
        font-size: 14px;
        overflow-y: auto;
        box-sizing: border-box;
@ -2167,7 +2167,7 @@ const getDsIconName = data => {
                margin: 1px;
                top: 1px;
                height: 49px;
-                font-family: 'PingFang SC';
+                font-family: 'AlibabaPuHuiTi';
                font-style: normal;
                font-weight: 500;
                font-size: 14px;
--- a/core/core-frontend/src/views/visualized/data/dataset/index.vue
+++ b/core/core-frontend/src/views/visualized/data/dataset/index.vue
@ -760,7 +760,7 @@ const getMenuList = (val: boolean) => {
        width: 100%;
        display: flex;
        align-items: center;
-        font-family: PingFang SC;
+        font-family: AlibabaPuHuiTi;
        font-size: 16px;
        font-weight: 500;

@ -806,7 +806,7 @@ const getMenuList = (val: boolean) => {

    .preview-num {
      color: var(--deTextSecondary, #606266);
-      font-family: PingFang SC;
+      font-family: AlibabaPuHuiTi;
      font-size: 14px;
      font-weight: 400;
      line-height: 22px;
--- a/core/core-frontend/src/views/visualized/data/datasource/BaseInfoContent.vue
+++ b/core/core-frontend/src/views/visualized/data/datasource/BaseInfoContent.vue
@ -36,7 +36,7 @@ defineExpose({

  .update-records-time {
    color: #646a73;
-    font-family: PingFang SC;
+    font-family: AlibabaPuHuiTi;
    font-size: 14px;
    font-style: normal;
    font-weight: 400;
@ -52,7 +52,7 @@ defineExpose({

  .name {
    color: #1f2329;
-    font-family: PingFang SC;
+    font-family: AlibabaPuHuiTi;
    font-size: 16px;
    font-style: normal;
    font-weight: 500;
--- a/core/core-frontend/src/views/visualized/data/datasource/BaseInfoItem.vue
+++ b/core/core-frontend/src/views/visualized/data/datasource/BaseInfoItem.vue
@ -17,7 +17,7 @@ defineProps({
 <style lang="less">
 .base-info-item {
  margin-top: 16px;
-  font-family: PingFang SC;
+  font-family: AlibabaPuHuiTi;
  font-size: 14px;
  font-style: normal;
  font-weight: 400;
--- a/core/core-frontend/src/views/visualized/data/datasource/ExcelInfo.vue
+++ b/core/core-frontend/src/views/visualized/data/datasource/ExcelInfo.vue
@ -42,7 +42,7 @@ const del = () => {
  }

  .info {
-    font-family: PingFang SC;
+    font-family: AlibabaPuHuiTi;
    font-style: normal;
    font-weight: 400;
    width: 80%;
--- a/core/core-frontend/src/views/visualized/data/datasource/FinishPage.vue
+++ b/core/core-frontend/src/views/visualized/data/datasource/FinishPage.vue
@ -87,7 +87,7 @@ const handleChange = (val: boolean) => {
    flex-direction: column;
    align-items: center;
    padding-top: 83px;
-    font-family: PingFang SC;
+    font-family: AlibabaPuHuiTi;
    font-style: normal;
    font-weight: 400;

@ -136,7 +136,7 @@ const handleChange = (val: boolean) => {
        }

        .info {
-          font-family: PingFang SC;
+          font-family: AlibabaPuHuiTi;
          font-style: normal;
          font-weight: 400;
          .name {
--- a/core/core-frontend/src/views/visualized/data/datasource/form/ApiHttpRequestDraw.vue
+++ b/core/core-frontend/src/views/visualized/data/datasource/form/ApiHttpRequestDraw.vue
@ -739,7 +739,7 @@ defineExpose({
    cursor: pointer;
    .name {
      color: #1f2329;
-      font-family: PingFang SC;
+      font-family: AlibabaPuHuiTi;
      font-size: 16px;
      font-style: normal;
      font-weight: 500;
--- a/core/core-frontend/src/views/visualized/data/datasource/form/ApiHttpRequestForm.vue
+++ b/core/core-frontend/src/views/visualized/data/datasource/form/ApiHttpRequestForm.vue
@ -213,7 +213,7 @@ const emits = defineEmits(['changeId'])
    min-height: 200px;

    :deep(.ed-tabs__item) {
-      font-family: PingFang SC;
+      font-family: AlibabaPuHuiTi;
      font-size: 14px;
      font-style: normal;
      font-weight: 400;
--- a/core/core-frontend/src/views/visualized/data/datasource/form/CreatDsGroup.vue
+++ b/core/core-frontend/src/views/visualized/data/datasource/form/CreatDsGroup.vue
@ -432,7 +432,7 @@ const emits = defineEmits(['finish', 'handleShowFinishPage'])
      margin-bottom: 8px;
    }
    span {
-      font-family: PingFang SC;
+      font-family: AlibabaPuHuiTi;
      font-size: 14px;
      font-weight: 400;
      line-height: 22px;
--- a/core/core-frontend/src/views/visualized/data/datasource/form/EditorDetail.vue
+++ b/core/core-frontend/src/views/visualized/data/datasource/form/EditorDetail.vue
@ -973,7 +973,7 @@ defineExpose({
  }

  .de-expand {
-    font-family: PingFang SC;
+    font-family: AlibabaPuHuiTi;
    font-size: 14px;
    font-weight: 400;
    line-height: 22px;
@ -1024,7 +1024,7 @@ defineExpose({
      width: 100%;
      display: flex;
      align-items: center;
-      font-family: PingFang SC;
+      font-family: AlibabaPuHuiTi;
      font-size: 14px;
      font-style: normal;
      font-weight: 400;
@ -1044,7 +1044,7 @@ defineExpose({
        position: relative;
        color: #1f2329;
        font-weight: 400;
-        font-family: PingFang SC;
+        font-family: AlibabaPuHuiTi;
        font-size: 14px;
        font-style: normal;
        line-height: 22px;
@ -1096,7 +1096,7 @@ defineExpose({
  border-radius: 4px;
  margin: 0 0 16px 16px;
  padding: 16px;
-  font-family: PingFang SC;
+  font-family: AlibabaPuHuiTi;
  cursor: pointer;

  &:hover {
@ -1173,7 +1173,7 @@ defineExpose({
  }

  .tips {
-    font-family: PingFang SC;
+    font-family: AlibabaPuHuiTi;
    font-size: 14px;
    font-weight: 500;
    line-height: 22px;
--- a/core/core-frontend/src/views/visualized/data/datasource/form/ExcelDetail.vue
+++ b/core/core-frontend/src/views/visualized/data/datasource/form/ExcelDetail.vue
@ -550,7 +550,7 @@ defineExpose({

    .upload-tip {
      color: #8f959e;
-      font-family: PingFang SC;
+      font-family: AlibabaPuHuiTi;
      font-size: 14px;
      font-style: normal;
      font-weight: 400;
--- a/core/core-frontend/src/views/visualized/data/datasource/form/index.vue
+++ b/core/core-frontend/src/views/visualized/data/datasource/form/index.vue
@ -817,7 +817,7 @@ defineExpose({
      .title {
        display: flex;
        justify-content: space-between;
-        font-family: PingFang SC;
+        font-family: AlibabaPuHuiTi;
        font-size: 14px;
        font-weight: 500;
        color: var(--TextPrimary, #1f2329);
@ -872,7 +872,7 @@ defineExpose({
        width: 100%;
        padding: 16px 24px;
        color: #1f2329;
-        font-family: PingFang SC;
+        font-family: AlibabaPuHuiTi;
        font-size: 16px;
        font-style: normal;
        font-weight: 500;
--- a/core/core-frontend/src/views/visualized/data/datasource/index.vue
+++ b/core/core-frontend/src/views/visualized/data/datasource/index.vue
@ -1461,7 +1461,7 @@ const getMenuList = (val: boolean) => {
    border-radius: 4px;
    margin: 0 0 16px 16px;
    padding: 16px;
-    font-family: PingFang SC;
+    font-family: AlibabaPuHuiTi;
    .name {
      font-size: 16px;
      font-weight: 500;
@ -1523,7 +1523,7 @@ const getMenuList = (val: boolean) => {
  }

  .de-expand {
-    font-family: PingFang SC;
+    font-family: AlibabaPuHuiTi;
    font-size: 14px;
    font-weight: 400;
    line-height: 22px;
@ -1579,7 +1579,7 @@ const getMenuList = (val: boolean) => {
        width: 100%;
        display: flex;
        align-items: center;
-        font-family: PingFang SC;
+        font-family: AlibabaPuHuiTi;
        font-size: 16px;
        font-weight: 500;

@ -1705,7 +1705,7 @@ const getMenuList = (val: boolean) => {

  .table-value,
  .table-name {
-    font-family: PingFang SC;
+    font-family: AlibabaPuHuiTi;
    font-size: 14px;
    font-weight: 400;
    margin: 0;
--- a/core/core-frontend/src/views/visualized/view/panel/filter-config/index.vue
+++ b/core/core-frontend/src/views/visualized/view/panel/filter-config/index.vue
@ -359,7 +359,7 @@ const handleTabClick = () => {
      position: sticky;
      top: 0;
      height: 32px;
-      font-family: 'PingFang SC';
+      font-family: 'AlibabaPuHuiTi';
      font-style: normal;
      font-weight: 500;
      font-size: 14px;
--- a/core/core-frontend/src/views/workbranch/JumpLinkageBack.vue
+++ b/core/core-frontend/src/views/workbranch/JumpLinkageBack.vue
@ -258,7 +258,7 @@ const handleCheckedFieldsChange = (value: string[]) => {

 <style lang="less">
 .jump-linkage {
-  font-family: PingFang SC;
+  font-family: AlibabaPuHuiTi;
  font-size: 14px;

  .chart-dataset-name {
--- a/core/core-frontend/src/views/workbranch/TemplateBranchItem.vue
+++ b/core/core-frontend/src/views/workbranch/TemplateBranchItem.vue
@ -127,7 +127,7 @@ const templateInnerPreview = e => {
    }
    .name {
      color: #1f2329;
-      font-family: PingFang SC;
+      font-family: AlibabaPuHuiTi;
      font-size: 14px;
      font-style: normal;
      font-weight: 500;
--- a/core/core-frontend/src/views/workbranch/index.vue
+++ b/core/core-frontend/src/views/workbranch/index.vue
@ -433,7 +433,7 @@ initMarketTemplate()
        .name-role {
          margin-bottom: 4px;
          color: #1f2329;
-          font-family: PingFang SC;
+          font-family: AlibabaPuHuiTi;
          font-style: normal;
          .name {
            font-size: 16px;
@ -463,7 +463,7 @@ initMarketTemplate()
      }

      .item {
-        font-family: PingFang SC;
+        font-family: AlibabaPuHuiTi;
        font-style: normal;
        display: flex;
        flex-direction: column;
@ -500,7 +500,7 @@ initMarketTemplate()
      .label {
        color: #1f2329;
        font-feature-settings: 'clig' off, 'liga' off;
-        font-family: PingFang SC;
+        font-family: AlibabaPuHuiTi;
        font-size: 16px;
        font-style: normal;
        font-weight: 500;
@ -534,7 +534,7 @@ initMarketTemplate()

          .name {
            color: #1f2329;
-            font-family: PingFang SC;
+            font-family: AlibabaPuHuiTi;
            font-size: 14px;
            font-style: normal;
            font-weight: 400;
@ -592,7 +592,7 @@ initMarketTemplate()
      .label {
        color: #1f2329;
        font-feature-settings: 'clig' off, 'liga' off;
-        font-family: PingFang SC;
+        font-family: AlibabaPuHuiTi;
        font-size: 16px;
        font-style: normal;
        font-weight: 500;
@ -637,7 +637,7 @@ initMarketTemplate()
          display: inline-flex;
          align-items: center;
          padding: 0 8px;
-          font-family: PingFang SC;
+          font-family: AlibabaPuHuiTi;
          font-size: 12px;
          font-style: normal;
          font-weight: 400;