Merge branch 'main_dev' into 'main'

Main dev See merge request yunteng/thingskit-scada!251

Merge branch 'main_dev' into 'main'
Main dev See merge request yunteng/thingskit-scada!251
xp.Huang
2 parents 11052185 ef1ff72c
Showing 2 changed files with 72 additions and 72 deletions
README.md
package.json
--- a/README.md
View file @6daa8a6
+++ b/README.md
View file @6daa8a6
@@ -73,55 +73,55 @@
 // Sidebar.Engine.js
 // src/main/webapp/js/diagramly/sidebar/thingskit/Sidebar-Engine.js
 (function () {
-	// Adds Atlassian shapes
-	// conduit 管道
-	Sidebar.prototype.addConduitPalette = function () {
+  // Adds Atlassian shapes
+  // conduit 管道
+  Sidebar.prototype.addConduitPalette = function () {
     // 组件归类 决定数据面板中组件有哪些操作面板
-		const { COMPONENT_TYPE } = this.enumCellBasicAttribute
-		const { DEFAULT } = this.enumComponentType
-    
+    const { COMPONENT_TYPE } = this.enumCellBasicAttribute
+    const { DEFAULT } = this.enumComponentType
+
     // 图形库信息
-		const gn = 'mxgraph.engine';// 图形库id 后续注册时需要使用
-		const dt = 'engine'; //图 形库id 后续注册时需要使用
-		const label = '发动机'
-    
-		const width = 66;
-		const height = 74;
-		const staticPath = `${Proxy_Prefix}/img/lib/thingskit/`
-		const prefix = 'image;image=img/lib/thingskit/'
-		const defaultStyle = ';imageAspect=0;'
-		this.setCurrentSearchEntryLibrary(dt);
-
-		// !!!自定义属性 当前设置该组件库为默认类型
-		const cellAttribute = {
-			[COMPONENT_TYPE]: DEFAULT
-		}
-
-		const graphPathLib = [
-			{ name: '3-D 发动机.svg', path: 'engine/3-D 发动机.svg' },
-		]
-
-		const lib = graphPathLib.map(item => {
-			item.staticPath = staticPath + item.path
-			return item
-		})
-
-		const fns = graphPathLib.map(item => {
-			return this.addEntry(this.getTagsForStencil(gn, item.name, dt).join(' '), mxUtils.bind(this, function () {
-				const cell = new mxCell('', new mxGeometry(0, 0, width, height), `${prefix}${item.path}${defaultStyle}`);
-				cell.setVertex(true)
-				this.setCellAttributes(cell, cellAttribute)
-				return this.createVertexTemplateFromCells([cell], cell.geometry.width, cell.geometry.height, item.name);
-			}));
-		})
-
-		this.setVariableImageLib(dt, label, lib)
-
-		this.addPaletteFunctions(dt, label, false, fns);
-
-		this.setCurrentSearchEntryLibrary();
-	};
-})();
+    const gn = 'mxgraph.engine'// 图形库id 后续注册时需要使用
+    const dt = 'engine' // 图 形库id 后续注册时需要使用
+    const label = '发动机'
+
+    const width = 66
+    const height = 74
+    const staticPath = `${Proxy_Prefix}/img/lib/thingskit/`
+    const prefix = 'image;image=img/lib/thingskit/'
+    const defaultStyle = ';imageAspect=0;'
+    this.setCurrentSearchEntryLibrary(dt)
+
+    // !!!自定义属性 当前设置该组件库为默认类型
+    const cellAttribute = {
+      [COMPONENT_TYPE]: DEFAULT
+    }
+
+    const graphPathLib = [
+      { name: '3-D 发动机.svg', path: 'engine/3-D 发动机.svg' },
+    ]
+
+    const lib = graphPathLib.map((item) => {
+      item.staticPath = staticPath + item.path
+      return item
+    })
+
+    const fns = graphPathLib.map((item) => {
+      return this.addEntry(this.getTagsForStencil(gn, item.name, dt).join(' '), mxUtils.bind(this, function () {
+        const cell = new mxCell('', new mxGeometry(0, 0, width, height), `${prefix}${item.path}${defaultStyle}`)
+        cell.setVertex(true)
+        this.setCellAttributes(cell, cellAttribute)
+        return this.createVertexTemplateFromCells([cell], cell.geometry.width, cell.geometry.height, item.name)
+      }))
+    })
+
+    this.setVariableImageLib(dt, label, lib)
+
+    this.addPaletteFunctions(dt, label, false, fns)
+
+    this.setCurrentSearchEntryLibrary()
+  }
+})()
 ```
@@ -131,7 +131,7 @@
 // src/main/webapp/js/diagramly/Devel.js
 // Devel.js
 // 将Sidebar-Engine.js引入
-mxscript(drawDevUrl + 'js/diagramly/sidebar/thingskit/Sidebar-Engine.js');
+mxscript(`${drawDevUrl}js/diagramly/sidebar/thingskit/Sidebar-Engine.js`)
 ```
 >3. 将元件库加入到需要打包的文件队列中
