Merge branch 'main_dev' of http://git.yunteng.com/yunteng/thingskit-front into fix/DEFECT-1384

@@ -120,6 +120,7 @@
     totals: RecordType[];
     totals: RecordType[];
     tooltips: RecordType[];
     tooltips: RecordType[];
     todayTotals: RecordType[];
     todayTotals: RecordType[];
+    withUnit?: boolean;
   }
   }
 
 
   defineProps<{
   defineProps<{
@@ -190,6 +191,7 @@
 
 
     const messageTotal: StatisticalItemType = {
     const messageTotal: StatisticalItemType = {
       images: msgPicture,
       images: msgPicture,
+      withUnit: true,
       totals: [
       totals: [
         { label: '消息数', value: messageInfo?.messageCount },
         { label: '消息数', value: messageInfo?.messageCount },
         { label: '消息点数', value: messageInfo?.dataPointsCount },
         { label: '消息点数', value: messageInfo?.dataPointsCount },

@@ -8,13 +8,14 @@
     label: string;
     label: string;
   }
   }
 
 
-  withDefaults(
+  const props = withDefaults(
     defineProps<{
     defineProps<{
       value?: {
       value?: {
         images: string;
         images: string;
         totals: RecordType[];
         totals: RecordType[];
         tooltips: RecordType[];
         tooltips: RecordType[];
         todayTotals: RecordType[];
         todayTotals: RecordType[];
+        withUnit?: boolean;
       };
       };
     }>(),
     }>(),
     {
     {
@@ -26,6 +27,17 @@
       }),
       }),
     }
     }
   );
   );
+
+  const getThresholdValue = (value: number) => {
+    const record = { value, unit: null };
+
+    if (!props.value?.withUnit) return record;
+
+    if (value > 10 ** 6) return { unit: 'M', value: value / 10 ** 6 };
+    if (value > 10 ** 3) return { unit: 'K', value: value / 10 ** 4 };
+
+    return record;
+  };
 </script>
 </script>
 
 
 <template>
 <template>
@@ -41,7 +53,8 @@
             :style="{ width: `${100 / value.totals.length}%` }"
             :style="{ width: `${100 / value.totals.length}%` }"
           >
           >
             <div class="font-bold text-2xl">
             <div class="font-bold text-2xl">
-              <CountTo :end-val="item.value ?? 0" class="break-all" />
+              <CountTo :end-val="getThresholdValue(item.value).value ?? 0" class="break-all" />
+              <span>{{ getThresholdValue(item.value).unit || '' }}</span>
             </div>
             </div>
             <div class="text-gray-600">{{ item.label }}</div>
             <div class="text-gray-600">{{ item.label }}</div>
           </div>
           </div>

@@ -176,8 +176,17 @@ export const formSchema: BFormSchema[] = [
     field: 'name',
     field: 'name',
     label: '报表名称',
     label: '报表名称',
     colProps: { span: 24 },
     colProps: { span: 24 },
-    required: true,
     component: 'Input',
     component: 'Input',
+    rules: [
+      { required: true, message: '请输入报表名称' },
+      {
+        validator(_rule, value, _callback) {
+          const reg = /[\/\\]/;
+          if (reg.test(value)) return Promise.reject('报表名称中存在斜杠或反斜杠');
+          return Promise.resolve();
+        },
+      },
+    ],
     componentProps: {
     componentProps: {
       maxLength: 64,
       maxLength: 64,
       placeholder: '请输入报表名称',
       placeholder: '请输入报表名称',

@@ -61,7 +61,7 @@
     return isBoolean(componetDesign) ? componetDesign : true;
     return isBoolean(componetDesign) ? componetDesign : true;
   });
   });
 
 
