Merge branch 'perf/main_dev' of http://git.yunteng.com/yunteng/thingskit-scada into fix/zfl

loveumiko
2 parents b68a8c5d cd1291c3
Showing 8 changed files with 49 additions and 38 deletions
index.html
public/webapp/js/diagramly/App.js
public/webapp/js/diagramly/Editor.js
public/webapp/js/diagramly/EditorUi.js
src/components/Form/src/components/ApiSelect.vue
src/core/Library/packages/Basic/DigitalClock/index.vue
src/core/Library/packages/Chart/Line/index.config.ts
src/core/Library/packages/Chart/Line/index.vue
--- a/index.html
View file @1a51877
+++ b/index.html
View file @1a51877
@@ -99,7 +99,7 @@
         .first-text-animation-container svg {
             display: block;
-            font-size: 120px;
+            font-size: 80px;
             /* width: 100vw;
             height: 100vh; */
@@ -271,9 +271,9 @@
 <body class="geEditor">
     <div id="geInfo">
         <div class="first-text-animation-container">
-            <svg id="first-text-animation" viewBox="0 0 960 300">
+            <svg id="first-text-animation" viewBox="0 0 960 100">
                 <symbol id="first-text-animation-text">
-                    <text text-anchor="middle" x="50%" y="80%"></text>
+                    <text text-anchor="middle" x="50%" y="80%">Scada</text>
                 </symbol>
                 <g class="g-ants">
                     <use xlink:href="#first-text-animation-text" class="text-copy"></use>
--- a/public/webapp/js/diagramly/App.js
View file @1a51877
+++ b/public/webapp/js/diagramly/App.js
View file @1a51877
@@ -2069,11 +2069,18 @@ App.prototype.updateDocumentTitle = function () {
     if (file != null) {
       const filename = (file.getTitle() != null) ? file.getTitle() : this.defaultFilename
-      title = `${filename} - ${title}`
+      title = `${filename}`
     }
     if (document.title != title)
       document.title = title
+  } else {
+    // TODO Thingskit 设置预览模式title
+    const file = this.getCurrentFile()
+    if (!file) return
+    const filename = (file.getTitle() != null) ? file.getTitle() : this.defaultFilename
+    if (document.title != filename)
+      document.title = filename
   }
 }
--- a/public/webapp/js/diagramly/Editor.js
View file @1a51877
+++ b/public/webapp/js/diagramly/Editor.js
View file @1a51877
@@ -2057,7 +2057,10 @@
 	/**
 	 * Specifies the app name. Default is document.title.
 	 */
-	Editor.prototype.appName = 'draw.io';
+	// Editor.prototype.appName = 'draw.io';
+
+	// TODO Thingskit 隐藏title后缀
+	Editor.prototype.appName = '';
 	/**
 	 * TODO 创建文件时可选类型
--- a/public/webapp/js/diagramly/EditorUi.js
View file @1a51877
+++ b/public/webapp/js/diagramly/EditorUi.js
View file @1a51877
@@ -7821,6 +7821,7 @@
 	 */
 	EditorUi.prototype.importFile = function (data, mimeType, dx, dy, w, h, filename,
 		done, file, crop, ignoreEmbeddedXml, evt) {
+		// TODO Thingskit 拖拽引入文件
 		crop = (crop != null) ? crop : true;
 		var async = false;
 		var cells = null;
@@ -12483,7 +12484,7 @@
 				this.hoverIcons.update(graph.view.getState(graph.getSelectionCell()));
 			}
 		}
-		
+
 		// TODO ThingsKit 移除复制来源cell的无用属性(COPY_SOURCE属性)
 		this.editor.removeSourceCellsUnlessAttrubute(cells)
 		return cells;
@@ -13052,8 +13053,11 @@
 					this.defaultFilename, temp, fileHandle, desc));
 			}
 		});