@@ -195,27 +195,27 @@ Sidebar.prototype.initPalettes = function () {
 ```js
 // Sidebar.js
 // src/main/webapp/js/diagramly/sidebar/Sidebar.js
-	Sidebar.prototype.init = function () {
-    const { LINE_CHART_EXPAND, BAR_CHART_EXPAND, DASHBOARD_CHART_EXPAND, DYNAMIC_EFFECT, DATA_SOURCE, VAR_IMAGE, INTERACTION, VIDEO: VIDEO_PANEL, SWITCH_STATE_SETTING, ONLY_SINGLE_EVENT, RUNNING_AND_STOP } = this.enumPermissionPanel
-    const { LINE, LINE_CHART, REAL_TIME, TITLE, VARIABLE, DEFAULT, BAR_CHART, VIDEO, SWITCH, PARAMS_SETTING_BUTTON, DASHBOARD_CHART, IMAGE } = this.enumComponentType
-    
-    // 水流类型元件拥有水流效果面板与数据东西面板
-		this.setComponentPermission(LINE, [RUNNING_AND_STOP, DYNAMIC_EFFECT])
-    // 默认类型的元件拥有数据动效面板
-		this.setComponentPermission(DEFAULT, [DYNAMIC_EFFECT])
-		this.setComponentPermission(REAL_TIME, [DYNAMIC_EFFECT])
-    // 标题类型的元件拥有数据交互面板与动态数据面板
-		this.setComponentPermission(TITLE, [INTERACTION, DYNAMIC_EFFECT])
-		this.setComponentPermission(VAR_IMAGE, [INTERACTION, VAR_IMAGE])
-		this.setComponentPermission(VARIABLE, [DATA_SOURCE, INTERACTION, DYNAMIC_EFFECT])
-		this.setComponentPermission(BAR_CHART, [DATA_SOURCE, BAR_CHART_EXPAND])
-		this.setComponentPermission(LINE_CHART, [DATA_SOURCE, LINE_CHART_EXPAND])
-		this.setComponentPermission(DASHBOARD_CHART, [DATA_SOURCE, DASHBOARD_CHART_EXPAND])
-		this.setComponentPermission(VIDEO, [VIDEO_PANEL])
-		this.setComponentPermission(SWITCH, [DATA_SOURCE, SWITCH_STATE_SETTING])
-		this.setComponentPermission(PARAMS_SETTING_BUTTON, [DATA_SOURCE, ONLY_SINGLE_EVENT])
-		this.setComponentPermission(IMAGE, [DATA_SOURCE])
-  }
+Sidebar.prototype.init = function () {
+  const { LINE_CHART_EXPAND, BAR_CHART_EXPAND, DASHBOARD_CHART_EXPAND, DYNAMIC_EFFECT, DATA_SOURCE, VAR_IMAGE, INTERACTION, VIDEO: VIDEO_PANEL, SWITCH_STATE_SETTING, ONLY_SINGLE_EVENT, RUNNING_AND_STOP } = this.enumPermissionPanel
+  const { LINE, LINE_CHART, REAL_TIME, TITLE, VARIABLE, DEFAULT, BAR_CHART, VIDEO, SWITCH, PARAMS_SETTING_BUTTON, DASHBOARD_CHART, IMAGE } = this.enumComponentType
+
+  // 水流类型元件拥有水流效果面板与数据东西面板
+  this.setComponentPermission(LINE, [RUNNING_AND_STOP, DYNAMIC_EFFECT])
+  // 默认类型的元件拥有数据动效面板
+  this.setComponentPermission(DEFAULT, [DYNAMIC_EFFECT])
+  this.setComponentPermission(REAL_TIME, [DYNAMIC_EFFECT])
+  // 标题类型的元件拥有数据交互面板与动态数据面板
+  this.setComponentPermission(TITLE, [INTERACTION, DYNAMIC_EFFECT])
+  this.setComponentPermission(VAR_IMAGE, [INTERACTION, VAR_IMAGE])
+  this.setComponentPermission(VARIABLE, [DATA_SOURCE, INTERACTION, DYNAMIC_EFFECT])
+  this.setComponentPermission(BAR_CHART, [DATA_SOURCE, BAR_CHART_EXPAND])
+  this.setComponentPermission(LINE_CHART, [DATA_SOURCE, LINE_CHART_EXPAND])
+  this.setComponentPermission(DASHBOARD_CHART, [DATA_SOURCE, DASHBOARD_CHART_EXPAND])
+  this.setComponentPermission(VIDEO, [VIDEO_PANEL])
+  this.setComponentPermission(SWITCH, [DATA_SOURCE, SWITCH_STATE_SETTING])
+  this.setComponentPermission(PARAMS_SETTING_BUTTON, [DATA_SOURCE, ONLY_SINGLE_EVENT])
+  this.setComponentPermission(IMAGE, [DATA_SOURCE])
+}
 ```
@@ -483,7 +483,7 @@ function copyFile() {}
 // 2.编译文件
 function complieFormat() {}
 // 3.引入的文件增加版本号(用于打包部署后服务器上文件不更新)
-function generatoreVersion(){}
+function generatoreVersion() {}
 // 4.构建war包
 async function buildWar() {}
 // 5.复制需要上传到oss服务器中的文件
@@ -546,4 +546,4 @@ npm build
    ![image-20230106144551477](https://static.thingskit.com/iotdocs/img/image-20230106144551477.png)
-3. 组态启动后的端口因与后台管理端的端口保持一致。
+3. 组态启动后的端口因与后台管理端的端口保持一致。
--- a/package.json
View file @6daa8a6
+++ b/package.json
View file @6daa8a6
@@ -50,7 +50,7 @@
     "@vitejs/plugin-vue": "^4.1.0",
     "@vitejs/plugin-vue-jsx": "^3.0.1",
     "@wry-smile/eslint-config-vue": "^0.1.15",
-    "@wry-smile/vite-plugin-global-variable": "^1.0.2",
+    "@wry-smile/vite-plugin-global-variable": "1.0.2",
     "eslint": "^8.42.0",
     "husky": "^8.0.3",
     "less": "^4.2.0",