cds-fontend-2025.V1/src/components/advanced/table-column-setting.vue

@@ -21,7 +21,7 @@ const columns = defineModel<NaiveUI.TableColumnCheck[]>('columns', {
         {{ $t('common.columnSetting') }}
       </NButton>
     </template>
-    <VueDraggable v-model="columns" :animation="150" filter=".none_draggable" class="table-column-setting-list">
+    <VueDraggable v-model="columns" :animation="150" filter=".none_draggable">
       <div v-for="item in columns" :key="item.key" class="h-36px flex-y-center rd-4px hover:(bg-primary bg-opacity-20)">
         <SvgIcon local-icon="drag" class="mr-8px h-full cursor-move text-icon"/>
         <NCheckbox v-model:checked="item.checked" class="none_draggable flex-1">
@@ -35,15 +35,4 @@ const columns = defineModel<NaiveUI.TableColumnCheck[]>('columns', {
   </NPopover>
 </template>
 
-<style scoped lang="scss">
+<style scoped></style>
-.table-column-setting-list {
-  max-height: 60vh;
-  overflow-y: auto;
-  scrollbar-width: none;
-  -ms-overflow-style: none;
-}
-
-.table-column-setting-list::-webkit-scrollbar {
-  display: none;
-}
-</style>

cds-fontend-2025.V1/src/components/custom/dict-tag.vue

@@ -1,7 +1,6 @@
 <script setup lang="ts">
 import { computed, useAttrs } from 'vue';
 import type { TagProps } from 'naive-ui';
-import { jsonClone } from '@sa/utils';
 import { useDict } from '@/hooks/business/dict';
 import { isNotNull } from '@/utils/common';
 import { $t } from '@/locales';
@@ -29,7 +28,7 @@ const { transformDictData } = useDict(props.dictCode, props.immediate);
 
 const dictTagData = computed<Api.System.DictData[]>(() => {
   if (props.dictData) {
-    const dictData = jsonClone(props.dictData);
+    const dictData = props.dictData;
     if (dictData.dictLabel?.startsWith(`dict.${dictData.dictType}.`)) {
       dictData.dictLabel = $t(dictData.dictLabel as App.I18n.I18nKey);
     }

cds-fontend-2025.V1/src/components/custom/json-preview.vue

@@ -2,7 +2,6 @@
 import { computed } from 'vue';
 import hljs from 'highlight.js/lib/core';
 import json from 'highlight.js/lib/languages/json';
-import { twMerge } from 'tailwind-merge';
 
 hljs.registerLanguage('json', json);
 
@@ -11,19 +10,15 @@ defineOptions({
 });
 
 interface Props {
-  class?: string;
   code?: string;
   showLineNumbers?: boolean;
 }
 
 const props = withDefaults(defineProps<Props>(), {
-  class: '',
   code: '',
   showLineNumbers: false
 });
 
-const DEFAULT_CLASS = 'max-h-500px';
-
 /** 格式化JSON数据 */
 const jsonData = computed<string>(() => {
   if (!props.code) return '';
@@ -38,9 +33,9 @@ const jsonData = computed<string>(() => {
 </script>
 
 <template>
-  <NScrollbar :class="twMerge(DEFAULT_CLASS, props.class)">
+  <div class="json-preview">
-    <NCode :code="jsonData" :hljs="hljs" language="json" :show-line-numbers="showLineNumbers" :word-wrap="true" />
+    <NCode :code="jsonData" :hljs="hljs" language="json" :show-line-numbers="showLineNumbers" />
-  </NScrollbar>
+  </div>
 </template>
 
 <style lang="scss">
@@ -49,4 +44,18 @@ html[class='dark'] {
     background-color: #7c7777;
   }
 }
+.json-preview {
+  width: 100%;
+  max-height: 500px;
+  overflow-y: auto;
+  @include scrollbar();
+  .empty-data {
+    display: flex;
+    justify-content: center;
+    align-items: center;
+    height: 100%;
+    color: #999;
+    font-size: 14px;
+  }
+}
 </style>