-  const setDataSourceFormsEl = (uuid: string, instance: PublicFormInstaceType, index) => {
+  const setDataSourceFormsEl = (uuid: string, instance: PublicFormInstaceType, index: number) => {
     const findIndex = unref(props.dataSource).findIndex((item) => item.uuid === uuid);
     const findIndex = unref(props.dataSource).findIndex((item) => item.uuid === uuid);
     if (~findIndex) {
     if (~findIndex) {
       dataSourceFormsEl.value[index] = { uuid, instance };
       dataSourceFormsEl.value[index] = { uuid, instance };

@@ -49,6 +49,8 @@
 
 
   const dataSourceFormSpinning = ref(false);
   const dataSourceFormSpinning = ref(false);
 
 
+  let firstEnter = true;
+
   const selectWidgetKeys = ref<SelectedWidgetKeys>({
   const selectWidgetKeys = ref<SelectedWidgetKeys>({
     componentKey: TextComponent1Config.key,
     componentKey: TextComponent1Config.key,
     categoryKey: PackagesCategoryEnum.TEXT,
     categoryKey: PackagesCategoryEnum.TEXT,
@@ -69,7 +71,7 @@
     } as DataSourceType;
     } as DataSourceType;
   };
   };
 
 
-  const dataSource = ref<DataSourceType[]>(Array.from({ length: 1 }, () => genNewDataSourceItem()));
+  const dataSource = ref<DataSourceType[]>([]);
 
 
   const currentMode = ref<DataActionModeEnum>(DataActionModeEnum.CREATE);
   const currentMode = ref<DataActionModeEnum>(DataActionModeEnum.CREATE);
 
 
@@ -83,6 +85,7 @@
       const { mode, record } = params;
       const { mode, record } = params;
       currentMode.value = mode;
       currentMode.value = mode;
       currentRecord.value = record;
       currentRecord.value = record;
+      firstEnter = false;
       if (mode === DataActionModeEnum.UPDATE) {
       if (mode === DataActionModeEnum.UPDATE) {
         const config = useGetComponentConfig(record.frontId);
         const config = useGetComponentConfig(record.frontId);
         if (!config) return;
         if (!config) return;
@@ -128,12 +131,17 @@
         const category = useGetCategoryByComponentKey(value);
         const category = useGetCategoryByComponentKey(value);
         const needReset =
         const needReset =
           [oldCategory, category].some((item) => item === PackagesCategoryEnum.CONTROL) &&
           [oldCategory, category].some((item) => item === PackagesCategoryEnum.CONTROL) &&
-          oldCategory !== category;
+          oldCategory !== category &&
+          firstEnter;
+
+        firstEnter = true;
+
         dataSource.value = unref(dataSource).map((item) => ({
         dataSource.value = unref(dataSource).map((item) => ({
           ...item,
           ...item,
           ...(needReset ? { attribute: null } : {}),
           ...(needReset ? { attribute: null } : {}),
           componentInfo: { ...unref(getComponentConfig).persetOption, ...item.componentInfo },
           componentInfo: { ...unref(getComponentConfig).persetOption, ...item.componentInfo },
         }));
         }));
+
         if ((window as any).requestIdleCallback as unknown as boolean) {
         if ((window as any).requestIdleCallback as unknown as boolean) {
           (window as any).requestIdleCallback(
           (window as any).requestIdleCallback(
             () => {
             () => {

@@ -57,7 +57,6 @@
       offset: item.value,
       offset: item.value,
       color: item.color,
       color: item.color,
     }));
     }));
-    console.log(array, colorList);
     return colorList as any;
     return colorList as any;
   };
   };
 
 

@@ -18,6 +18,7 @@
   import { DataComponentRecord } from '/@/api/dataBoard/model';
   import { DataComponentRecord } from '/@/api/dataBoard/model';
   import { computed } from 'vue';
   import { computed } from 'vue';
   import { useGetComponentConfig } from '../../../packages/hook/useGetComponetConfig';
   import { useGetComponentConfig } from '../../../packages/hook/useGetComponetConfig';
+  import { isBoolean } from '/@/utils/is';
 
 
   const props = defineProps<{
   const props = defineProps<{
     sourceInfo: WidgetDataType;
     sourceInfo: WidgetDataType;
@@ -83,7 +84,8 @@
   const hasTrendQueryIcon = computed(() => {
   const hasTrendQueryIcon = computed(() => {
     const frontId = props.sourceInfo.frontId;
     const frontId = props.sourceInfo.frontId;
     const config = useGetComponentConfig(frontId);
     const config = useGetComponentConfig(frontId);
-    return !!config.persetOption?.trendQuery;
+    const flag = config.persetOption?.trendQuery;
+    return isBoolean(flag) ? flag : true;
   });
   });
 
 
   async function handleCopy() {
   async function handleCopy() {