-
 		if (data != null && data.length > 0) {
+			// TODO Thingskit 导入时打开本地文件不再打开新的页面与弹出提示框
+			fn()
+			return
+
 			if (currentFile == null || (!currentFile.isModified() &&
 				(mxClient.IS_CHROMEAPP || EditorUi.isElectronApp || fileHandle != null))) {
 				fn();
--- a/src/components/Form/src/components/ApiSelect.vue
View file @1a51877
+++ b/src/components/Form/src/components/ApiSelect.vue
View file @1a51877
@@ -46,17 +46,21 @@ const emitData = ref<any[]>([])
 const [state] = useRuleFormItem(props, 'value', 'change', emitData)
 const getOptions = computed(() => {
-  const { numberToString, fieldNames } = props
-  const { value: valueField = 'value' } = fieldNames
+  const { numberToString, fieldNames, aliasField } = props
+  const { value: valueField = 'value', label: labelField = 'label' } = fieldNames
   const data = unref(optionsRef).reduce((prev, next: any) => {
     if (next) {
       const value = get(next, valueField)
-      prev.push({
+      const options = {
         ...next,
         [valueField]: numberToString ? `${value}` : value,
-      } as DefaultOptionType)
+      } as DefaultOptionType
+      if (aliasField)
+        Object.assign(options, { [aliasField]: options[aliasField] || options[labelField] })
+
+      prev.push(options)
     }
     return prev
   }, [] as DefaultOptionType[])
--- a/src/core/Library/packages/Basic/DigitalClock/index.vue
View file @1a51877
+++ b/src/core/Library/packages/Basic/DigitalClock/index.vue
View file @1a51877
 <script setup lang="ts">
 import { useIntervalFn } from '@vueuse/core'
 import { ref } from 'vue'
-import { dateUtil, formatToDateTime } from '@/utils/dateUtil'
+import { dateUtil } from '@/utils/dateUtil'
 import { DateFormatEnum } from '@/enums/timeEnum'
+import type { CreateComponentType } from '@/core/Library/types'
-const date = ref<string>(formatToDateTime(Date.now()))
+defineProps<{
+  config: CreateComponentType
+}>()
+
+const getNowDate = () => `${dateUtil().format('YYYY年MM月DD日')} ${dateUtil().format(DateFormatEnum.HH_MM_SS)}`
+
+const date = ref<string>(getNowDate())
 const week = ['日', '一', '二', '三', '四', '五', '六']
 useIntervalFn(() => {
-  date.value = `${dateUtil().format(DateFormatEnum.YYYY_MM_DD)} ${dateUtil().format(DateFormatEnum.HH_MM_SS)}`
+  date.value = getNowDate()
 }, 1000)
 </script>
 <template>
-  <main class="w-full h-full flex flex-col justify-center items-center">
-    <div class="text-[18px]">
+  <main class="w-full h-full flex flex-col justify-center items-center overflow-hidden">
+    <div class="text-1em">
       {{ date.split(' ')?.[0] }} {{ `星期${week[dateUtil().day()]}` }}
     </div>
-    <div class="text-[50px] p-1">
+    <div class="p-1 text-2em">
       {{ date.split(' ')?.[1] }}
     </div>
   </main>
--- a/src/core/Library/packages/Chart/Line/index.config.ts
View file @1a51877
+++ b/src/core/Library/packages/Chart/Line/index.config.ts
View file @1a51877
@@ -25,8 +25,6 @@ export const getDefaultOption = (): EChartsOption => {
     },
     xAxis: { type: 'category' },
     yAxis: {},
-    // Declare several bar series, each will be mapped
-    // to a column of dataset.source by default.
     series: [
       { type: 'line' },
     ],
--- a/src/core/Library/packages/Chart/Line/index.vue
View file @1a51877
+++ b/src/core/Library/packages/Chart/Line/index.vue
View file @1a51877
 <script lang="ts" setup>
 import { computed, onMounted, onUnmounted, ref, unref } from 'vue'
-import type { DatasetComponentOption, ECharts, EChartsOption, SeriesOption, XAXisComponentOption } from 'echarts'
+import type { DatasetComponentOption, ECharts, EChartsOption } from 'echarts'
 import { init } from 'echarts'
 import { getDefaultOption } from './index.config'
 import type { CreateComponentType, RenderComponentExposeType } from '@/core/Library/types'
@@ -56,16 +56,11 @@ const handlerTimeSeriesData = (commandSource: CommandSource, message: Subscripti
   const { deviceName } = deviceInfo || {}
   const { ts, latestValue } = useLatestMessageValue(message, attr)
   const option = unref(chartInstance)?.getOption() as EChartsOption
-  const oldDataset = (option.dataset as DatasetComponentOption[])?.[0].source
-  // const xAxisData = ((option.xAxis as XAXisComponentOption[])?.[0] as { data: string[] }).data
-  // const seriesData = ((option.series as SeriesOption[])?.[0].data) as SeriesOption[]
-  // console.log(option)
-  // oldDataset.
-  // xAxisData.push(formatToDateTime(ts))
-  // seriesData.push({
-  //   name: attrInfo.name,
-  //   data: [],
-  // })
+  const oldDataset = (option.dataset as DatasetComponentOption[])?.[0].source as Recordable[]
+  oldDataset.push({
+    ts: formatToDateTime(ts),
+    [attr]: latestValue,
+  })
   unref(chartInstance)?.setOption({
     title: {
@@ -73,15 +68,8 @@ const handlerTimeSeriesData = (commandSource: CommandSource, message: Subscripti
     },
     dataset: {
       dimensions: ['ts', attr],
-      source: [
-        { ts, [attr]: latestValue },
-      ],
+      source: sliceData(oldDataset),
     },
-    // legend: {
-    //   data: [attrInfo.name],
-    // },
-    // xAxis: { data: sliceData(xAxisData) },
-    // series: { data: sliceData(seriesData) },
   } as EChartsOption)
 }