浏览代码

登录界面样式根据loginjson数据生成

liuwei 4 年之前
父节点
当前提交
0841cb5f58
共有 28 个文件被更改,包括 477 次插入20421 次删除
  1. 1 2
      .electron-vue/webpack.renderer.config.js
  2. 209 119
      .idea/workspace.xml
  3. 13 1
      outApp/HelloWorld-win32-x64/resources/app/.electron-vue/webpack.renderer.config.js
  4. 212 166
      outApp/HelloWorld-win32-x64/resources/app/.idea/workspace.xml
  5. 1 1
      outApp/HelloWorld-win32-x64/resources/app/package.json
  6. 1 1
      outApp/HelloWorld-win32-x64/resources/app/src/index.ejs
  7. 1 1
      outApp/HelloWorld-win32-x64/resources/app/src/renderer/components/Login.vue
  8. 0 230
      outApp/HelloWorld-win32-x64/resources/app/static/data/EnityBigScreen.json
  9. 0 4911
      outApp/HelloWorld-win32-x64/resources/app/static/data/EnityButton.json
  10. 0 8608
      outApp/HelloWorld-win32-x64/resources/app/static/data/EnityDevice.json
  11. 0 4182
      outApp/HelloWorld-win32-x64/resources/app/static/data/EnityIcon.json
  12. 0 170
      outApp/HelloWorld-win32-x64/resources/app/static/data/EnityImage.json
  13. 0 427
      outApp/HelloWorld-win32-x64/resources/app/static/data/EnityLable.json
  14. 0 35
      outApp/HelloWorld-win32-x64/resources/app/static/data/EnityLogin.json
  15. 0 24
      outApp/HelloWorld-win32-x64/resources/app/static/data/EnityMemory.json
  16. 0 106
      outApp/HelloWorld-win32-x64/resources/app/static/data/EnitySignalPreviewList.json
  17. 0 230
      outApp/HelloWorld-win32-x64/resources/app/static/data/EnitySlider.json
  18. 0 7
      outApp/HelloWorld-win32-x64/resources/app/static/data/EnitySystem.json
  19. 0 16
      outApp/HelloWorld-win32-x64/resources/app/static/data/EnityTimer.json
  20. 0 346
      outApp/HelloWorld-win32-x64/resources/app/static/data/EnityTopology.json
  21. 0 422
      outApp/HelloWorld-win32-x64/resources/app/static/data/EnityTopologyConnection.json
  22. 0 1
      outApp/HelloWorld-win32-x64/resources/app/static/data/EnityView.json
  23. 0 376
      outApp/HelloWorld-win32-x64/resources/app/static/data/EnityWindow.json
  24. 4 10
      outApp/HelloWorld-win32-x64/resources/app/yarn.lock
  25. 1 1
      package.json
  26. 1 1
      src/renderer/assets/less/login.less
  27. 29 23
      src/renderer/components/Login.vue
  28. 4 4
      static/EnityLogin.json

+ 1 - 2
.electron-vue/webpack.renderer.config.js

@@ -130,7 +130,6 @@ let rendererConfig = {
         removeAttributeQuotes: true,
         removeComments: true
       },
-      nodeModules: false
       /*nodeModules: process.env.NODE_ENV !== 'production'
         ? path.resolve(__dirname, '../node_modules')
         : false*/
@@ -147,7 +146,7 @@ let rendererConfig = {
     alias: {
       '@': path.join(__dirname, '../src/renderer'),
       'vue$': 'vue/dist/vue.esm.js',
-      /*'static':path.resolve(__dirname,'../static')*/
+      'static':path.resolve(__dirname,'../static')
     },
     extensions: ['.js', '.vue', '.json', '.css', '.node']
   },

+ 209 - 119
.idea/workspace.xml

@@ -5,35 +5,31 @@
       <change beforePath="$PROJECT_DIR$/.electron-vue/webpack.renderer.config.js" beforeDir="false" afterPath="$PROJECT_DIR$/.electron-vue/webpack.renderer.config.js" afterDir="false" />
       <change beforePath="$PROJECT_DIR$/.idea/workspace.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/workspace.xml" afterDir="false" />
       <change beforePath="$PROJECT_DIR$/outApp/HelloWorld-win32-x64/resources/app/.electron-vue/webpack.renderer.config.js" beforeDir="false" afterPath="$PROJECT_DIR$/outApp/HelloWorld-win32-x64/resources/app/.electron-vue/webpack.renderer.config.js" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/outApp/HelloWorld-win32-x64/resources/app/.gitignore" beforeDir="false" afterPath="$PROJECT_DIR$/outApp/HelloWorld-win32-x64/resources/app/.gitignore" afterDir="false" />
       <change beforePath="$PROJECT_DIR$/outApp/HelloWorld-win32-x64/resources/app/.idea/workspace.xml" beforeDir="false" afterPath="$PROJECT_DIR$/outApp/HelloWorld-win32-x64/resources/app/.idea/workspace.xml" afterDir="false" />
       <change beforePath="$PROJECT_DIR$/outApp/HelloWorld-win32-x64/resources/app/package.json" beforeDir="false" afterPath="$PROJECT_DIR$/outApp/HelloWorld-win32-x64/resources/app/package.json" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/outApp/HelloWorld-win32-x64/resources/app/src/renderer/assets/less/login.less" beforeDir="false" afterPath="$PROJECT_DIR$/outApp/HelloWorld-win32-x64/resources/app/src/renderer/assets/less/login.less" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/outApp/HelloWorld-win32-x64/resources/app/src/index.ejs" beforeDir="false" afterPath="$PROJECT_DIR$/outApp/HelloWorld-win32-x64/resources/app/src/index.ejs" afterDir="false" />
       <change beforePath="$PROJECT_DIR$/outApp/HelloWorld-win32-x64/resources/app/src/renderer/components/Login.vue" beforeDir="false" afterPath="$PROJECT_DIR$/outApp/HelloWorld-win32-x64/resources/app/src/renderer/components/Login.vue" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/outApp/HelloWorld-win32-x64/resources/app/src/renderer/router/index.js" beforeDir="false" afterPath="$PROJECT_DIR$/outApp/HelloWorld-win32-x64/resources/app/src/renderer/router/index.js" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/outApp/HelloWorld-win32-x64/resources/app/static/data/EnityLogin.json" beforeDir="false" afterPath="$PROJECT_DIR$/outApp/HelloWorld-win32-x64/resources/app/static/data/EnityLogin.json" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/outApp/HelloWorld-win32-x64/resources/app/static/data/EnityBigScreen.json" beforeDir="false" />
+      <change beforePath="$PROJECT_DIR$/outApp/HelloWorld-win32-x64/resources/app/static/data/EnityButton.json" beforeDir="false" />
+      <change beforePath="$PROJECT_DIR$/outApp/HelloWorld-win32-x64/resources/app/static/data/EnityDevice.json" beforeDir="false" />
+      <change beforePath="$PROJECT_DIR$/outApp/HelloWorld-win32-x64/resources/app/static/data/EnityIcon.json" beforeDir="false" />
+      <change beforePath="$PROJECT_DIR$/outApp/HelloWorld-win32-x64/resources/app/static/data/EnityImage.json" beforeDir="false" />
+      <change beforePath="$PROJECT_DIR$/outApp/HelloWorld-win32-x64/resources/app/static/data/EnityLable.json" beforeDir="false" />
+      <change beforePath="$PROJECT_DIR$/outApp/HelloWorld-win32-x64/resources/app/static/data/EnityLogin.json" beforeDir="false" />
+      <change beforePath="$PROJECT_DIR$/outApp/HelloWorld-win32-x64/resources/app/static/data/EnityMemory.json" beforeDir="false" />
+      <change beforePath="$PROJECT_DIR$/outApp/HelloWorld-win32-x64/resources/app/static/data/EnitySignalPreviewList.json" beforeDir="false" />
+      <change beforePath="$PROJECT_DIR$/outApp/HelloWorld-win32-x64/resources/app/static/data/EnitySlider.json" beforeDir="false" />
+      <change beforePath="$PROJECT_DIR$/outApp/HelloWorld-win32-x64/resources/app/static/data/EnitySystem.json" beforeDir="false" />
+      <change beforePath="$PROJECT_DIR$/outApp/HelloWorld-win32-x64/resources/app/static/data/EnityTimer.json" beforeDir="false" />
+      <change beforePath="$PROJECT_DIR$/outApp/HelloWorld-win32-x64/resources/app/static/data/EnityTopology.json" beforeDir="false" />
+      <change beforePath="$PROJECT_DIR$/outApp/HelloWorld-win32-x64/resources/app/static/data/EnityTopologyConnection.json" beforeDir="false" />
+      <change beforePath="$PROJECT_DIR$/outApp/HelloWorld-win32-x64/resources/app/static/data/EnityView.json" beforeDir="false" />
+      <change beforePath="$PROJECT_DIR$/outApp/HelloWorld-win32-x64/resources/app/static/data/EnityWindow.json" beforeDir="false" />
+      <change beforePath="$PROJECT_DIR$/outApp/HelloWorld-win32-x64/resources/app/yarn.lock" beforeDir="false" afterPath="$PROJECT_DIR$/outApp/HelloWorld-win32-x64/resources/app/yarn.lock" afterDir="false" />
       <change beforePath="$PROJECT_DIR$/package.json" beforeDir="false" afterPath="$PROJECT_DIR$/package.json" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/src/index.ejs" beforeDir="false" afterPath="$PROJECT_DIR$/src/index.ejs" afterDir="false" />
       <change beforePath="$PROJECT_DIR$/src/renderer/assets/less/login.less" beforeDir="false" afterPath="$PROJECT_DIR$/src/renderer/assets/less/login.less" afterDir="false" />
       <change beforePath="$PROJECT_DIR$/src/renderer/components/Login.vue" beforeDir="false" afterPath="$PROJECT_DIR$/src/renderer/components/Login.vue" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/src/renderer/router/index.js" beforeDir="false" afterPath="$PROJECT_DIR$/src/renderer/router/index.js" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/static/data/EnityBigScreen.json" beforeDir="false" afterPath="$PROJECT_DIR$/static/EnityBigScreen.json" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/static/data/EnityButton.json" beforeDir="false" afterPath="$PROJECT_DIR$/static/EnityButton.json" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/static/data/EnityDevice.json" beforeDir="false" afterPath="$PROJECT_DIR$/static/EnityDevice.json" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/static/data/EnityIcon.json" beforeDir="false" afterPath="$PROJECT_DIR$/static/EnityIcon.json" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/static/data/EnityImage.json" beforeDir="false" afterPath="$PROJECT_DIR$/static/EnityImage.json" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/static/data/EnityLable.json" beforeDir="false" afterPath="$PROJECT_DIR$/static/EnityLable.json" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/static/data/EnityLogin.json" beforeDir="false" afterPath="$PROJECT_DIR$/static/EnityLogin.json" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/static/data/EnityMemory.json" beforeDir="false" afterPath="$PROJECT_DIR$/static/EnityMemory.json" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/static/data/EnitySignalPreviewList.json" beforeDir="false" afterPath="$PROJECT_DIR$/static/EnitySignalPreviewList.json" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/static/data/EnitySlider.json" beforeDir="false" afterPath="$PROJECT_DIR$/static/EnitySlider.json" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/static/data/EnitySystem.json" beforeDir="false" afterPath="$PROJECT_DIR$/static/EnitySystem.json" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/static/data/EnityTimer.json" beforeDir="false" afterPath="$PROJECT_DIR$/static/EnityTimer.json" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/static/data/EnityTopology.json" beforeDir="false" afterPath="$PROJECT_DIR$/static/EnityTopology.json" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/static/data/EnityTopologyConnection.json" beforeDir="false" afterPath="$PROJECT_DIR$/static/EnityTopologyConnection.json" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/static/data/EnityView.json" beforeDir="false" afterPath="$PROJECT_DIR$/static/EnityView.json" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/static/data/EnityWindow.json" beforeDir="false" afterPath="$PROJECT_DIR$/static/EnityWindow.json" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/yarn.lock" beforeDir="false" afterPath="$PROJECT_DIR$/yarn.lock" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/static/EnityLogin.json" beforeDir="false" afterPath="$PROJECT_DIR$/static/EnityLogin.json" afterDir="false" />
     </list>
     <ignored path="$PROJECT_DIR$/dist/" />
     <ignored path="$PROJECT_DIR$/.tmp/" />
@@ -48,19 +44,72 @@
   <component name="FileEditorManager">
     <leaf>
       <file pinned="false" current-in-tab="true">
-        <entry file="file://$PROJECT_DIR$/.electron-vue/webpack.renderer.config.js">
+        <entry file="file://$PROJECT_DIR$/src/renderer/components/Login.vue">
           <provider selected="true" editor-type-id="text-editor">
-            <state relative-caret-position="76">
-              <caret line="151" column="57" lean-forward="true" selection-start-line="151" selection-start-column="57" selection-end-line="151" selection-end-column="57" />
+            <state relative-caret-position="63">
+              <caret line="25" column="7" selection-start-line="25" selection-start-column="7" selection-end-line="25" selection-end-column="7" />
               <folding>
-                <element signature="e#1156#1362#0" />
-                <element signature="e#1224#1350#0" />
-                <element signature="e#1812#2130#0" />
-                <element signature="e#1898#2118#0" />
-                <element signature="e#2269#2356#0" />
-                <element signature="e#2490#2572#0" />
-                <element signature="e#2702#2790#0" />
-                <element signature="e#4283#4340#0" />
+                <element signature="n#template#0;n#!!top" />
+                <element signature="n#div#0;n#template#0;n#!!top" />
+                <element signature="n#header#0;n#div#0;n#template#0;n#!!top" />
+                <element signature="n#section#0;n#div#0;n#template#0;n#!!top" />
+                <element signature="n#el-form#0;n#section#0;n#div#0;n#template#0;n#!!top" />
+                <element signature="n#el-form-item#0;n#el-form#0;n#section#0;n#div#0;n#template#0;n#!!top" />
+                <element signature="n#el-form-item#1;n#el-form#0;n#section#0;n#div#0;n#template#0;n#!!top" />
+                <element signature="n#el-form-item#2;n#el-form#0;n#section#0;n#div#0;n#template#0;n#!!top" />
+                <element signature="n#script#0;n#!!top" />
+                <element signature="e#1189#3385#0" />
+                <element signature="e#1206#2598#0" />
+                <element signature="e#1282#1403#0" />
+                <element signature="e#1312#1389#0" />
+                <element signature="e#1468#1586#0" />
+                <element signature="e#1504#1572#0" />
+                <element signature="e#1593#2645#0" />
+                <element signature="e#1634#1721#0" />
+                <element signature="e#1746#2017#0" />
+                <element signature="e#1778#1871#0" />
+                <element signature="e#1903#1999#0" />
+                <element signature="e#2049#2174#0" />
+                <element signature="e#2233#2631#0" />
+                <element signature="e#2088#2849#0" />
+                <element signature="e#2115#2738#0" />
+                <element signature="e#2229#2331#0" />
+                <element signature="e#2394#2647#0" />
+                <element signature="e#2652#2724#0" />
+                <element signature="e#2773#2839#0" />
+                <element signature="n#style#0;n#!!top" />
+                <element signature="e#3009#3025#0" />
+                <element signature="e#3146#3345#0" />
+                <element signature="e#3262#3341#0" />
+                <element signature="e#3449#3958#0" />
+                <element signature="e#3721#3833#0" />
+                <element signature="e#3849#3873#0" />
+                <element signature="e#3891#3954#0" />
+                <element signature="e#3918#3948#0" />
+              </folding>
+            </state>
+          </provider>
+        </entry>
+      </file>
+      <file pinned="false" current-in-tab="false">
+        <entry file="file://$PROJECT_DIR$/src/renderer/assets/less/login.less">
+          <provider selected="true" editor-type-id="text-editor">
+            <state relative-caret-position="727">
+              <caret line="37" column="2" lean-forward="true" selection-start-line="37" selection-start-column="2" selection-end-line="65" selection-end-column="3" />
+              <folding>
+                <element signature="e#702#1211#0" />
+              </folding>
+            </state>
+          </provider>
+        </entry>
+      </file>
+      <file pinned="false" current-in-tab="false">
+        <entry file="file://$PROJECT_DIR$/static/EnityLogin.json">
+          <provider selected="true" editor-type-id="text-editor">
+            <state relative-caret-position="231">
+              <caret line="11" column="22" lean-forward="true" selection-start-line="11" selection-start-column="22" selection-end-line="11" selection-end-column="22" />
+              <folding>
+                <element signature="e#421#433#0" />
               </folding>
             </state>
           </provider>
@@ -137,14 +186,15 @@
         <option value="$PROJECT_DIR$/src/renderer/components/modal/playertest.vue" />
         <option value="$PROJECT_DIR$/src/main/index.js" />
         <option value="$PROJECT_DIR$/.gitignore" />
-        <option value="$PROJECT_DIR$/src/renderer/components/Login.vue" />
         <option value="$PROJECT_DIR$/static/data/EnityLogin.json" />
         <option value="$PROJECT_DIR$/src/renderer/main.js" />
         <option value="$PROJECT_DIR$/src/renderer/router/index.js" />
-        <option value="$PROJECT_DIR$/src/renderer/assets/less/login.less" />
-        <option value="$PROJECT_DIR$/package.json" />
         <option value="$PROJECT_DIR$/src/index.ejs" />
         <option value="$PROJECT_DIR$/.electron-vue/webpack.renderer.config.js" />
+        <option value="$PROJECT_DIR$/package.json" />
+        <option value="$PROJECT_DIR$/src/renderer/assets/less/login.less" />
+        <option value="$PROJECT_DIR$/static/EnityLogin.json" />
+        <option value="$PROJECT_DIR$/src/renderer/components/Login.vue" />
       </list>
     </option>
   </component>
@@ -173,18 +223,7 @@
             <path>
               <item name="electron-app" type="b2602c69:ProjectViewProjectNode" />
               <item name="electron-app" type="462c0819:PsiDirectoryNode" />
-              <item name=".electron-vue" type="462c0819:PsiDirectoryNode" />
-            </path>
-            <path>
-              <item name="electron-app" type="b2602c69:ProjectViewProjectNode" />
-              <item name="electron-app" type="462c0819:PsiDirectoryNode" />
-              <item name="src" type="462c0819:PsiDirectoryNode" />
-            </path>
-            <path>
-              <item name="electron-app" type="b2602c69:ProjectViewProjectNode" />
-              <item name="electron-app" type="462c0819:PsiDirectoryNode" />
-              <item name="src" type="462c0819:PsiDirectoryNode" />
-              <item name="renderer" type="462c0819:PsiDirectoryNode" />
+              <item name="static" type="462c0819:PsiDirectoryNode" />
             </path>
           </expand>
           <select />
@@ -264,12 +303,12 @@
       <workItem from="1586677292013" duration="11000" />
       <workItem from="1586767125442" duration="3838000" />
       <workItem from="1586784783881" duration="3017000" />
-      <workItem from="1586829063648" duration="17921000" />
+      <workItem from="1586829063648" duration="23793000" />
     </task>
     <servers />
   </component>
   <component name="TimeTrackingManager">
-    <option name="totallyTimeSpent" value="148562000" />
+    <option name="totallyTimeSpent" value="154434000" />
   </component>
   <component name="TodoView">
     <todo-panel id="selected-file">
@@ -282,8 +321,9 @@
   </component>
   <component name="ToolWindowManager">
     <frame x="-8" y="-8" width="1936" height="1056" extended-state="6" />
+    <editor active="true" />
     <layout>
-      <window_info content_ui="combo" id="Project" order="0" visible="true" weight="0.14278187" />
+      <window_info active="true" content_ui="combo" id="Project" order="0" visible="true" weight="0.1406744" />
       <window_info id="Structure" order="1" side_tool="true" weight="0.25" />
       <window_info id="npm" order="2" side_tool="true" />
       <window_info id="Favorites" order="3" side_tool="true" />
@@ -297,7 +337,7 @@
       <window_info anchor="bottom" id="Docker" order="7" show_stripe_button="false" />
       <window_info anchor="bottom" id="Version Control" order="8" />
       <window_info anchor="bottom" id="Event Log" order="9" side_tool="true" weight="0.32910052" />
-      <window_info active="true" anchor="bottom" id="Terminal" order="10" visible="true" weight="0.43915343" />
+      <window_info anchor="bottom" id="Terminal" order="10" weight="0.41269842" />
       <window_info anchor="bottom" id="TypeScript" order="11" />
       <window_info anchor="right" id="Commander" internal_type="SLIDING" order="0" type="SLIDING" weight="0.4" />
       <window_info anchor="right" id="Ant Build" order="1" weight="0.25" />
@@ -3513,13 +3553,6 @@
     <entry file="file://$PROJECT_DIR$/dist/electron/static/data/EnityLogin.json">
       <provider selected="true" editor-type-id="text-editor" />
     </entry>
-    <entry file="file://$PROJECT_DIR$/src/renderer/assets/less/login.less">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="1029">
-          <caret line="49" column="8" lean-forward="true" selection-start-line="49" selection-start-column="8" selection-end-line="49" selection-end-column="8" />
-        </state>
-      </provider>
-    </entry>
     <entry file="file://$PROJECT_DIR$/static/EnityBigScreen.json">
       <provider selected="true" editor-type-id="text-editor">
         <state relative-caret-position="378">
@@ -3550,70 +3583,85 @@
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/static/EnityLogin.json">
+    <entry file="file://$PROJECT_DIR$/src/renderer/App.vue">
       <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="315">
-          <caret line="15" column="32" lean-forward="true" selection-start-line="15" selection-start-column="32" selection-end-line="15" selection-end-column="32" />
+        <state relative-caret-position="21">
+          <caret line="1" column="16" selection-start-line="1" selection-start-column="16" selection-end-line="1" selection-end-column="16" />
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/src/renderer/components/Login.vue">
+    <entry file="file://$PROJECT_DIR$/src/renderer/main.js">
       <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="105">
-          <caret line="128" column="8" lean-forward="true" selection-start-line="128" selection-start-column="8" selection-end-line="128" selection-end-column="8" />
-          <folding>
-            <element signature="n#template#0;n#!!top" />
-            <element signature="n#div#0;n#template#0;n#!!top" />
-            <element signature="n#header#0;n#div#0;n#template#0;n#!!top" />
-            <element signature="n#section#0;n#div#0;n#template#0;n#!!top" />
-            <element signature="n#el-form#0;n#section#0;n#div#0;n#template#0;n#!!top" />
-            <element signature="n#el-form-item#0;n#el-form#0;n#section#0;n#div#0;n#template#0;n#!!top" />
-            <element signature="n#el-form-item#1;n#el-form#0;n#section#0;n#div#0;n#template#0;n#!!top" />
-            <element signature="n#el-form-item#2;n#el-form#0;n#section#0;n#div#0;n#template#0;n#!!top" />
-            <element signature="n#script#0;n#!!top" />
-            <element signature="e#1207#2860#0" />
-            <element signature="e#1224#2073#0" />
-            <element signature="e#1287#1408#0" />
-            <element signature="e#1317#1394#0" />
-            <element signature="e#1473#1591#0" />
-            <element signature="e#1509#1577#0" />
-            <element signature="e#1611#2063#0" />
-            <element signature="e#1639#1726#0" />
-            <element signature="e#1751#2022#0" />
-            <element signature="e#1783#1876#0" />
-            <element signature="e#1908#2004#0" />
-            <element signature="e#2093#2854#0" />
-            <element signature="e#2120#2743#0" />
-            <element signature="e#2234#2336#0" />
-            <element signature="e#2399#2652#0" />
-            <element signature="e#2657#2729#0" />
-            <element signature="e#2778#2844#0" />
-            <element signature="n#style#0;n#!!top" />
-            <element signature="e#2897#4004#0" />
-          </folding>
+        <state relative-caret-position="84">
+          <caret line="4" column="29" lean-forward="true" selection-start-line="4" selection-start-column="29" selection-end-line="4" selection-end-column="29" />
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/src/renderer/App.vue">
+    <entry file="file://$PROJECT_DIR$/src/index.ejs">
       <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="21">
-          <caret line="1" column="16" selection-start-line="1" selection-start-column="16" selection-end-line="1" selection-end-column="16" />
+        <state relative-caret-position="84">
+          <caret line="4" column="28" lean-forward="true" selection-start-line="4" selection-start-column="28" selection-end-line="4" selection-end-column="28" />
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/src/renderer/main.js">
+    <entry file="file://$PROJECT_DIR$/.electron-vue/webpack.renderer.config.js">
       <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="84">
-          <caret line="4" column="29" lean-forward="true" selection-start-line="4" selection-start-column="29" selection-end-line="4" selection-end-column="29" />
+        <state relative-caret-position="357">
+          <caret line="23" column="21" selection-start-line="23" selection-start-column="21" selection-end-line="23" selection-end-column="21" />
+          <folding>
+            <element signature="e#456#741#0" />
+            <element signature="e#797#4285#0" />
+            <element signature="e#852#919#0" />
+            <element signature="e#934#1023#0" />
+            <element signature="e#1035#2818#0" />
+            <element signature="e#1048#2814#0" />
+            <element signature="e#1056#1380#0" />
+            <element signature="e#1096#1372#0" />
+            <element signature="e#1156#1362#0" />
+            <element signature="e#1224#1350#0" />
+            <element signature="e#1388#1469#0" />
+            <element signature="e#1477#1542#0" />
+            <element signature="e#1550#1643#0" />
+            <element signature="e#1651#1712#0" />
+            <element signature="e#1720#2148#0" />
+            <element signature="e#1759#2140#0" />
+            <element signature="e#1812#2130#0" />
+            <element signature="e#1898#2118#0" />
+            <element signature="e#2156#2374#0" />
+            <element signature="e#2218#2366#0" />
+            <element signature="e#2269#2356#0" />
+            <element signature="e#2382#2580#0" />
+            <element signature="e#2490#2572#0" />
+            <element signature="e#2588#2808#0" />
+            <element signature="e#2651#2800#0" />
+            <element signature="e#2702#2790#0" />
+            <element signature="e#2828#2941#0" />
+            <element signature="e#2954#3885#0" />
+            <element signature="e#3065#3794#0" />
+            <element signature="e#3164#3508#0" />
+            <element signature="e#3523#3632#0" />
+            <element signature="e#3640#3763#0" />
+            <element signature="e#3897#4012#0" />
+            <element signature="e#4025#4252#0" />
+            <element signature="e#4038#4189#0" />
+            <element signature="e#4287#4344#0" />
+            <element signature="e#4388#4546#0" />
+            <element signature="e#4450#4539#0" />
+            <element signature="e#4548#4604#0" />
+            <element signature="e#4648#5076#0" />
+            <element signature="e#4762#4918#0" />
+            <element signature="e#4770#4912#0" />
+            <element signature="e#4950#5002#0" />
+            <element signature="e#5041#5069#0" />
+          </folding>
         </state>
       </provider>
     </entry>
     <entry file="file://$PROJECT_DIR$/package.json">
       <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="315">
-          <caret line="59" column="27" lean-forward="true" selection-start-line="59" selection-start-column="27" selection-end-line="59" selection-end-column="27" />
+        <state relative-caret-position="609">
+          <caret line="62" column="29" selection-start-line="62" selection-start-column="29" selection-end-line="62" selection-end-column="29" />
           <folding>
-            <element signature="n#!!block;n#scripts#0;n#!!top" />
             <element signature="n#!!block;n#build#0;n#!!top" />
             <element signature="n#!!block;n#directories#0;n#!!block;n#build#0;n#!!top" />
             <element signature="e#1163#1197#0" />
@@ -3629,26 +3677,68 @@
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/src/index.ejs">
+    <entry file="file://$PROJECT_DIR$/static/EnityLogin.json">
       <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="84">
-          <caret line="4" column="28" lean-forward="true" selection-start-line="4" selection-start-column="28" selection-end-line="4" selection-end-column="28" />
+        <state relative-caret-position="231">
+          <caret line="11" column="22" lean-forward="true" selection-start-line="11" selection-start-column="22" selection-end-line="11" selection-end-column="22" />
+          <folding>
+            <element signature="e#421#433#0" />
+          </folding>
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/.electron-vue/webpack.renderer.config.js">
+    <entry file="file://$PROJECT_DIR$/src/renderer/assets/less/login.less">
       <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="76">
-          <caret line="151" column="57" lean-forward="true" selection-start-line="151" selection-start-column="57" selection-end-line="151" selection-end-column="57" />
+        <state relative-caret-position="727">
+          <caret line="37" column="2" lean-forward="true" selection-start-line="37" selection-start-column="2" selection-end-line="65" selection-end-column="3" />
           <folding>
-            <element signature="e#1156#1362#0" />
-            <element signature="e#1224#1350#0" />
-            <element signature="e#1812#2130#0" />
-            <element signature="e#1898#2118#0" />
-            <element signature="e#2269#2356#0" />
-            <element signature="e#2490#2572#0" />
-            <element signature="e#2702#2790#0" />
-            <element signature="e#4283#4340#0" />
+            <element signature="e#702#1211#0" />
+          </folding>
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/renderer/components/Login.vue">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="63">
+          <caret line="25" column="7" selection-start-line="25" selection-start-column="7" selection-end-line="25" selection-end-column="7" />
+          <folding>
+            <element signature="n#template#0;n#!!top" />
+            <element signature="n#div#0;n#template#0;n#!!top" />
+            <element signature="n#header#0;n#div#0;n#template#0;n#!!top" />
+            <element signature="n#section#0;n#div#0;n#template#0;n#!!top" />
+            <element signature="n#el-form#0;n#section#0;n#div#0;n#template#0;n#!!top" />
+            <element signature="n#el-form-item#0;n#el-form#0;n#section#0;n#div#0;n#template#0;n#!!top" />
+            <element signature="n#el-form-item#1;n#el-form#0;n#section#0;n#div#0;n#template#0;n#!!top" />
+            <element signature="n#el-form-item#2;n#el-form#0;n#section#0;n#div#0;n#template#0;n#!!top" />
+            <element signature="n#script#0;n#!!top" />
+            <element signature="e#1189#3385#0" />
+            <element signature="e#1206#2598#0" />
+            <element signature="e#1282#1403#0" />
+            <element signature="e#1312#1389#0" />
+            <element signature="e#1468#1586#0" />
+            <element signature="e#1504#1572#0" />
+            <element signature="e#1593#2645#0" />
+            <element signature="e#1634#1721#0" />
+            <element signature="e#1746#2017#0" />
+            <element signature="e#1778#1871#0" />
+            <element signature="e#1903#1999#0" />
+            <element signature="e#2049#2174#0" />
+            <element signature="e#2233#2631#0" />
+            <element signature="e#2088#2849#0" />
+            <element signature="e#2115#2738#0" />
+            <element signature="e#2229#2331#0" />
+            <element signature="e#2394#2647#0" />
+            <element signature="e#2652#2724#0" />
+            <element signature="e#2773#2839#0" />
+            <element signature="n#style#0;n#!!top" />
+            <element signature="e#3009#3025#0" />
+            <element signature="e#3146#3345#0" />
+            <element signature="e#3262#3341#0" />
+            <element signature="e#3449#3958#0" />
+            <element signature="e#3721#3833#0" />
+            <element signature="e#3849#3873#0" />
+            <element signature="e#3891#3954#0" />
+            <element signature="e#3918#3948#0" />
           </folding>
         </state>
       </provider>

+ 13 - 1
outApp/HelloWorld-win32-x64/resources/app/.electron-vue/webpack.renderer.config.js

@@ -113,6 +113,18 @@ let rendererConfig = {
     new HtmlWebpackPlugin({
       filename: 'index.html',
       template: path.resolve(__dirname, '../src/index.ejs'),
+      /*templateParameters(compilation, assets, options) {
+        return {
+          compilation: compilation,
+          webpack: compilation.getStats().toJson(),
+          webpackConfig: compilation.options,
+          htmlWebpackPlugin: {
+            files: assets,
+            options: options
+          },
+          process,
+        };
+      },*/
       minify: {
         collapseWhitespace: true,
         removeAttributeQuotes: true,
@@ -134,7 +146,7 @@ let rendererConfig = {
     alias: {
       '@': path.join(__dirname, '../src/renderer'),
       'vue$': 'vue/dist/vue.esm.js',
-      'static':path.resolve(_dirname,'../static')
+      'static':path.resolve(__dirname,'../static')
     },
     extensions: ['.js', '.vue', '.json', '.css', '.node']
   },

+ 212 - 166
outApp/HelloWorld-win32-x64/resources/app/.idea/workspace.xml

@@ -5,18 +5,28 @@
       <change beforePath="$PROJECT_DIR$/.electron-vue/webpack.renderer.config.js" beforeDir="false" afterPath="$PROJECT_DIR$/.electron-vue/webpack.renderer.config.js" afterDir="false" />
       <change beforePath="$PROJECT_DIR$/.idea/workspace.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/workspace.xml" afterDir="false" />
       <change beforePath="$PROJECT_DIR$/outApp/HelloWorld-win32-x64/resources/app/.electron-vue/webpack.renderer.config.js" beforeDir="false" afterPath="$PROJECT_DIR$/outApp/HelloWorld-win32-x64/resources/app/.electron-vue/webpack.renderer.config.js" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/outApp/HelloWorld-win32-x64/resources/app/.gitignore" beforeDir="false" afterPath="$PROJECT_DIR$/outApp/HelloWorld-win32-x64/resources/app/.gitignore" afterDir="false" />
       <change beforePath="$PROJECT_DIR$/outApp/HelloWorld-win32-x64/resources/app/.idea/workspace.xml" beforeDir="false" afterPath="$PROJECT_DIR$/outApp/HelloWorld-win32-x64/resources/app/.idea/workspace.xml" afterDir="false" />
       <change beforePath="$PROJECT_DIR$/outApp/HelloWorld-win32-x64/resources/app/package.json" beforeDir="false" afterPath="$PROJECT_DIR$/outApp/HelloWorld-win32-x64/resources/app/package.json" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/outApp/HelloWorld-win32-x64/resources/app/src/renderer/assets/less/login.less" beforeDir="false" afterPath="$PROJECT_DIR$/outApp/HelloWorld-win32-x64/resources/app/src/renderer/assets/less/login.less" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/outApp/HelloWorld-win32-x64/resources/app/src/index.ejs" beforeDir="false" afterPath="$PROJECT_DIR$/outApp/HelloWorld-win32-x64/resources/app/src/index.ejs" afterDir="false" />
       <change beforePath="$PROJECT_DIR$/outApp/HelloWorld-win32-x64/resources/app/src/renderer/components/Login.vue" beforeDir="false" afterPath="$PROJECT_DIR$/outApp/HelloWorld-win32-x64/resources/app/src/renderer/components/Login.vue" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/outApp/HelloWorld-win32-x64/resources/app/src/renderer/router/index.js" beforeDir="false" afterPath="$PROJECT_DIR$/outApp/HelloWorld-win32-x64/resources/app/src/renderer/router/index.js" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/outApp/HelloWorld-win32-x64/resources/app/static/data/EnityLogin.json" beforeDir="false" afterPath="$PROJECT_DIR$/outApp/HelloWorld-win32-x64/resources/app/static/data/EnityLogin.json" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/package.json" beforeDir="false" afterPath="$PROJECT_DIR$/package.json" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/src/renderer/assets/less/login.less" beforeDir="false" afterPath="$PROJECT_DIR$/src/renderer/assets/less/login.less" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/src/renderer/components/Login.vue" beforeDir="false" afterPath="$PROJECT_DIR$/src/renderer/components/Login.vue" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/src/renderer/router/index.js" beforeDir="false" afterPath="$PROJECT_DIR$/src/renderer/router/index.js" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/static/data/EnityLogin.json" beforeDir="false" afterPath="$PROJECT_DIR$/static/data/EnityLogin.json" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/outApp/HelloWorld-win32-x64/resources/app/static/data/EnityBigScreen.json" beforeDir="false" />
+      <change beforePath="$PROJECT_DIR$/outApp/HelloWorld-win32-x64/resources/app/static/data/EnityButton.json" beforeDir="false" />
+      <change beforePath="$PROJECT_DIR$/outApp/HelloWorld-win32-x64/resources/app/static/data/EnityDevice.json" beforeDir="false" />
+      <change beforePath="$PROJECT_DIR$/outApp/HelloWorld-win32-x64/resources/app/static/data/EnityIcon.json" beforeDir="false" />
+      <change beforePath="$PROJECT_DIR$/outApp/HelloWorld-win32-x64/resources/app/static/data/EnityImage.json" beforeDir="false" />
+      <change beforePath="$PROJECT_DIR$/outApp/HelloWorld-win32-x64/resources/app/static/data/EnityLable.json" beforeDir="false" />
+      <change beforePath="$PROJECT_DIR$/outApp/HelloWorld-win32-x64/resources/app/static/data/EnityLogin.json" beforeDir="false" />
+      <change beforePath="$PROJECT_DIR$/outApp/HelloWorld-win32-x64/resources/app/static/data/EnityMemory.json" beforeDir="false" />
+      <change beforePath="$PROJECT_DIR$/outApp/HelloWorld-win32-x64/resources/app/static/data/EnitySignalPreviewList.json" beforeDir="false" />
+      <change beforePath="$PROJECT_DIR$/outApp/HelloWorld-win32-x64/resources/app/static/data/EnitySlider.json" beforeDir="false" />
+      <change beforePath="$PROJECT_DIR$/outApp/HelloWorld-win32-x64/resources/app/static/data/EnitySystem.json" beforeDir="false" />
+      <change beforePath="$PROJECT_DIR$/outApp/HelloWorld-win32-x64/resources/app/static/data/EnityTimer.json" beforeDir="false" />
+      <change beforePath="$PROJECT_DIR$/outApp/HelloWorld-win32-x64/resources/app/static/data/EnityTopology.json" beforeDir="false" />
+      <change beforePath="$PROJECT_DIR$/outApp/HelloWorld-win32-x64/resources/app/static/data/EnityTopologyConnection.json" beforeDir="false" />
+      <change beforePath="$PROJECT_DIR$/outApp/HelloWorld-win32-x64/resources/app/static/data/EnityView.json" beforeDir="false" />
+      <change beforePath="$PROJECT_DIR$/outApp/HelloWorld-win32-x64/resources/app/static/data/EnityWindow.json" beforeDir="false" />
+      <change beforePath="$PROJECT_DIR$/outApp/HelloWorld-win32-x64/resources/app/yarn.lock" beforeDir="false" afterPath="$PROJECT_DIR$/outApp/HelloWorld-win32-x64/resources/app/yarn.lock" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/static/EnityLogin.json" beforeDir="false" afterPath="$PROJECT_DIR$/static/EnityLogin.json" afterDir="false" />
     </list>
     <ignored path="$PROJECT_DIR$/dist/" />
     <ignored path="$PROJECT_DIR$/.tmp/" />
@@ -30,15 +40,17 @@
   </component>
   <component name="FileEditorManager">
     <leaf>
-      <file pinned="false" current-in-tab="true">
+      <file pinned="false" current-in-tab="false">
         <entry file="file://$PROJECT_DIR$/.electron-vue/webpack.renderer.config.js">
           <provider selected="true" editor-type-id="text-editor">
-            <state relative-caret-position="528">
-              <caret line="136" column="49" lean-forward="true" selection-start-line="136" selection-start-column="49" selection-end-line="136" selection-end-column="49" />
+            <state relative-caret-position="328">
+              <caret line="131" column="8" lean-forward="true" selection-start-line="131" selection-start-column="8" selection-end-line="131" selection-end-column="8" />
               <folding>
-                <element signature="e#456#741#0" />
-                <element signature="e#852#919#0" />
-                <element signature="e#934#1023#0" />
+                <element signature="e#1048#2814#0" />
+                <element signature="e#1056#1380#0" />
+                <element signature="e#1096#1372#0" />
+                <element signature="e#1156#1362#0" />
+                <element signature="e#1224#1350#0" />
                 <element signature="e#1388#1469#0" />
                 <element signature="e#1477#1542#0" />
                 <element signature="e#1550#1643#0" />
@@ -55,26 +67,58 @@
                 <element signature="e#2588#2808#0" />
                 <element signature="e#2651#2800#0" />
                 <element signature="e#2702#2790#0" />
-                <element signature="e#2828#2941#0" />
-                <element signature="e#2954#3509#0" />
-                <element signature="e#3065#3418#0" />
-                <element signature="e#3172#3281#0" />
-                <element signature="e#3289#3412#0" />
-                <element signature="e#3521#3636#0" />
-                <element signature="e#3855#3912#0" />
-                <element signature="e#3956#4114#0" />
-                <element signature="e#4018#4107#0" />
-                <element signature="e#4116#4172#0" />
-                <element signature="e#4216#4644#0" />
-                <element signature="e#4330#4486#0" />
-                <element signature="e#4338#4480#0" />
-                <element signature="e#4518#4570#0" />
-                <element signature="e#4609#4637#0" />
+                <element signature="e#4135#4183#0" />
               </folding>
             </state>
           </provider>
         </entry>
       </file>
+      <file pinned="false" current-in-tab="false">
+        <entry file="file://$PROJECT_DIR$/src/renderer/components/Login.vue">
+          <provider selected="true" editor-type-id="text-editor">
+            <state relative-caret-position="63">
+              <caret line="3" column="74" selection-start-line="3" selection-start-column="74" selection-end-line="3" selection-end-column="74" />
+              <folding>
+                <element signature="n#header#0;n#div#0;n#template#0;n#!!top" />
+                <element signature="n#section#0;n#div#0;n#template#0;n#!!top" />
+                <element signature="n#el-form#0;n#section#0;n#div#0;n#template#0;n#!!top" />
+                <element signature="n#el-form-item#0;n#el-form#0;n#section#0;n#div#0;n#template#0;n#!!top" />
+                <element signature="n#el-form-item#1;n#el-form#0;n#section#0;n#div#0;n#template#0;n#!!top" />
+                <element signature="n#el-form-item#2;n#el-form#0;n#section#0;n#div#0;n#template#0;n#!!top" />
+                <element signature="n#script#0;n#!!top" />
+                <element signature="e#1202#2855#0" />
+                <element signature="e#1219#2068#0" />
+                <element signature="e#1282#1403#0" />
+                <element signature="e#1312#1389#0" />
+                <element signature="e#1468#1586#0" />
+                <element signature="e#1504#1572#0" />
+                <element signature="e#1606#2058#0" />
+                <element signature="e#1634#1721#0" />
+                <element signature="e#1746#2017#0" />
+                <element signature="e#1778#1871#0" />
+                <element signature="e#1903#1999#0" />
+                <element signature="e#2088#2849#0" />
+                <element signature="e#2115#2738#0" />
+                <element signature="e#2229#2331#0" />
+                <element signature="e#2394#2647#0" />
+                <element signature="e#2652#2724#0" />
+                <element signature="e#2773#2839#0" />
+                <element signature="n#style#0;n#!!top" />
+                <element signature="e#2892#3999#0" />
+              </folding>
+            </state>
+          </provider>
+        </entry>
+      </file>
+      <file pinned="false" current-in-tab="true">
+        <entry file="file://$PROJECT_DIR$/static/EnityLogin.json">
+          <provider selected="true" editor-type-id="text-editor">
+            <state relative-caret-position="126">
+              <caret line="6" column="34" lean-forward="true" selection-start-line="6" selection-start-column="34" selection-end-line="6" selection-end-column="34" />
+            </state>
+          </provider>
+        </entry>
+      </file>
     </leaf>
   </component>
   <component name="FileTemplateManagerImpl">
@@ -94,6 +138,8 @@
       <find>&quot;win&quot;</find>
       <find>asar</find>
       <find>nodeModules</find>
+      <find>static</find>
+      <find>HtmlWebpackPlugin</find>
     </findStrings>
     <replaceStrings>
       <replace>class</replace>
@@ -113,7 +159,6 @@
         <option value="$PROJECT_DIR$/src/renderer/store/getters.js" />
         <option value="$PROJECT_DIR$/src/utils/storageUtils.js" />
         <option value="$PROJECT_DIR$/src/renderer/index.css" />
-        <option value="$PROJECT_DIR$/src/index.ejs" />
         <option value="$PROJECT_DIR$/src/renderer/App.vue" />
         <option value="$PROJECT_DIR$/static/data/EnityLogin.Data" />
         <option value="$PROJECT_DIR$/static/data/EnityBigScreen.Data" />
@@ -145,13 +190,15 @@
         <option value="$PROJECT_DIR$/src/renderer/components/modal/playertest.vue" />
         <option value="$PROJECT_DIR$/src/main/index.js" />
         <option value="$PROJECT_DIR$/.gitignore" />
-        <option value="$PROJECT_DIR$/src/renderer/assets/less/login.less" />
         <option value="$PROJECT_DIR$/src/renderer/components/Login.vue" />
         <option value="$PROJECT_DIR$/static/data/EnityLogin.json" />
         <option value="$PROJECT_DIR$/src/renderer/main.js" />
         <option value="$PROJECT_DIR$/src/renderer/router/index.js" />
+        <option value="$PROJECT_DIR$/src/renderer/assets/less/login.less" />
         <option value="$PROJECT_DIR$/package.json" />
+        <option value="$PROJECT_DIR$/src/index.ejs" />
         <option value="$PROJECT_DIR$/.electron-vue/webpack.renderer.config.js" />
+        <option value="$PROJECT_DIR$/static/EnityLogin.json" />
       </list>
     </option>
   </component>
@@ -177,16 +224,6 @@
               <item name="electron-app" type="b2602c69:ProjectViewProjectNode" />
               <item name="electron-app" type="462c0819:PsiDirectoryNode" />
             </path>
-            <path>
-              <item name="electron-app" type="b2602c69:ProjectViewProjectNode" />
-              <item name="electron-app" type="462c0819:PsiDirectoryNode" />
-              <item name=".electron-vue" type="462c0819:PsiDirectoryNode" />
-            </path>
-            <path>
-              <item name="electron-app" type="b2602c69:ProjectViewProjectNode" />
-              <item name="electron-app" type="462c0819:PsiDirectoryNode" />
-              <item name="src" type="462c0819:PsiDirectoryNode" />
-            </path>
           </expand>
           <select />
         </subPane>
@@ -265,12 +302,12 @@
       <workItem from="1586677292013" duration="11000" />
       <workItem from="1586767125442" duration="3838000" />
       <workItem from="1586784783881" duration="3017000" />
-      <workItem from="1586829063648" duration="15768000" />
+      <workItem from="1586829063648" duration="18865000" />
     </task>
     <servers />
   </component>
   <component name="TimeTrackingManager">
-    <option name="totallyTimeSpent" value="146409000" />
+    <option name="totallyTimeSpent" value="149506000" />
   </component>
   <component name="TodoView">
     <todo-panel id="selected-file">
@@ -285,7 +322,7 @@
     <frame x="-8" y="-8" width="1936" height="1056" extended-state="6" />
     <editor active="true" />
     <layout>
-      <window_info active="true" content_ui="combo" id="Project" order="0" visible="true" weight="0.14278187" />
+      <window_info content_ui="combo" id="Project" order="0" visible="true" weight="0.1406744" />
       <window_info id="Structure" order="1" side_tool="true" weight="0.25" />
       <window_info id="npm" order="2" side_tool="true" />
       <window_info id="Favorites" order="3" side_tool="true" />
@@ -299,7 +336,7 @@
       <window_info anchor="bottom" id="Docker" order="7" show_stripe_button="false" />
       <window_info anchor="bottom" id="Version Control" order="8" />
       <window_info anchor="bottom" id="Event Log" order="9" side_tool="true" weight="0.32910052" />
-      <window_info anchor="bottom" id="Terminal" order="10" weight="0.4920635" />
+      <window_info anchor="bottom" id="Terminal" order="10" weight="0.41269842" />
       <window_info anchor="bottom" id="TypeScript" order="11" />
       <window_info anchor="right" id="Commander" internal_type="SLIDING" order="0" type="SLIDING" weight="0.4" />
       <window_info anchor="right" id="Ant Build" order="1" weight="0.25" />
@@ -311,7 +348,7 @@
   </component>
   <component name="editorHistoryManager">
     <entry file="file://$PROJECT_DIR$/src/renderer/assets/less/EnityLogin.json" />
-    <entry file="file://$PROJECT_DIR$/static/data/EnitySlider.json">
+    <entry file="file://$PROJECT_DIR$/static/EnitySlider.json">
       <provider selected="true" editor-type-id="text-editor">
         <state relative-caret-position="21">
           <caret line="1" column="2" lean-forward="true" selection-start-line="1" selection-start-column="2" selection-end-line="1" selection-end-column="2" />
@@ -332,7 +369,7 @@
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/static/data/EnityWindow.json">
+    <entry file="file://$PROJECT_DIR$/static/EnityWindow.json">
       <provider selected="true" editor-type-id="text-editor">
         <state relative-caret-position="21">
           <caret line="376" lean-forward="true" selection-start-line="376" selection-end-line="376" />
@@ -375,10 +412,10 @@
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/static/data/EnityView.json">
+    <entry file="file://$PROJECT_DIR$/static/EnityView.json">
       <provider selected="true" editor-type-id="text-editor" />
     </entry>
-    <entry file="file://$PROJECT_DIR$/static/data/EnityTopologyConnection.json">
+    <entry file="file://$PROJECT_DIR$/static/EnityTopologyConnection.json">
       <provider selected="true" editor-type-id="text-editor">
         <state relative-caret-position="8841">
           <caret line="421" column="1" selection-start-line="421" selection-start-column="1" selection-end-line="421" selection-end-column="1" />
@@ -587,7 +624,7 @@
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/static/data/EnityButton.json">
+    <entry file="file://$PROJECT_DIR$/static/EnityButton.json">
       <provider selected="true" editor-type-id="text-editor">
         <state>
           <folding>
@@ -937,7 +974,7 @@
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/static/data/EnityDevice.json">
+    <entry file="file://$PROJECT_DIR$/static/EnityDevice.json">
       <provider selected="true" editor-type-id="text-editor">
         <state>
           <caret line="8607" column="1" lean-forward="true" selection-start-line="8607" selection-start-column="1" selection-end-line="8607" selection-end-column="1" />
@@ -2517,7 +2554,7 @@
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/static/data/EnityIcon.json">
+    <entry file="file://$PROJECT_DIR$/static/EnityIcon.json">
       <provider selected="true" editor-type-id="text-editor">
         <state>
           <folding>
@@ -3361,7 +3398,7 @@
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/static/data/EnityImage.json">
+    <entry file="file://$PROJECT_DIR$/static/EnityImage.json">
       <provider selected="true" editor-type-id="text-editor">
         <state>
           <folding>
@@ -3377,7 +3414,7 @@
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/static/data/EnityLable.json">
+    <entry file="file://$PROJECT_DIR$/static/EnityLable.json">
       <provider selected="true" editor-type-id="text-editor">
         <state>
           <folding>
@@ -3401,14 +3438,14 @@
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/static/data/EnityMemory.json">
+    <entry file="file://$PROJECT_DIR$/static/EnityMemory.json">
       <provider selected="true" editor-type-id="text-editor">
         <state relative-caret-position="252">
           <caret line="12" column="3" lean-forward="true" selection-start-line="12" selection-start-column="3" selection-end-line="12" selection-end-column="3" />
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/static/data/EnitySignalPreviewList.json">
+    <entry file="file://$PROJECT_DIR$/static/EnitySignalPreviewList.json">
       <provider selected="true" editor-type-id="text-editor">
         <state relative-caret-position="336">
           <caret line="92" column="14" lean-forward="true" selection-start-line="92" selection-start-column="14" selection-end-line="92" selection-end-column="14" />
@@ -3455,43 +3492,6 @@
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/src/index.ejs">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="315">
-          <caret line="15" column="7" selection-start-line="15" selection-start-column="7" selection-end-line="15" selection-end-column="7" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/static/data/EnityBigScreen.json">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="189">
-          <caret line="9" column="13" lean-forward="true" selection-start-line="9" selection-start-column="13" selection-end-line="9" selection-end-column="13" />
-          <folding>
-            <element signature="e#1390#3941#0" />
-            <element signature="e#1404#1567#0" />
-            <element signature="e#1581#1745#0" />
-            <element signature="e#1759#1922#0" />
-            <element signature="e#1936#2099#0" />
-            <element signature="e#2113#2276#0" />
-            <element signature="e#2290#2453#0" />
-            <element signature="e#2467#2631#0" />
-            <element signature="e#2645#2808#0" />
-            <element signature="e#2822#2985#0" />
-            <element signature="e#2999#3163#0" />
-            <element signature="e#3177#3340#0" />
-            <element signature="e#3354#3517#0" />
-            <element signature="e#3531#3655#0" />
-            <element signature="e#3669#3793#0" />
-            <element signature="e#3807#3931#0" />
-            <element signature="e#4701#5302#0" />
-            <element signature="e#4715#4878#0" />
-            <element signature="e#4892#5016#0" />
-            <element signature="e#5030#5154#0" />
-            <element signature="e#5168#5292#0" />
-          </folding>
-        </state>
-      </provider>
-    </entry>
     <entry file="file://$PROJECT_DIR$/src/renderer/assets/images/bg.jpg">
       <provider selected="true" editor-type-id="images" />
     </entry>
@@ -3505,23 +3505,6 @@
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/static/data/EnityLogin.json">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="315">
-          <caret line="17" column="10" lean-forward="true" selection-start-line="17" selection-start-column="10" selection-end-line="17" selection-end-column="10" />
-          <folding>
-            <element signature="e#423#435#0" />
-          </folding>
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/src/renderer/assets/less/login.less">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="357">
-          <caret line="17" lean-forward="true" selection-start-line="17" selection-end-line="17" />
-        </state>
-      </provider>
-    </entry>
     <entry file="file://$PROJECT_DIR$/build/icons/icon.ico">
       <provider selected="true" editor-type-id="images" />
     </entry>
@@ -3531,36 +3514,6 @@
     <entry file="file://$PROJECT_DIR$/build/icons/256x256.png">
       <provider selected="true" editor-type-id="images" />
     </entry>
-    <entry file="file://$PROJECT_DIR$/src/renderer/App.vue">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="84">
-          <caret line="4" column="11" lean-forward="true" selection-start-line="4" selection-start-column="11" selection-end-line="4" selection-end-column="11" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/src/renderer/components/Login.vue">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="231">
-          <caret line="22" column="10" lean-forward="true" selection-start-line="22" selection-start-column="10" selection-end-line="22" selection-end-column="10" />
-          <folding>
-            <element signature="n#el-form#0;n#section#0;n#div#0;n#template#0;n#!!top" />
-            <element signature="n#el-form-item#0;n#el-form#0;n#section#0;n#div#0;n#template#0;n#!!top" />
-            <element signature="n#el-form-item#1;n#el-form#0;n#section#0;n#div#0;n#template#0;n#!!top" />
-            <element signature="n#el-form-item#2;n#el-form#0;n#section#0;n#div#0;n#template#0;n#!!top" />
-          </folding>
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/src/renderer/main.js">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="189">
-          <caret line="9" column="18" selection-start-line="9" selection-start-column="18" selection-end-line="9" selection-end-column="18" />
-          <folding>
-            <element signature="e#0#21#0" expanded="true" />
-          </folding>
-        </state>
-      </provider>
-    </entry>
     <entry file="file://$PROJECT_DIR$/src/main/index.js">
       <provider selected="true" editor-type-id="text-editor">
         <state relative-caret-position="168">
@@ -3599,30 +3552,95 @@
     <entry file="file://$PROJECT_DIR$/dist/electron/static/data/EnityLogin.json">
       <provider selected="true" editor-type-id="text-editor" />
     </entry>
+    <entry file="file://$PROJECT_DIR$/src/renderer/assets/less/login.less">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="1029">
+          <caret line="49" column="8" lean-forward="true" selection-start-line="49" selection-start-column="8" selection-end-line="49" selection-end-column="8" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/static/EnityBigScreen.json">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="378">
+          <caret line="18" column="30" lean-forward="true" selection-start-line="18" selection-start-column="30" selection-end-line="18" selection-end-column="30" />
+          <folding>
+            <element signature="e#1390#3941#0" />
+            <element signature="e#1404#1567#0" />
+            <element signature="e#1581#1745#0" />
+            <element signature="e#1759#1922#0" />
+            <element signature="e#1936#2099#0" />
+            <element signature="e#2113#2276#0" />
+            <element signature="e#2290#2453#0" />
+            <element signature="e#2467#2631#0" />
+            <element signature="e#2645#2808#0" />
+            <element signature="e#2822#2985#0" />
+            <element signature="e#2999#3163#0" />
+            <element signature="e#3177#3340#0" />
+            <element signature="e#3354#3517#0" />
+            <element signature="e#3531#3655#0" />
+            <element signature="e#3669#3793#0" />
+            <element signature="e#3807#3931#0" />
+            <element signature="e#4701#5302#0" />
+            <element signature="e#4715#4878#0" />
+            <element signature="e#4892#5016#0" />
+            <element signature="e#5030#5154#0" />
+            <element signature="e#5168#5292#0" />
+          </folding>
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/renderer/App.vue">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="21">
+          <caret line="1" column="16" selection-start-line="1" selection-start-column="16" selection-end-line="1" selection-end-column="16" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/renderer/main.js">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="84">
+          <caret line="4" column="29" lean-forward="true" selection-start-line="4" selection-start-column="29" selection-end-line="4" selection-end-column="29" />
+        </state>
+      </provider>
+    </entry>
     <entry file="file://$PROJECT_DIR$/package.json">
       <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="441">
-          <caret line="21" column="31" lean-forward="true" selection-start-line="21" selection-start-column="31" selection-end-line="21" selection-end-column="31" />
+        <state relative-caret-position="315">
+          <caret line="59" column="27" lean-forward="true" selection-start-line="59" selection-start-column="27" selection-end-line="59" selection-end-column="27" />
           <folding>
-            <element signature="e#1264#1375#0" />
-            <element signature="e#1385#1461#0" />
+            <element signature="n#!!block;n#scripts#0;n#!!top" />
+            <element signature="n#!!block;n#build#0;n#!!top" />
+            <element signature="n#!!block;n#directories#0;n#!!block;n#build#0;n#!!top" />
+            <element signature="e#1163#1197#0" />
+            <element signature="n#!!block;n#dmg#0;n#!!block;n#build#0;n#!!top" />
+            <element signature="e#1230#1445#0" />
+            <element signature="e#1240#1351#0" />
+            <element signature="e#1361#1437#0" />
             <element signature="n#!!block;n#mac#0;n#!!block;n#build#0;n#!!top" />
             <element signature="n#!!block;n#win#0;n#!!block;n#build#0;n#!!top" />
             <element signature="n#!!block;n#linux#0;n#!!block;n#build#0;n#!!top" />
-            <element signature="n#!!block;n#dependencies#0;n#!!top" />
             <element signature="n#!!block;n#devDependencies#0;n#!!top" />
           </folding>
         </state>
       </provider>
     </entry>
+    <entry file="file://$PROJECT_DIR$/src/index.ejs">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="84">
+          <caret line="4" column="28" lean-forward="true" selection-start-line="4" selection-start-column="28" selection-end-line="4" selection-end-column="28" />
+        </state>
+      </provider>
+    </entry>
     <entry file="file://$PROJECT_DIR$/.electron-vue/webpack.renderer.config.js">
       <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="528">
-          <caret line="136" column="49" lean-forward="true" selection-start-line="136" selection-start-column="49" selection-end-line="136" selection-end-column="49" />
+        <state relative-caret-position="328">
+          <caret line="131" column="8" lean-forward="true" selection-start-line="131" selection-start-column="8" selection-end-line="131" selection-end-column="8" />
           <folding>
-            <element signature="e#456#741#0" />
-            <element signature="e#852#919#0" />
-            <element signature="e#934#1023#0" />
+            <element signature="e#1048#2814#0" />
+            <element signature="e#1056#1380#0" />
+            <element signature="e#1096#1372#0" />
+            <element signature="e#1156#1362#0" />
+            <element signature="e#1224#1350#0" />
             <element signature="e#1388#1469#0" />
             <element signature="e#1477#1542#0" />
             <element signature="e#1550#1643#0" />
@@ -3639,24 +3657,52 @@
             <element signature="e#2588#2808#0" />
             <element signature="e#2651#2800#0" />
             <element signature="e#2702#2790#0" />
-            <element signature="e#2828#2941#0" />
-            <element signature="e#2954#3509#0" />
-            <element signature="e#3065#3418#0" />
-            <element signature="e#3172#3281#0" />
-            <element signature="e#3289#3412#0" />
-            <element signature="e#3521#3636#0" />
-            <element signature="e#3855#3912#0" />
-            <element signature="e#3956#4114#0" />
-            <element signature="e#4018#4107#0" />
-            <element signature="e#4116#4172#0" />
-            <element signature="e#4216#4644#0" />
-            <element signature="e#4330#4486#0" />
-            <element signature="e#4338#4480#0" />
-            <element signature="e#4518#4570#0" />
-            <element signature="e#4609#4637#0" />
+            <element signature="e#4135#4183#0" />
+          </folding>
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/renderer/components/Login.vue">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="63">
+          <caret line="3" column="74" selection-start-line="3" selection-start-column="74" selection-end-line="3" selection-end-column="74" />
+          <folding>
+            <element signature="n#header#0;n#div#0;n#template#0;n#!!top" />
+            <element signature="n#section#0;n#div#0;n#template#0;n#!!top" />
+            <element signature="n#el-form#0;n#section#0;n#div#0;n#template#0;n#!!top" />
+            <element signature="n#el-form-item#0;n#el-form#0;n#section#0;n#div#0;n#template#0;n#!!top" />
+            <element signature="n#el-form-item#1;n#el-form#0;n#section#0;n#div#0;n#template#0;n#!!top" />
+            <element signature="n#el-form-item#2;n#el-form#0;n#section#0;n#div#0;n#template#0;n#!!top" />
+            <element signature="n#script#0;n#!!top" />
+            <element signature="e#1202#2855#0" />
+            <element signature="e#1219#2068#0" />
+            <element signature="e#1282#1403#0" />
+            <element signature="e#1312#1389#0" />
+            <element signature="e#1468#1586#0" />
+            <element signature="e#1504#1572#0" />
+            <element signature="e#1606#2058#0" />
+            <element signature="e#1634#1721#0" />
+            <element signature="e#1746#2017#0" />
+            <element signature="e#1778#1871#0" />
+            <element signature="e#1903#1999#0" />
+            <element signature="e#2088#2849#0" />
+            <element signature="e#2115#2738#0" />
+            <element signature="e#2229#2331#0" />
+            <element signature="e#2394#2647#0" />
+            <element signature="e#2652#2724#0" />
+            <element signature="e#2773#2839#0" />
+            <element signature="n#style#0;n#!!top" />
+            <element signature="e#2892#3999#0" />
           </folding>
         </state>
       </provider>
     </entry>
+    <entry file="file://$PROJECT_DIR$/static/EnityLogin.json">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="126">
+          <caret line="6" column="34" lean-forward="true" selection-start-line="6" selection-start-column="34" selection-end-line="6" selection-end-column="34" />
+        </state>
+      </provider>
+    </entry>
   </component>
 </project>

+ 1 - 1
outApp/HelloWorld-win32-x64/resources/app/package.json

@@ -52,8 +52,8 @@
     }
   },
   "dependencies": {
-    "axios": "^0.18.0",
     "element-ui": "^2.13.0",
+    "axios": "^0.19.2",
     "pubsub-js": "^1.7.0",
     "vue": "^2.5.16",
     "vue-electron": "^1.0.6",

+ 1 - 1
outApp/HelloWorld-win32-x64/resources/app/src/index.ejs

@@ -2,7 +2,7 @@
 <html>
   <head>
     <meta charset="utf-8">
-    <title>electron-app</title>
+    <title>vedio_app</title>
     <% if (htmlWebpackPlugin.options.nodeModules) { %>
       <!-- Add `node_modules/` to global paths so `require` works properly in development -->
       <script>

+ 1 - 1
outApp/HelloWorld-win32-x64/resources/app/src/renderer/components/Login.vue

@@ -25,7 +25,7 @@
 
 <script>
     import '../assets/less/login.less'
-    import loginJson from '../../../static/data/EnityLogin'
+    import loginJson from '../../../static/EnityLogin'
 
     export default {
         data() {

+ 0 - 230
outApp/HelloWorld-win32-x64/resources/app/static/data/EnityBigScreen.json

@@ -1,230 +0,0 @@
-[
-    {
-        "BindList":[
-            {
-                "X":0,
-                "Y":0,
-                "DeviceID":"85134b3c-036c-4dcf-8374-05547967372a",
-                "DeviceName":"LED智慧屏"
-            },
-            {
-                "X":1,
-                "Y":0,
-                "DeviceID":"",
-                "DeviceName":""
-            },
-            {
-                "X":0,
-                "Y":1,
-                "DeviceID":"",
-                "DeviceName":""
-            },
-            {
-                "X":1,
-                "Y":1,
-                "DeviceID":"",
-                "DeviceName":""
-            }
-        ],
-        "Name":"BigScreen3",
-        "DWidht":1920,
-        "DHeight":1080,
-        "ColNumber":1,
-        "RowNumber":1,
-        "Brand":"大因分布式V2",
-        "Code":"703f60d4-0932-4dbf-99c9-a53059f7d0ae",
-        "ActionType":9,
-        "IP":"",
-        "IsPanel":false,
-        "EnityName":"BigScreen",
-        "CastGroup":"",
-        "ID":"703f60d4-0932-4dbf-99c9-a53059f7d0ae",
-        "Left":139,
-        "Top":53,
-        "Width":681,
-        "Height":318,
-        "ZIndex":40200,
-        "GroupNumber":"",
-        "IsRunVisiable":true,
-        "IsVisibility":true,
-        "isSyn":false,
-        "WindowID":"9a0dff23-8633-4e7f-89bf-cc4f68ec88e1",
-        "PanelID":null,
-        "IsLock":false,
-        "IsWindow":false
-    },
-    {
-        "BindList":[
-            {
-                "X":0,
-                "Y":0,
-                "DeviceID":"56871e26-5cb8-4051-8750-635904b285c2",
-                "DeviceName":"拼接9"
-            },
-            {
-                "X":1,
-                "Y":0,
-                "DeviceID":"12dcf601-21e3-4432-bad4-9adf5f8154bb",
-                "DeviceName":"拼接10"
-            },
-            {
-                "X":0,
-                "Y":1,
-                "DeviceID":"426f78b1-abd1-4edd-81c9-797d71cab61d",
-                "DeviceName":"拼接5"
-            },
-            {
-                "X":1,
-                "Y":1,
-                "DeviceID":"aa46a74e-d4c7-40df-815e-78f19c6e13d6",
-                "DeviceName":"拼接6"
-            },
-            {
-                "X":0,
-                "Y":2,
-                "DeviceID":"b699031c-2ed4-48b8-9b35-19960a5bf7d2",
-                "DeviceName":"拼接1"
-            },
-            {
-                "X":1,
-                "Y":2,
-                "DeviceID":"7dda932c-51a1-4ae9-b152-ae9019749d94",
-                "DeviceName":"拼接2"
-            },
-            {
-                "X":2,
-                "Y":0,
-                "DeviceID":"810db88c-a9fb-4ce5-be86-7865774cc25c",
-                "DeviceName":"拼接11"
-            },
-            {
-                "X":2,
-                "Y":1,
-                "DeviceID":"bcd365a0-f7ae-4542-82f0-0daa508553b4",
-                "DeviceName":"拼接7"
-            },
-            {
-                "X":2,
-                "Y":2,
-                "DeviceID":"828951a3-e854-4158-80ae-b6b137054f12",
-                "DeviceName":"拼接3"
-            },
-            {
-                "X":3,
-                "Y":0,
-                "DeviceID":"15da0910-ff87-4652-8f2b-2781b727103e",
-                "DeviceName":"拼接12"
-            },
-            {
-                "X":3,
-                "Y":1,
-                "DeviceID":"6a8dfcc4-c2fd-4271-bf1d-92111bdea26e",
-                "DeviceName":"拼接8"
-            },
-            {
-                "X":3,
-                "Y":2,
-                "DeviceID":"b6e959e1-645b-4c57-9dd6-4346cb154057",
-                "DeviceName":"拼接4"
-            },
-            {
-                "X":4,
-                "Y":0,
-                "DeviceID":"",
-                "DeviceName":""
-            },
-            {
-                "X":4,
-                "Y":1,
-                "DeviceID":"",
-                "DeviceName":""
-            },
-            {
-                "X":4,
-                "Y":2,
-                "DeviceID":"",
-                "DeviceName":""
-            }
-        ],
-        "Name":"BigScreen2",
-        "DWidht":1920,
-        "DHeight":1080,
-        "ColNumber":4,
-        "RowNumber":3,
-        "Brand":"大因分布式V2",
-        "Code":"801f69af-533e-4172-be73-697742b09da8",
-        "ActionType":9,
-        "IP":"",
-        "IsPanel":false,
-        "EnityName":"BigScreen",
-        "CastGroup":"",
-        "ID":"801f69af-533e-4172-be73-697742b09da8",
-        "Left":136,
-        "Top":46,
-        "Width":679,
-        "Height":321,
-        "ZIndex":80200,
-        "GroupNumber":"",
-        "IsRunVisiable":true,
-        "IsVisibility":false,
-        "isSyn":false,
-        "WindowID":"08208721-41cc-4f1e-937b-3a1627389049",
-        "PanelID":null,
-        "IsLock":false,
-        "IsWindow":false
-    },
-    {
-        "BindList":[
-            {
-                "X":0,
-                "Y":0,
-                "DeviceID":"96c0eb77-704a-4ebf-9096-e1fc4438eb30",
-                "DeviceName":"投影机"
-            },
-            {
-                "X":1,
-                "Y":0,
-                "DeviceID":"",
-                "DeviceName":""
-            },
-            {
-                "X":0,
-                "Y":1,
-                "DeviceID":"",
-                "DeviceName":""
-            },
-            {
-                "X":1,
-                "Y":1,
-                "DeviceID":"",
-                "DeviceName":""
-            }
-        ],
-        "Name":"投影机",
-        "DWidht":1920,
-        "DHeight":1080,
-        "ColNumber":1,
-        "RowNumber":1,
-        "Brand":"大因分布式V2",
-        "Code":"dac9e82d-9707-4f99-9278-c9df95a08f83",
-        "ActionType":9,
-        "IP":"",
-        "IsPanel":false,
-        "EnityName":"BigScreen",
-        "CastGroup":"",
-        "ID":"dac9e82d-9707-4f99-9278-c9df95a08f83",
-        "Left":137,
-        "Top":49,
-        "Width":682,
-        "Height":318,
-        "ZIndex":90200,
-        "GroupNumber":"",
-        "IsRunVisiable":true,
-        "IsVisibility":false,
-        "isSyn":false,
-        "WindowID":"ab842585-0c91-4e65-bfed-a219bcaaeb43",
-        "PanelID":null,
-        "IsLock":false,
-        "IsWindow":false
-    }
-]

文件差异内容过多而无法显示
+ 0 - 4911
outApp/HelloWorld-win32-x64/resources/app/static/data/EnityButton.json


文件差异内容过多而无法显示
+ 0 - 8608
outApp/HelloWorld-win32-x64/resources/app/static/data/EnityDevice.json


文件差异内容过多而无法显示
+ 0 - 4182
outApp/HelloWorld-win32-x64/resources/app/static/data/EnityIcon.json


+ 0 - 170
outApp/HelloWorld-win32-x64/resources/app/static/data/EnityImage.json

@@ -1,170 +0,0 @@
-[
-  {
-    "BackIcon":"161.png",
-    "ResourceID":"161",
-    "IsPanel":false,
-    "EnityName":"Image",
-    "ID":"9feccc76-380b-499f-966f-199a6a361c1c",
-    "Name":"V0--Img0",
-    "Left":1,
-    "Top":2,
-    "Width":111,
-    "Height":40,
-    "ZIndex":200,
-    "GroupNumber":"",
-    "IsRunVisiable":true,
-    "IsVisibility":true,
-    "isSyn":false,
-    "WindowID":"64a2f252-370a-4bc6-a817-3397f8abb4dc",
-    "PanelID":null,
-    "IsLock":false,
-    "IsWindow":false
-  },
-  {
-    "BackIcon":"804.png",
-    "ResourceID":"804",
-    "IsPanel":false,
-    "EnityName":"Image",
-    "ID":"ef00b427-9ecc-45b2-83d6-be39cf583923",
-    "Name":"V0--Img4",
-    "Left":0,
-    "Top":42,
-    "Width":121,
-    "Height":680,
-    "ZIndex":300,
-    "GroupNumber":"",
-    "IsRunVisiable":true,
-    "IsVisibility":true,
-    "isSyn":false,
-    "WindowID":"64a2f252-370a-4bc6-a817-3397f8abb4dc",
-    "PanelID":null,
-    "IsLock":false,
-    "IsWindow":false
-  },
-  {
-    "BackIcon":"155.png",
-    "ResourceID":"155",
-    "IsPanel":false,
-    "EnityName":"Image",
-    "ID":"76172538-43a9-4561-ad13-ce1940f96c7f",
-    "Name":"V3--Img12",
-    "Left":472,
-    "Top":446,
-    "Width":346,
-    "Height":277,
-    "ZIndex":30500,
-    "GroupNumber":"",
-    "IsRunVisiable":true,
-    "IsVisibility":false,
-    "isSyn":false,
-    "WindowID":"027ab76d-6b9c-46ac-abe6-75b8059f786b",
-    "PanelID":null,
-    "IsLock":false,
-    "IsWindow":false
-  },
-  {
-    "BackIcon":"155.png",
-    "ResourceID":"155",
-    "IsPanel":false,
-    "EnityName":"Image",
-    "ID":"b03303eb-d41c-4284-b008-19e3eb9b87cf",
-    "Name":"V3--Img13",
-    "Left":131,
-    "Top":446,
-    "Width":343,
-    "Height":278,
-    "ZIndex":30100,
-    "GroupNumber":"",
-    "IsRunVisiable":true,
-    "IsVisibility":false,
-    "isSyn":false,
-    "WindowID":"027ab76d-6b9c-46ac-abe6-75b8059f786b",
-    "PanelID":null,
-    "IsLock":false,
-    "IsWindow":false
-  },
-  {
-    "BackIcon":"172.png",
-    "ResourceID":"172",
-    "IsPanel":false,
-    "EnityName":"Image",
-    "ID":"37d1fd12-210c-4827-aa6e-36abe4b7b226",
-    "Name":"V10--Img8",
-    "Left":130,
-    "Top":41,
-    "Width":692,
-    "Height":400,
-    "ZIndex":80100,
-    "GroupNumber":"",
-    "IsRunVisiable":true,
-    "IsVisibility":false,
-    "isSyn":false,
-    "WindowID":"08208721-41cc-4f1e-937b-3a1627389049",
-    "PanelID":null,
-    "IsLock":false,
-    "IsWindow":false
-  },
-  {
-    "BackIcon":"172.png",
-    "ResourceID":"172",
-    "IsPanel":false,
-    "EnityName":"Image",
-    "ID":"59c0ee30-837b-420a-95ae-eb0baec075d9",
-    "Name":"V5--Img6",
-    "Left":130,
-    "Top":40,
-    "Width":700,
-    "Height":407,
-    "ZIndex":40100,
-    "GroupNumber":"",
-    "IsRunVisiable":true,
-    "IsVisibility":true,
-    "isSyn":false,
-    "WindowID":"9a0dff23-8633-4e7f-89bf-cc4f68ec88e1",
-    "PanelID":null,
-    "IsLock":false,
-    "IsWindow":false
-  },
-  {
-    "BackIcon":"172.png",
-    "ResourceID":"172",
-    "IsPanel":false,
-    "EnityName":"Image",
-    "ID":"061d15ce-a49a-402e-904b-5945862359b6",
-    "Name":"V9--Img6",
-    "Left":132,
-    "Top":42,
-    "Width":695,
-    "Height":399,
-    "ZIndex":90100,
-    "GroupNumber":"",
-    "IsRunVisiable":true,
-    "IsVisibility":false,
-    "isSyn":false,
-    "WindowID":"ab842585-0c91-4e65-bfed-a219bcaaeb43",
-    "PanelID":null,
-    "IsLock":false,
-    "IsWindow":false
-  },
-  {
-    "BackIcon":"182.png",
-    "ResourceID":"182",
-    "IsPanel":false,
-    "EnityName":"Image",
-    "ID":"d561b791-f8ef-413e-9a9b-aaa62c18e080",
-    "Name":"V0--Img7",
-    "Left":822,
-    "Top":44,
-    "Width":202,
-    "Height":683,
-    "ZIndex":100,
-    "GroupNumber":"",
-    "IsRunVisiable":true,
-    "IsVisibility":true,
-    "isSyn":false,
-    "WindowID":"64a2f252-370a-4bc6-a817-3397f8abb4dc",
-    "PanelID":null,
-    "IsLock":false,
-    "IsWindow":false
-  }
-]

+ 0 - 427
outApp/HelloWorld-win32-x64/resources/app/static/data/EnityLable.json

@@ -1,427 +0,0 @@
-[
-  {
-    "Code":"9f2f47a0-6c7c-428f-ae6f-1a4d2101520b",
-    "ActionType":5,
-    "Text":"预 案 管 理",
-    "ForegroundStr":"#FFF0F8FF",
-    "FontSize":14,
-    "IsShow":false,
-    "IsPanel":false,
-    "EnityName":"Lable",
-    "ID":"9f2f47a0-6c7c-428f-ae6f-1a4d2101520b",
-    "Name":"Lable2",
-    "Left":18,
-    "Top":56,
-    "Width":90,
-    "Height":35,
-    "ZIndex":1800,
-    "GroupNumber":"",
-    "IsRunVisiable":true,
-    "IsVisibility":true,
-    "isSyn":false,
-    "WindowID":"64a2f252-370a-4bc6-a817-3397f8abb4dc",
-    "PanelID":null,
-    "IsLock":false,
-    "IsWindow":false
-  },
-  {
-    "Code":"a9342554-eb77-47e9-b5fc-6eee45497c27",
-    "ActionType":5,
-    "Text":"摄 像 机 1",
-    "ForegroundStr":"#FF00FFFF",
-    "FontSize":18,
-    "IsShow":false,
-    "IsPanel":false,
-    "EnityName":"Lable",
-    "ID":"a9342554-eb77-47e9-b5fc-6eee45497c27",
-    "Name":"Lable3",
-    "Left":244,
-    "Top":681,
-    "Width":100,
-    "Height":35,
-    "ZIndex":32500,
-    "GroupNumber":"",
-    "IsRunVisiable":true,
-    "IsVisibility":false,
-    "isSyn":false,
-    "WindowID":"027ab76d-6b9c-46ac-abe6-75b8059f786b",
-    "PanelID":null,
-    "IsLock":false,
-    "IsWindow":false
-  },
-  {
-    "Code":"c5f81595-180b-4f0b-b936-da08632ae681",
-    "ActionType":5,
-    "Text":"摄 像 机 2",
-    "ForegroundStr":"#FF00FFFF",
-    "FontSize":18,
-    "IsShow":false,
-    "IsPanel":false,
-    "EnityName":"Lable",
-    "ID":"c5f81595-180b-4f0b-b936-da08632ae681",
-    "Name":"Lable4",
-    "Left":618,
-    "Top":681,
-    "Width":100,
-    "Height":35,
-    "ZIndex":32600,
-    "GroupNumber":"",
-    "IsRunVisiable":true,
-    "IsVisibility":false,
-    "isSyn":false,
-    "WindowID":"027ab76d-6b9c-46ac-abe6-75b8059f786b",
-    "PanelID":null,
-    "IsLock":false,
-    "IsWindow":false
-  },
-  {
-    "Code":"29e9f186-26a8-4eb4-b7de-3702ec28529d",
-    "ActionType":5,
-    "Text":"请 确 认 是 否 关 闭 系 统!!",
-    "ForegroundStr":"#FFDC143C",
-    "FontSize":25,
-    "IsShow":false,
-    "IsPanel":false,
-    "EnityName":"Lable",
-    "ID":"29e9f186-26a8-4eb4-b7de-3702ec28529d",
-    "Name":"Lable4",
-    "Left":307,
-    "Top":156,
-    "Width":349,
-    "Height":96,
-    "ZIndex":100100,
-    "GroupNumber":"",
-    "IsRunVisiable":true,
-    "IsVisibility":false,
-    "isSyn":false,
-    "WindowID":"6bee9008-ccd6-49e1-864d-3b9b73d3a61b",
-    "PanelID":null,
-    "IsLock":false,
-    "IsWindow":false
-  },
-  {
-    "Code":"3a5c7661-4dc5-4981-abc6-97772eb3c325",
-    "ActionType":5,
-    "Text":"系统开关",
-    "ForegroundStr":"#FF00FA9A",
-    "FontSize":16,
-    "IsShow":false,
-    "IsPanel":false,
-    "EnityName":"Lable",
-    "ID":"3a5c7661-4dc5-4981-abc6-97772eb3c325",
-    "Name":"Lable6",
-    "Left":440,
-    "Top":676,
-    "Width":84,
-    "Height":35,
-    "ZIndex":50800,
-    "GroupNumber":"",
-    "IsRunVisiable":true,
-    "IsVisibility":true,
-    "isSyn":false,
-    "WindowID":"d80a8b6e-9f88-41ff-b3a7-1ff8d6ee37a5",
-    "PanelID":null,
-    "IsLock":false,
-    "IsWindow":false
-  },
-  {
-    "Code":"54b3c91b-bed5-41ce-99e6-6dd8abcf528a",
-    "ActionType":5,
-    "Text":"窗帘控制",
-    "ForegroundStr":"#FF00FA9A",
-    "FontSize":14,
-    "IsShow":false,
-    "IsPanel":false,
-    "EnityName":"Lable",
-    "ID":"54b3c91b-bed5-41ce-99e6-6dd8abcf528a",
-    "Name":"Lable7",
-    "Left":620,
-    "Top":574,
-    "Width":72,
-    "Height":35,
-    "ZIndex":60300,
-    "GroupNumber":"",
-    "IsRunVisiable":true,
-    "IsVisibility":false,
-    "isSyn":false,
-    "WindowID":"a12b287f-f68c-4efa-b652-d6e5b0a09d0d",
-    "PanelID":null,
-    "IsLock":false,
-    "IsWindow":false
-  },
-  {
-    "Code":"3386dd2b-caaf-4182-84fe-d75630cc38bf",
-    "ActionType":5,
-    "Text":"空调",
-    "ForegroundStr":"#FF00FA9A",
-    "FontSize":14,
-    "IsShow":false,
-    "IsPanel":false,
-    "EnityName":"Lable",
-    "ID":"3386dd2b-caaf-4182-84fe-d75630cc38bf",
-    "Name":"Lable8",
-    "Left":280,
-    "Top":552,
-    "Width":100,
-    "Height":35,
-    "ZIndex":60500,
-    "GroupNumber":"",
-    "IsRunVisiable":true,
-    "IsVisibility":false,
-    "isSyn":false,
-    "WindowID":"a12b287f-f68c-4efa-b652-d6e5b0a09d0d",
-    "PanelID":null,
-    "IsLock":false,
-    "IsWindow":false
-  },
-  {
-    "Code":"9701509d-c4e7-47a2-ac03-15d41fe282bc",
-    "ActionType":5,
-    "Text":"环 境 控 制",
-    "ForegroundStr":"#FFD6D6D6",
-    "FontSize":18,
-    "IsShow":false,
-    "IsPanel":false,
-    "EnityName":"Lable",
-    "ID":"9701509d-c4e7-47a2-ac03-15d41fe282bc",
-    "Name":"Lable9",
-    "Left":412,
-    "Top":455,
-    "Width":100,
-    "Height":35,
-    "ZIndex":60900,
-    "GroupNumber":"",
-    "IsRunVisiable":true,
-    "IsVisibility":false,
-    "isSyn":false,
-    "WindowID":"a12b287f-f68c-4efa-b652-d6e5b0a09d0d",
-    "PanelID":null,
-    "IsLock":false,
-    "IsWindow":false
-  },
-  {
-    "Code":"a26b9d94-f037-4514-969c-580c687e694e",
-    "ActionType":5,
-    "Text":"HYHT",
-    "ForegroundStr":"#FFD6D6D6",
-    "FontSize":14,
-    "IsShow":false,
-    "IsPanel":false,
-    "EnityName":"Lable",
-    "ID":"a26b9d94-f037-4514-969c-580c687e694e",
-    "Name":"Lable9",
-    "Left":247,
-    "Top":694,
-    "Width":57,
-    "Height":28,
-    "ZIndex":10700,
-    "GroupNumber":"",
-    "IsRunVisiable":true,
-    "IsVisibility":false,
-    "isSyn":false,
-    "WindowID":"cb2687fd-931a-4b38-a76d-9c3ea171b8d8",
-    "PanelID":null,
-    "IsLock":false,
-    "IsWindow":false
-  },
-  {
-    "Code":"026033d2-d123-437d-b2f7-7d7305a31a50",
-    "ActionType":5,
-    "Text":"WXHT",
-    "ForegroundStr":"#FFD6D6D6",
-    "FontSize":14,
-    "IsShow":false,
-    "IsPanel":false,
-    "EnityName":"Lable",
-    "ID":"026033d2-d123-437d-b2f7-7d7305a31a50",
-    "Name":"Lable9副本",
-    "Left":302,
-    "Top":696,
-    "Width":57,
-    "Height":28,
-    "ZIndex":10800,
-    "GroupNumber":"",
-    "IsRunVisiable":true,
-    "IsVisibility":false,
-    "isSyn":false,
-    "WindowID":"cb2687fd-931a-4b38-a76d-9c3ea171b8d8",
-    "PanelID":null,
-    "IsLock":false,
-    "IsWindow":false
-  },
-  {
-    "Code":"5b47ed61-5114-47dd-85da-84a236b75fab",
-    "ActionType":5,
-    "Text":"PC1",
-    "ForegroundStr":"#FFD6D6D6",
-    "FontSize":14,
-    "IsShow":false,
-    "IsPanel":false,
-    "EnityName":"Lable",
-    "ID":"5b47ed61-5114-47dd-85da-84a236b75fab",
-    "Name":"Lable11",
-    "Left":383,
-    "Top":697,
-    "Width":42,
-    "Height":28,
-    "ZIndex":11100,
-    "GroupNumber":"",
-    "IsRunVisiable":true,
-    "IsVisibility":false,
-    "isSyn":false,
-    "WindowID":"cb2687fd-931a-4b38-a76d-9c3ea171b8d8",
-    "PanelID":null,
-    "IsLock":false,
-    "IsWindow":false
-  },
-  {
-    "Code":"4e8c9597-c184-4134-b87a-f96a5a6b26dd",
-    "ActionType":5,
-    "Text":"PC2",
-    "ForegroundStr":"#FFD6D6D6",
-    "FontSize":14,
-    "IsShow":false,
-    "IsPanel":false,
-    "EnityName":"Lable",
-    "ID":"4e8c9597-c184-4134-b87a-f96a5a6b26dd",
-    "Name":"Lable12",
-    "Left":459,
-    "Top":692,
-    "Width":49,
-    "Height":35,
-    "ZIndex":11300,
-    "GroupNumber":"",
-    "IsRunVisiable":true,
-    "IsVisibility":false,
-    "isSyn":false,
-    "WindowID":"cb2687fd-931a-4b38-a76d-9c3ea171b8d8",
-    "PanelID":null,
-    "IsLock":false,
-    "IsWindow":false
-  },
-  {
-    "Code":"ba490dfc-8e93-4b61-b024-aeaf57378ba8",
-    "ActionType":5,
-    "Text":"PC3",
-    "ForegroundStr":"#FFD6D6D6",
-    "FontSize":14,
-    "IsShow":false,
-    "IsPanel":false,
-    "EnityName":"Lable",
-    "ID":"ba490dfc-8e93-4b61-b024-aeaf57378ba8",
-    "Name":"Lable12副本",
-    "Left":528,
-    "Top":697,
-    "Width":46,
-    "Height":24,
-    "ZIndex":11400,
-    "GroupNumber":"",
-    "IsRunVisiable":true,
-    "IsVisibility":false,
-    "isSyn":false,
-    "WindowID":"cb2687fd-931a-4b38-a76d-9c3ea171b8d8",
-    "PanelID":null,
-    "IsLock":false,
-    "IsWindow":false
-  },
-  {
-    "Code":"fefe3dbd-a142-4ec4-9adb-15484907b659",
-    "ActionType":5,
-    "Text":"PC4",
-    "ForegroundStr":"#FFD6D6D6",
-    "FontSize":14,
-    "IsShow":false,
-    "IsPanel":false,
-    "EnityName":"Lable",
-    "ID":"fefe3dbd-a142-4ec4-9adb-15484907b659",
-    "Name":"Lable12副本副本",
-    "Left":597,
-    "Top":696,
-    "Width":46,
-    "Height":25,
-    "ZIndex":11500,
-    "GroupNumber":"",
-    "IsRunVisiable":true,
-    "IsVisibility":false,
-    "isSyn":false,
-    "WindowID":"cb2687fd-931a-4b38-a76d-9c3ea171b8d8",
-    "PanelID":null,
-    "IsLock":false,
-    "IsWindow":false
-  },
-  {
-    "Code":"79f3ccd4-4f58-4fb2-893d-415dcee5edbb",
-    "ActionType":5,
-    "Text":"深圳大因展厅",
-    "ForegroundStr":"#FF00FFFF",
-    "FontSize":14,
-    "IsShow":false,
-    "IsPanel":false,
-    "EnityName":"Lable",
-    "ID":"79f3ccd4-4f58-4fb2-893d-415dcee5edbb",
-    "Name":"Lable15",
-    "Left":466,
-    "Top":0,
-    "Width":100,
-    "Height":35,
-    "ZIndex":2200,
-    "GroupNumber":"",
-    "IsRunVisiable":true,
-    "IsVisibility":true,
-    "isSyn":false,
-    "WindowID":"64a2f252-370a-4bc6-a817-3397f8abb4dc",
-    "PanelID":null,
-    "IsLock":false,
-    "IsWindow":false
-  },
-  {
-    "Code":"3e4a6286-a668-4fd6-9fc6-8e3f41e1d67d",
-    "ActionType":5,
-    "Text":"信号源列表",
-    "ForegroundStr":"#FFD6D6D6",
-    "FontSize":18,
-    "IsShow":false,
-    "IsPanel":false,
-    "EnityName":"Lable",
-    "ID":"3e4a6286-a668-4fd6-9fc6-8e3f41e1d67d",
-    "Name":"Lable16",
-    "Left":878,
-    "Top":71,
-    "Width":100,
-    "Height":35,
-    "ZIndex":2300,
-    "GroupNumber":"",
-    "IsRunVisiable":true,
-    "IsVisibility":true,
-    "isSyn":true,
-    "WindowID":"64a2f252-370a-4bc6-a817-3397f8abb4dc",
-    "PanelID":null,
-    "IsLock":false,
-    "IsWindow":false
-  },
-  {
-    "Code":"74fff89a-711e-4e26-9015-234fd9390706",
-    "ActionType":5,
-    "Text":"电脑控制",
-    "ForegroundStr":"#FF00FFFF",
-    "FontSize":16,
-    "IsShow":false,
-    "IsPanel":false,
-    "EnityName":"Lable",
-    "ID":"74fff89a-711e-4e26-9015-234fd9390706",
-    "Name":"Lable16",
-    "Left":428,
-    "Top":446,
-    "Width":100,
-    "Height":35,
-    "ZIndex":70500,
-    "GroupNumber":"",
-    "IsRunVisiable":true,
-    "IsVisibility":false,
-    "isSyn":false,
-    "WindowID":"d9868551-b579-4258-9bc7-7c1f733773f5",
-    "PanelID":null,
-    "IsLock":false,
-    "IsWindow":false
-  }
-]

+ 0 - 35
outApp/HelloWorld-win32-x64/resources/app/static/data/EnityLogin.json

@@ -1,35 +0,0 @@
-[
-    {
-        "IsBorder":true,
-        "BorderStr":"#FFFFFFFF",
-        "ForegroundStr":"#FFD6D6D6",
-        "BTNForegroundStr":"#FF000000",
-        "BrackgroupStr":"#00ff00",
-        "BackIconObjID":"",
-        "BackIcon":null,
-        "ActionIconObjID":"",
-        "ActionIcon":null,
-        "FontSize":16,
-        "IsPanel":false,
-        "ValidatType":1,
-        "EnityName":"Login",
-        "VerifyPassActionList":[
-
-        ],
-        "ID":"cb3c80b1-f1e4-459d-88ae-e2979666b5e3",
-        "Name":"V1--Login0",
-        "Left":294,
-        "Top":194,
-        "Width":411,
-        "Height":266,
-        "ZIndex":20100,
-        "GroupNumber":"",
-        "IsRunVisiable":true,
-        "IsVisibility":false,
-        "isSyn":false,
-        "WindowID":"b7872c9a-45ec-46c6-a388-f8d364a9f2d7",
-        "PanelID":null,
-        "IsLock":false,
-        "IsWindow":false
-    }
-]

+ 0 - 24
outApp/HelloWorld-win32-x64/resources/app/static/data/EnityMemory.json

@@ -1,24 +0,0 @@
-[
-  {
-    "ID":"01",
-    "Code":"01",
-    "Name":"LoginUser",
-    "isInt":false,
-    "Value":null,
-    "IsSyn":false,
-    "IsSystem":false,
-    "Mark":null,
-    "ActionType":4
-  },
-  {
-    "ID":"02",
-    "Code":"02",
-    "Name":"LoginRole",
-    "isInt":false,
-    "Value":null,
-    "IsSyn":false,
-    "IsSystem":false,
-    "Mark":null,
-    "ActionType":4
-  }
-]

+ 0 - 106
outApp/HelloWorld-win32-x64/resources/app/static/data/EnitySignalPreviewList.json

@@ -1,106 +0,0 @@
-[
-  {
-    "ForegroundStr":"#FF000000",
-    "FontSize":12,
-    "Orientation":0,
-    "PreviewList":[
-      {
-        "DeviceID":"745b5974-84ff-4d2f-aeb4-8c0e28699796",
-        "DeviceName":"PC1",
-        "ShowName":"PC1"
-      },
-      {
-        "DeviceID":"e59eff14-4dd3-4a92-9093-d77790367cd6",
-        "DeviceName":"PC2",
-        "ShowName":"PC2"
-      },
-      {
-        "DeviceID":"d5a8744b-5c70-4bb3-aca6-f1a50d9f32b9",
-        "DeviceName":"PC3",
-        "ShowName":"PC3"
-      },
-      {
-        "DeviceID":"ef8873af-9630-43e5-a319-0d7df031a9a4",
-        "DeviceName":"PC4",
-        "ShowName":"PC4"
-      },
-      {
-        "DeviceID":"35bd372d-46cf-4a85-be88-e3de230c0a45",
-        "DeviceName":"纳米黑板",
-        "ShowName":"纳米黑板"
-      },
-      {
-        "DeviceID":"a3c735ad-8662-4e54-b006-5111a67f12fa",
-        "DeviceName":"摄像机1",
-        "ShowName":"摄像机1"
-      },
-      {
-        "DeviceID":"71f44088-18f3-4230-bfe1-f7c4ea024d24",
-        "DeviceName":"摄像机2",
-        "ShowName":"摄像机2"
-      },
-      {
-        "DeviceID":"e94d28d7-68c9-4fc0-b0a9-47d038e8975c",
-        "DeviceName":"DY-IPCSource1",
-        "ShowName":"DY-IPCSource1"
-      },
-      {
-        "DeviceID":"01ec7f09-7357-4b0a-a95a-e378a90ae97f",
-        "DeviceName":"DY-IPCSource2",
-        "ShowName":"DY-IPCSource2"
-      },
-      {
-        "DeviceID":"8eb17eb1-fd29-42d6-b5c6-6770730fefa0",
-        "DeviceName":"DY-IPCSource3",
-        "ShowName":"DY-IPCSource3"
-      },
-      {
-        "DeviceID":"5ab55a8f-02ec-4444-af13-150caff297c4",
-        "DeviceName":"DY-IPCSource4",
-        "ShowName":"DY-IPCSource4"
-      },
-      {
-        "DeviceID":"66414c74-be8a-40d3-9be0-ae4d18f7ff06",
-        "DeviceName":"DY-IPCSource5",
-        "ShowName":"DY-IPCSource5"
-      },
-      {
-        "DeviceID":"da22105e-7039-4ea7-a50c-6dc704582f90",
-        "DeviceName":"DY-IPCSource6",
-        "ShowName":"DY-IPCSource6"
-      },
-      {
-        "DeviceID":"38134910-d4ba-4ba4-8dc0-54f481b5c290",
-        "DeviceName":"DY-IPCSource7",
-        "ShowName":"DY-IPCSource7"
-      },
-      {
-        "DeviceID":"9c93139d-5933-40ca-aa71-043107db6722",
-        "DeviceName":"DY-IPCSource8",
-        "ShowName":"DY-IPCSource8"
-      }
-    ],
-    "IsPrev":true,
-    "ViewType":0,
-    "IsShowSearch":false,
-    "IsPanel":false,
-    "EnityName":"PreviewList",
-    "Code":"7b59aa67-0b52-4aa7-b2b5-8c240f2a41e0",
-    "ActionType":13,
-    "ID":"7b59aa67-0b52-4aa7-b2b5-8c240f2a41e0",
-    "Name":"SignalPreview17",
-    "Left":827,
-    "Top":124,
-    "Width":194,
-    "Height":578,
-    "ZIndex":2500,
-    "GroupNumber":"",
-    "IsRunVisiable":true,
-    "IsVisibility":true,
-    "isSyn":false,
-    "WindowID":"64a2f252-370a-4bc6-a817-3397f8abb4dc",
-    "PanelID":null,
-    "IsLock":false,
-    "IsWindow":false
-  }
-]

+ 0 - 230
outApp/HelloWorld-win32-x64/resources/app/static/data/EnitySlider.json

@@ -1,230 +0,0 @@
-[
-  {
-    "BackIcon":"77.png",
-    "SliderIcon":"76.png",
-    "Orientation":0,
-    "InitValue":0,
-    "SliderFrequency":10,
-    "MinValue":1,
-    "MaxValue":100,
-    "DevCode":null,
-    "Channel":0,
-    "VolMargin":"5",
-    "SliderMargin":"0",
-    "ShowVol":true,
-    "imgBgWidth":67,
-    "imgBgHeight":215,
-    "imgSliderWidth":33,
-    "imgSliderHeight":54,
-    "Cmd":null,
-    "BindVar":null,
-    "DeviceID":null,
-    "IsPanel":false,
-    "EnityName":"Slider",
-    "ID":"b3539067-d6ea-4dbf-9e43-fd6d043f8684",
-    "Name":"Slider0",
-    "Left":244,
-    "Top":472,
-    "Width":54,
-    "Height":226,
-    "ZIndex":10600,
-    "GroupNumber":"",
-    "IsRunVisiable":true,
-    "IsVisibility":false,
-    "isSyn":true,
-    "WindowID":"cb2687fd-931a-4b38-a76d-9c3ea171b8d8",
-    "PanelID":null,
-    "IsLock":false,
-    "IsWindow":false
-  },
-  {
-    "BackIcon":"77.png",
-    "SliderIcon":"76.png",
-    "Orientation":0,
-    "InitValue":0,
-    "SliderFrequency":10,
-    "MinValue":1,
-    "MaxValue":100,
-    "DevCode":null,
-    "Channel":0,
-    "VolMargin":"6",
-    "SliderMargin":"0",
-    "ShowVol":true,
-    "imgBgWidth":67,
-    "imgBgHeight":215,
-    "imgSliderWidth":33,
-    "imgSliderHeight":54,
-    "Cmd":null,
-    "BindVar":null,
-    "DeviceID":null,
-    "IsPanel":false,
-    "EnityName":"Slider",
-    "ID":"228f105d-ebe4-45ba-a072-a1196bf6030e",
-    "Name":"Slider1",
-    "Left":307,
-    "Top":471,
-    "Width":56,
-    "Height":226,
-    "ZIndex":10900,
-    "GroupNumber":"",
-    "IsRunVisiable":true,
-    "IsVisibility":false,
-    "isSyn":true,
-    "WindowID":"cb2687fd-931a-4b38-a76d-9c3ea171b8d8",
-    "PanelID":null,
-    "IsLock":false,
-    "IsWindow":false
-  },
-  {
-    "BackIcon":"77.png",
-    "SliderIcon":"76.png",
-    "Orientation":0,
-    "InitValue":0,
-    "SliderFrequency":10,
-    "MinValue":1,
-    "MaxValue":100,
-    "DevCode":null,
-    "Channel":0,
-    "VolMargin":"6",
-    "SliderMargin":"0",
-    "ShowVol":true,
-    "imgBgWidth":67,
-    "imgBgHeight":215,
-    "imgSliderWidth":33,
-    "imgSliderHeight":54,
-    "Cmd":null,
-    "BindVar":null,
-    "DeviceID":null,
-    "IsPanel":false,
-    "EnityName":"Slider",
-    "ID":"a4ada37c-c564-45fe-a049-48650cf7d66e",
-    "Name":"Slider2",
-    "Left":374,
-    "Top":472,
-    "Width":61,
-    "Height":226,
-    "ZIndex":11000,
-    "GroupNumber":"",
-    "IsRunVisiable":true,
-    "IsVisibility":false,
-    "isSyn":true,
-    "WindowID":"cb2687fd-931a-4b38-a76d-9c3ea171b8d8",
-    "PanelID":null,
-    "IsLock":false,
-    "IsWindow":false
-  },
-  {
-    "BackIcon":"77.png",
-    "SliderIcon":"76.png",
-    "Orientation":0,
-    "InitValue":0,
-    "SliderFrequency":10,
-    "MinValue":1,
-    "MaxValue":100,
-    "DevCode":null,
-    "Channel":0,
-    "VolMargin":"6",
-    "SliderMargin":"0",
-    "ShowVol":true,
-    "imgBgWidth":67,
-    "imgBgHeight":215,
-    "imgSliderWidth":33,
-    "imgSliderHeight":54,
-    "Cmd":null,
-    "BindVar":null,
-    "DeviceID":null,
-    "IsPanel":false,
-    "EnityName":"Slider",
-    "ID":"42cf859e-bcd1-43b2-8eb0-63964eeab067",
-    "Name":"Slider3",
-    "Left":449,
-    "Top":472,
-    "Width":61,
-    "Height":227,
-    "ZIndex":11200,
-    "GroupNumber":"",
-    "IsRunVisiable":true,
-    "IsVisibility":false,
-    "isSyn":true,
-    "WindowID":"cb2687fd-931a-4b38-a76d-9c3ea171b8d8",
-    "PanelID":null,
-    "IsLock":false,
-    "IsWindow":false
-  },
-  {
-    "BackIcon":"77.png",
-    "SliderIcon":"76.png",
-    "Orientation":0,
-    "InitValue":0,
-    "SliderFrequency":10,
-    "MinValue":1,
-    "MaxValue":100,
-    "DevCode":null,
-    "Channel":0,
-    "VolMargin":"6",
-    "SliderMargin":"0",
-    "ShowVol":true,
-    "imgBgWidth":67,
-    "imgBgHeight":215,
-    "imgSliderWidth":33,
-    "imgSliderHeight":54,
-    "Cmd":null,
-    "BindVar":null,
-    "DeviceID":null,
-    "IsPanel":false,
-    "EnityName":"Slider",
-    "ID":"87f9e83f-38a5-4db6-82ca-76edc5a32e05",
-    "Name":"Slider4",
-    "Left":520,
-    "Top":472,
-    "Width":62,
-    "Height":230,
-    "ZIndex":11600,
-    "GroupNumber":"",
-    "IsRunVisiable":true,
-    "IsVisibility":false,
-    "isSyn":true,
-    "WindowID":"cb2687fd-931a-4b38-a76d-9c3ea171b8d8",
-    "PanelID":null,
-    "IsLock":false,
-    "IsWindow":false
-  },
-  {
-    "BackIcon":"77.png",
-    "SliderIcon":"76.png",
-    "Orientation":0,
-    "InitValue":0,
-    "SliderFrequency":10,
-    "MinValue":1,
-    "MaxValue":100,
-    "DevCode":null,
-    "Channel":0,
-    "VolMargin":"6",
-    "SliderMargin":"0",
-    "ShowVol":true,
-    "imgBgWidth":67,
-    "imgBgHeight":215,
-    "imgSliderWidth":33,
-    "imgSliderHeight":54,
-    "Cmd":null,
-    "BindVar":null,
-    "DeviceID":null,
-    "IsPanel":false,
-    "EnityName":"Slider",
-    "ID":"96b74f03-87ce-48cf-80d8-718d21059530",
-    "Name":"Slider5",
-    "Left":593,
-    "Top":472,
-    "Width":59,
-    "Height":225,
-    "ZIndex":11700,
-    "GroupNumber":"",
-    "IsRunVisiable":true,
-    "IsVisibility":false,
-    "isSyn":true,
-    "WindowID":"cb2687fd-931a-4b38-a76d-9c3ea171b8d8",
-    "PanelID":null,
-    "IsLock":false,
-    "IsWindow":false
-  }
-]

+ 0 - 7
outApp/HelloWorld-win32-x64/resources/app/static/data/EnitySystem.json

@@ -1,7 +0,0 @@
-{
-  "ServerIP":"192.168.1.111",
-  "ServerPort":2020,
-  "Users":[
-
-  ]
-}

+ 0 - 16
outApp/HelloWorld-win32-x64/resources/app/static/data/EnityTimer.json

@@ -1,16 +0,0 @@
-[
-  {
-    "ID":"f5f1217e-f606-4372-8650-4363931fa8e1",
-    "Code":"f5f1217e-f606-4372-8650-4363931fa8e1",
-    "Name":"500ms",
-    "ActionType":0,
-    "Milliseconds":500
-  },
-  {
-    "ID":"08be426e-f9ae-469c-8ea3-ab41403c9f47",
-    "Code":"08be426e-f9ae-469c-8ea3-ab41403c9f47",
-    "Name":"1s",
-    "ActionType":0,
-    "Milliseconds":1000
-  }
-]

+ 0 - 346
outApp/HelloWorld-win32-x64/resources/app/static/data/EnityTopology.json

@@ -1,346 +0,0 @@
-[
-  {
-    "ID":"2c0d93d3-32db-48cb-8a81-ca119264dc61",
-    "DeviceID":"fb9bf45d-1ef9-4759-87bd-68aeb43f90bf",
-    "Left":0,
-    "Top":1016.0247481942163,
-    "IsLock":false,
-    "zIndex":42
-  },
-  {
-    "ID":"0f6115ad-8ca8-4019-bcb3-45021e96d152",
-    "DeviceID":"e977ca53-7103-4070-9774-20c24490f594",
-    "Left":432.92277416679991,
-    "Top":495.84112813640024,
-    "IsLock":false,
-    "zIndex":43
-  },
-  {
-    "ID":"c645efb0-df1e-4a75-81ec-95440011c7d8",
-    "DeviceID":"794ef81f-b162-479d-b9de-70cd7a2535bc",
-    "Left":1510.1270807887602,
-    "Top":466.84090391766483,
-    "IsLock":false,
-    "zIndex":44
-  },
-  {
-    "ID":"3e1cc049-a16b-4ff1-acb4-8d890a36ec05",
-    "DeviceID":"9f74978f-1640-434d-b3be-298f64cc6e50",
-    "Left":425.53426964999983,
-    "Top":65.907718049999659,
-    "IsLock":false,
-    "zIndex":45
-  },
-  {
-    "ID":"483b2fde-6580-4349-981a-13ae67ae3771",
-    "DeviceID":"745b5974-84ff-4d2f-aeb4-8c0e28699796",
-    "Left":0,
-    "Top":0,
-    "IsLock":false,
-    "zIndex":46
-  },
-  {
-    "ID":"90a67ebe-b033-4dfe-8fc6-f3169e9881f8",
-    "DeviceID":"e59eff14-4dd3-4a92-9093-d77790367cd6",
-    "Left":144.2320000000002,
-    "Top":0,
-    "IsLock":false,
-    "zIndex":47
-  },
-  {
-    "ID":"6707ee78-f6da-4d84-9200-31b78755d834",
-    "DeviceID":"d5a8744b-5c70-4bb3-aca6-f1a50d9f32b9",
-    "Left":0,
-    "Top":63.678967387999705,
-    "IsLock":false,
-    "zIndex":48
-  },
-  {
-    "ID":"1e3146db-6097-4078-95ce-44a110623aff",
-    "DeviceID":"ef8873af-9630-43e5-a319-0d7df031a9a4",
-    "Left":18.392000000000053,
-    "Top":264.66079623799965,
-    "IsLock":false,
-    "zIndex":49
-  },
-  {
-    "ID":"7de9425d-8359-496b-8b75-01769a7c565c",
-    "DeviceID":"a3c735ad-8662-4e54-b006-5111a67f12fa",
-    "Left":0,
-    "Top":338.002433068,
-    "IsLock":false,
-    "zIndex":50
-  },
-  {
-    "ID":"ecfdcf62-61b4-43bf-8afe-1b86413493b6",
-    "DeviceID":"71f44088-18f3-4230-bfe1-f7c4ea024d24",
-    "Left":63.540894559999856,
-    "Top":592.65139385400016,
-    "IsLock":false,
-    "zIndex":51
-  },
-  {
-    "ID":"d19a38b9-75eb-4c8e-a162-2e4aa4b758b2",
-    "DeviceID":"b699031c-2ed4-48b8-9b35-19960a5bf7d2",
-    "Left":829.73618439680024,
-    "Top":0,
-    "IsLock":false,
-    "zIndex":52
-  },
-  {
-    "ID":"f3414aa5-4540-4ca7-97d0-47385dc9c23c",
-    "DeviceID":"7dda932c-51a1-4ae9-b152-ae9019749d94",
-    "Left":1034.1078902593017,
-    "Top":0,
-    "IsLock":false,
-    "zIndex":53
-  },
-  {
-    "ID":"abff7818-f318-4f42-891b-98ee225bae0f",
-    "DeviceID":"828951a3-e854-4158-80ae-b6b137054f12",
-    "Left":1260.4221506678014,
-    "Top":0,
-    "IsLock":false,
-    "zIndex":54
-  },
-  {
-    "ID":"274514d7-bc12-462e-9cc5-4df5660d8969",
-    "DeviceID":"b6e959e1-645b-4c57-9dd6-4346cb154057",
-    "Left":1536.0662357457011,
-    "Top":0,
-    "IsLock":false,
-    "zIndex":55
-  },
-  {
-    "ID":"93cb0c80-efdb-47f7-9832-0328c987b388",
-    "DeviceID":"426f78b1-abd1-4edd-81c9-797d71cab61d",
-    "Left":819.36511199059964,
-    "Top":0,
-    "IsLock":false,
-    "zIndex":56
-  },
-  {
-    "ID":"48f12fd3-d7fa-4ed6-ba8c-27cbe33b14f5",
-    "DeviceID":"aa46a74e-d4c7-40df-815e-78f19c6e13d6",
-    "Left":1017.2125130023026,
-    "Top":0,
-    "IsLock":false,
-    "zIndex":57
-  },
-  {
-    "ID":"659a9075-341f-423e-b9dc-943c83a903e5",
-    "DeviceID":"bcd365a0-f7ae-4542-82f0-0daa508553b4",
-    "Left":1191.5700780906013,
-    "Top":0,
-    "IsLock":false,
-    "zIndex":58
-  },
-  {
-    "ID":"939bcf90-58e3-40ba-886b-bfabc7838b45",
-    "DeviceID":"6a8dfcc4-c2fd-4271-bf1d-92111bdea26e",
-    "Left":1364.6434386100007,
-    "Top":0,
-    "IsLock":false,
-    "zIndex":59
-  },
-  {
-    "ID":"292235fd-b42f-4ba4-9922-08a1635a8940",
-    "DeviceID":"56871e26-5cb8-4051-8750-635904b285c2",
-    "Left":818.77854814350144,
-    "Top":1.6726033584996003,
-    "IsLock":false,
-    "zIndex":60
-  },
-  {
-    "ID":"bb6e6e29-5bad-47d3-89da-6118feedf81f",
-    "DeviceID":"12dcf601-21e3-4432-bad4-9adf5f8154bb",
-    "Left":1037.2051262125008,
-    "Top":37,
-    "IsLock":false,
-    "zIndex":61
-  },
-  {
-    "ID":"c4264b37-5ec5-4671-88be-96d6ce87f918",
-    "DeviceID":"810db88c-a9fb-4ce5-be86-7865774cc25c",
-    "Left":1255.2346657476014,
-    "Top":10.632804584299606,
-    "IsLock":false,
-    "zIndex":62
-  },
-  {
-    "ID":"7a02c4fc-221c-4d0d-ba63-38535def6467",
-    "DeviceID":"15da0910-ff87-4652-8f2b-2781b727103e",
-    "Left":1488.3713847232016,
-    "Top":23.751568101499515,
-    "IsLock":false,
-    "zIndex":63
-  },
-  {
-    "ID":"20f301e8-0ea8-4dba-98e8-08c162eae703",
-    "DeviceID":"35bd372d-46cf-4a85-be88-e3de230c0a45",
-    "Left":0,
-    "Top":819.09830795400092,
-    "IsLock":false,
-    "zIndex":64
-  },
-  {
-    "ID":"5ab3fa4c-c06e-432e-b554-6554ef175290",
-    "DeviceID":"96c0eb77-704a-4ebf-9096-e1fc4438eb30",
-    "Left":1323.5547385565012,
-    "Top":268.97812796549971,
-    "IsLock":false,
-    "zIndex":65
-  },
-  {
-    "ID":"d68f5a97-0ac8-43a6-8a72-acf3433a45ae",
-    "DeviceID":"85134b3c-036c-4dcf-8374-05547967372a",
-    "Left":1297.9990853510021,
-    "Top":730.36079362699968,
-    "IsLock":false,
-    "zIndex":66
-  },
-  {
-    "ID":"f1385949-8ea2-4a26-bcd7-11625037765a",
-    "DeviceID":"f59c2edc-69d2-4c36-af2a-e94975d7ac79",
-    "Left":1057.9098132262666,
-    "Top":1020.6435591034403,
-    "IsLock":false,
-    "zIndex":67
-  },
-  {
-    "ID":"752b4769-d801-4aeb-bb8b-b4c2a363f0dd",
-    "DeviceID":"749296da-9026-45e9-8db6-9c4358269273",
-    "Left":1273.3480531967371,
-    "Top":1014.9745639034402,
-    "IsLock":false,
-    "zIndex":68
-  },
-  {
-    "ID":"fb6cdd16-b4f6-4fac-b6bf-f93854f77179",
-    "DeviceID":"287d1673-4ac5-4643-ad97-3340923edd12",
-    "Left":1534.3803031466368,
-    "Top":1022.0980461156603,
-    "IsLock":false,
-    "zIndex":69
-  },
-  {
-    "ID":"7ae19651-bf00-402e-b52c-c4b959083061",
-    "DeviceID":"ef6a36fa-eec7-4c6a-8e74-23089a10ab0a",
-    "Left":1805.5588055540311,
-    "Top":1024.9511628217706,
-    "IsLock":false,
-    "zIndex":70
-  },
-  {
-    "ID":"f7aae46b-5fae-45a1-9f1b-386007549589",
-    "DeviceID":"e94d28d7-68c9-4fc0-b0a9-47d038e8975c",
-    "Left":811.38534949000029,
-    "Top":1082.5704977950006,
-    "IsLock":false,
-    "zIndex":71
-  },
-  {
-    "ID":"50ed4566-ba0c-424b-b351-cceed4e195ca",
-    "DeviceID":"01ec7f09-7357-4b0a-a95a-e378a90ae97f",
-    "Left":816.10124487199994,
-    "Top":1179.2463531260005,
-    "IsLock":false,
-    "zIndex":72
-  },
-  {
-    "ID":"55231414-783a-4c98-9d5e-beec72099233",
-    "DeviceID":"8eb17eb1-fd29-42d6-b5c6-6770730fefa0",
-    "Left":811.38534949000029,
-    "Top":1270.0273392295014,
-    "IsLock":false,
-    "zIndex":73
-  },
-  {
-    "ID":"1658622e-193c-45dd-b35e-6c41863183c4",
-    "DeviceID":"5ab55a8f-02ec-4444-af13-150caff297c4",
-    "Left":809.02740179900059,
-    "Top":1361.9872991785,
-    "IsLock":false,
-    "zIndex":74
-  },
-  {
-    "ID":"d710b9cf-f339-4601-88d1-e751eeb30ba0",
-    "DeviceID":"66414c74-be8a-40d3-9be0-ae4d18f7ff06",
-    "Left":814.9222710265,
-    "Top":1468.9807257735008,
-    "IsLock":false,
-    "zIndex":75
-  },
-  {
-    "ID":"2d027898-dfd3-4a02-ae48-c1e57ae4f69b",
-    "DeviceID":"da22105e-7039-4ea7-a50c-6dc704582f90",
-    "Left":816.10124487199994,
-    "Top":1565.9497744500009,
-    "IsLock":false,
-    "zIndex":76
-  },
-  {
-    "ID":"39f69b7d-d7de-4246-b18b-7a9533633f85",
-    "DeviceID":"38134910-d4ba-4ba4-8dc0-54f481b5c290",
-    "Left":826.71200948149988,
-    "Top":1668.520499008501,
-    "IsLock":false,
-    "zIndex":77
-  },
-  {
-    "ID":"15fefce0-5abf-49b5-b6ec-98ef5bf19b21",
-    "DeviceID":"9c93139d-5933-40ca-aa71-043107db6722",
-    "Left":843.21764331850011,
-    "Top":1766.3753281850009,
-    "IsLock":false,
-    "zIndex":78
-  },
-  {
-    "ID":"ea82121c-b610-4ba5-a516-368eda30c9a1",
-    "DeviceID":"79bf24a8-f729-4e7a-9a8e-a907e70135a9",
-    "Left":1781.8871312800011,
-    "Top":428.68571008000015,
-    "IsLock":false,
-    "zIndex":79
-  },
-  {
-    "ID":"759852f8-9837-47b2-8d52-31a3884ff0c3",
-    "DeviceID":"facd33c7-c3a3-48fb-890d-313840816213",
-    "Left":1801.0889891200009,
-    "Top":537.33076792000008,
-    "IsLock":false,
-    "zIndex":80
-  },
-  {
-    "ID":"b4742328-18cc-4b18-a4ee-af2c19023dff",
-    "DeviceID":"2e8692f6-2522-401b-82cc-0cf53baa5f50",
-    "Left":32.911999999999921,
-    "Top":190.70334224000004,
-    "IsLock":false,
-    "zIndex":81
-  },
-  {
-    "ID":"049f62c7-6ff7-4dca-845f-2fa5fa3d16e2",
-    "DeviceID":"150ffce6-c541-4bf0-a0b5-256a4216e89e",
-    "Left":0,
-    "Top":581.96694639999953,
-    "IsLock":false,
-    "zIndex":82
-  },
-  {
-    "ID":"43706d43-079c-4d51-a195-f04b3e5f9e85",
-    "DeviceID":"bbdc8ea4-ffc1-4bd2-8464-9fdab1b86398",
-    "Left":1661.4547013584024,
-    "Top":268.80256644479977,
-    "IsLock":false,
-    "zIndex":83
-  },
-  {
-    "ID":"e8aa4833-ad3f-4d81-8c91-db201005c91c",
-    "DeviceID":"b268c790-c474-4835-9034-f5993e88e1c5",
-    "Left":1701.5453949799994,
-    "Top":777.16107930999988,
-    "IsLock":false,
-    "zIndex":84
-  }
-]

+ 0 - 422
outApp/HelloWorld-win32-x64/resources/app/static/data/EnityTopologyConnection.json

@@ -1,422 +0,0 @@
-[
-  {
-    "ID":"df81e3a0-045f-4f83-9ffe-4e36813ee41a",
-    "SourceID":"2c0d93d3-32db-48cb-8a81-ca119264dc61",
-    "SinkID":"3e1cc049-a16b-4ff1-acb4-8d890a36ec05",
-    "SourceConnectorName":"PinBLink_1",
-    "SinkConnectorName":"PinBLink_15",
-    "SourceArrowSymbol":"None",
-    "SinkArrowSymbol":"None",
-    "zIndex":0
-  },
-  {
-    "ID":"60e9d4c8-7e8a-44e5-b8d2-ff71a02987c8",
-    "SourceID":"0f6115ad-8ca8-4019-bcb3-45021e96d152",
-    "SinkID":"c645efb0-df1e-4a75-81ec-95440011c7d8",
-    "SourceConnectorName":"PinBLink_4",
-    "SinkConnectorName":"PinBLink_14",
-    "SourceArrowSymbol":"None",
-    "SinkArrowSymbol":"None",
-    "zIndex":0
-  },
-  {
-    "ID":"45491adf-4ef1-4787-bfac-739a231509c1",
-    "SourceID":"3e1cc049-a16b-4ff1-acb4-8d890a36ec05",
-    "SinkID":"0f6115ad-8ca8-4019-bcb3-45021e96d152",
-    "SourceConnectorName":"PinBLink_23",
-    "SinkConnectorName":"PinBLink_1",
-    "SourceArrowSymbol":"None",
-    "SinkArrowSymbol":"None",
-    "zIndex":0
-  },
-  {
-    "ID":"fb08e96a-7881-4eec-a6d7-57571289c558",
-    "SourceID":"292235fd-b42f-4ba4-9922-08a1635a8940",
-    "SinkID":"0f6115ad-8ca8-4019-bcb3-45021e96d152",
-    "SourceConnectorName":"PinBLink_4",
-    "SinkConnectorName":"PinBLink_2",
-    "SourceArrowSymbol":"None",
-    "SinkArrowSymbol":"None",
-    "zIndex":0
-  },
-  {
-    "ID":"49eeffce-ee7a-4a7a-b9d2-6b88ecc20921",
-    "SourceID":"bb6e6e29-5bad-47d3-89da-6118feedf81f",
-    "SinkID":"3e1cc049-a16b-4ff1-acb4-8d890a36ec05",
-    "SourceConnectorName":"PinBLink_4",
-    "SinkConnectorName":"PinBLink_20",
-    "SourceArrowSymbol":"None",
-    "SinkArrowSymbol":"None",
-    "zIndex":0
-  },
-  {
-    "ID":"47837ca6-7f3d-40cb-80da-10c4ef0b512d",
-    "SourceID":"c4264b37-5ec5-4671-88be-96d6ce87f918",
-    "SinkID":"3e1cc049-a16b-4ff1-acb4-8d890a36ec05",
-    "SourceConnectorName":"PinBLink_4",
-    "SinkConnectorName":"PinBLink_22",
-    "SourceArrowSymbol":"None",
-    "SinkArrowSymbol":"None",
-    "zIndex":0
-  },
-  {
-    "ID":"39f95802-78f7-432e-a76a-13e7b10f742d",
-    "SourceID":"7a02c4fc-221c-4d0d-ba63-38535def6467",
-    "SinkID":"3e1cc049-a16b-4ff1-acb4-8d890a36ec05",
-    "SourceConnectorName":"PinBLink_4",
-    "SinkConnectorName":"PinBLink_24",
-    "SourceArrowSymbol":"None",
-    "SinkArrowSymbol":"None",
-    "zIndex":0
-  },
-  {
-    "ID":"c0fb5528-86a7-40d9-849e-0da34244d42e",
-    "SourceID":"939bcf90-58e3-40ba-886b-bfabc7838b45",
-    "SinkID":"3e1cc049-a16b-4ff1-acb4-8d890a36ec05",
-    "SourceConnectorName":"PinBLink_4",
-    "SinkConnectorName":"PinBLink_18",
-    "SourceArrowSymbol":"None",
-    "SinkArrowSymbol":"None",
-    "zIndex":0
-  },
-  {
-    "ID":"5592f431-d34b-45ac-8f06-a605a8b3304e",
-    "SourceID":"659a9075-341f-423e-b9dc-943c83a903e5",
-    "SinkID":"3e1cc049-a16b-4ff1-acb4-8d890a36ec05",
-    "SourceConnectorName":"PinBLink_4",
-    "SinkConnectorName":"PinBLink_16",
-    "SourceArrowSymbol":"None",
-    "SinkArrowSymbol":"None",
-    "zIndex":0
-  },
-  {
-    "ID":"07f4f212-08a3-493d-a207-5a954047d859",
-    "SourceID":"48f12fd3-d7fa-4ed6-ba8c-27cbe33b14f5",
-    "SinkID":"3e1cc049-a16b-4ff1-acb4-8d890a36ec05",
-    "SourceConnectorName":"PinBLink_4",
-    "SinkConnectorName":"PinBLink_14",
-    "SourceArrowSymbol":"None",
-    "SinkArrowSymbol":"None",
-    "zIndex":0
-  },
-  {
-    "ID":"ffe66674-2172-427e-b20d-f8bc38782664",
-    "SourceID":"93cb0c80-efdb-47f7-9832-0328c987b388",
-    "SinkID":"3e1cc049-a16b-4ff1-acb4-8d890a36ec05",
-    "SourceConnectorName":"PinBLink_4",
-    "SinkConnectorName":"PinBLink_12",
-    "SourceArrowSymbol":"None",
-    "SinkArrowSymbol":"None",
-    "zIndex":0
-  },
-  {
-    "ID":"4e2efdf6-26f7-47d2-8f73-ac9b79e7a0f7",
-    "SourceID":"274514d7-bc12-462e-9cc5-4df5660d8969",
-    "SinkID":"3e1cc049-a16b-4ff1-acb4-8d890a36ec05",
-    "SourceConnectorName":"PinBLink_4",
-    "SinkConnectorName":"PinBLink_10",
-    "SourceArrowSymbol":"None",
-    "SinkArrowSymbol":"None",
-    "zIndex":0
-  },
-  {
-    "ID":"9789a022-98f1-4a81-9b66-5a76c242aa31",
-    "SourceID":"abff7818-f318-4f42-891b-98ee225bae0f",
-    "SinkID":"3e1cc049-a16b-4ff1-acb4-8d890a36ec05",
-    "SourceConnectorName":"PinBLink_4",
-    "SinkConnectorName":"PinBLink_8",
-    "SourceArrowSymbol":"None",
-    "SinkArrowSymbol":"None",
-    "zIndex":0
-  },
-  {
-    "ID":"093f647f-e3a5-4ad6-ab8b-7d29f59bc557",
-    "SourceID":"f3414aa5-4540-4ca7-97d0-47385dc9c23c",
-    "SinkID":"3e1cc049-a16b-4ff1-acb4-8d890a36ec05",
-    "SourceConnectorName":"PinBLink_4",
-    "SinkConnectorName":"PinBLink_6",
-    "SourceArrowSymbol":"None",
-    "SinkArrowSymbol":"None",
-    "zIndex":0
-  },
-  {
-    "ID":"31b36388-2c00-4773-bd7b-d3ccfbf60373",
-    "SourceID":"f3414aa5-4540-4ca7-97d0-47385dc9c23c",
-    "SinkID":"3e1cc049-a16b-4ff1-acb4-8d890a36ec05",
-    "SourceConnectorName":"PinBLink_4",
-    "SinkConnectorName":"PinBLink_4",
-    "SourceArrowSymbol":"None",
-    "SinkArrowSymbol":"None",
-    "zIndex":0
-  },
-  {
-    "ID":"ce851df0-c466-49c7-8e46-4abafa71f669",
-    "SourceID":"483b2fde-6580-4349-981a-13ae67ae3771",
-    "SinkID":"3e1cc049-a16b-4ff1-acb4-8d890a36ec05",
-    "SourceConnectorName":"PinBLink_4",
-    "SinkConnectorName":"PinBLink_1",
-    "SourceArrowSymbol":"None",
-    "SinkArrowSymbol":"None",
-    "zIndex":0
-  },
-  {
-    "ID":"e74b92e2-64c0-4a22-bfae-565e330f6eb4",
-    "SourceID":"90a67ebe-b033-4dfe-8fc6-f3169e9881f8",
-    "SinkID":"3e1cc049-a16b-4ff1-acb4-8d890a36ec05",
-    "SourceConnectorName":"PinBLink_4",
-    "SinkConnectorName":"PinBLink_3",
-    "SourceArrowSymbol":"None",
-    "SinkArrowSymbol":"None",
-    "zIndex":0
-  },
-  {
-    "ID":"68ee8185-2d03-4faa-8e78-ce2cc0096519",
-    "SourceID":"6707ee78-f6da-4d84-9200-31b78755d834",
-    "SinkID":"3e1cc049-a16b-4ff1-acb4-8d890a36ec05",
-    "SourceConnectorName":"PinBLink_4",
-    "SinkConnectorName":"PinBLink_5",
-    "SourceArrowSymbol":"None",
-    "SinkArrowSymbol":"None",
-    "zIndex":0
-  },
-  {
-    "ID":"5ab75fbf-6c96-442c-b0f7-9aad41612085",
-    "SourceID":"1e3146db-6097-4078-95ce-44a110623aff",
-    "SinkID":"3e1cc049-a16b-4ff1-acb4-8d890a36ec05",
-    "SourceConnectorName":"PinBLink_4",
-    "SinkConnectorName":"PinBLink_7",
-    "SourceArrowSymbol":"None",
-    "SinkArrowSymbol":"None",
-    "zIndex":0
-  },
-  {
-    "ID":"0fc4eff4-922c-4bbd-a045-ccc7d6672744",
-    "SourceID":"7de9425d-8359-496b-8b75-01769a7c565c",
-    "SinkID":"3e1cc049-a16b-4ff1-acb4-8d890a36ec05",
-    "SourceConnectorName":"PinBLink_4",
-    "SinkConnectorName":"PinBLink_9",
-    "SourceArrowSymbol":"None",
-    "SinkArrowSymbol":"None",
-    "zIndex":0
-  },
-  {
-    "ID":"e28f25f6-d6c2-47f0-8ae5-4a1f9fcef276",
-    "SourceID":"ecfdcf62-61b4-43bf-8afe-1b86413493b6",
-    "SinkID":"3e1cc049-a16b-4ff1-acb4-8d890a36ec05",
-    "SourceConnectorName":"PinBLink_4",
-    "SinkConnectorName":"PinBLink_11",
-    "SourceArrowSymbol":"None",
-    "SinkArrowSymbol":"None",
-    "zIndex":0
-  },
-  {
-    "ID":"9ea15398-a5a9-4d11-b537-c548973683d5",
-    "SourceID":"20f301e8-0ea8-4dba-98e8-08c162eae703",
-    "SinkID":"3e1cc049-a16b-4ff1-acb4-8d890a36ec05",
-    "SourceConnectorName":"PinBLink_4",
-    "SinkConnectorName":"PinBLink_13",
-    "SourceArrowSymbol":"None",
-    "SinkArrowSymbol":"None",
-    "zIndex":0
-  },
-  {
-    "ID":"3e39e62e-3070-41bc-80b6-a415d588148e",
-    "SourceID":"5ab3fa4c-c06e-432e-b554-6554ef175290",
-    "SinkID":"0f6115ad-8ca8-4019-bcb3-45021e96d152",
-    "SourceConnectorName":"PinBLink_4",
-    "SinkConnectorName":"PinBLink_6",
-    "SourceArrowSymbol":"None",
-    "SinkArrowSymbol":"None",
-    "zIndex":0
-  },
-  {
-    "ID":"82505027-c679-4a53-8929-0f8796298f74",
-    "SourceID":"d68f5a97-0ac8-43a6-8a72-acf3433a45ae",
-    "SinkID":"0f6115ad-8ca8-4019-bcb3-45021e96d152",
-    "SourceConnectorName":"PinBLink_4",
-    "SinkConnectorName":"PinBLink_8",
-    "SourceArrowSymbol":"None",
-    "SinkArrowSymbol":"None",
-    "zIndex":0
-  },
-  {
-    "ID":"14c4b7a0-bbab-4dab-b665-b9bb252b2cb5",
-    "SourceID":"f1385949-8ea2-4a26-bcd7-11625037765a",
-    "SinkID":"0f6115ad-8ca8-4019-bcb3-45021e96d152",
-    "SourceConnectorName":"PinBLink_4",
-    "SinkConnectorName":"PinBLink_16",
-    "SourceArrowSymbol":"None",
-    "SinkArrowSymbol":"None",
-    "zIndex":0
-  },
-  {
-    "ID":"4a0fc20b-1631-4435-b8d6-a1a284a935c9",
-    "SourceID":"752b4769-d801-4aeb-bb8b-b4c2a363f0dd",
-    "SinkID":"0f6115ad-8ca8-4019-bcb3-45021e96d152",
-    "SourceConnectorName":"PinBLink_4",
-    "SinkConnectorName":"PinBLink_14",
-    "SourceArrowSymbol":"None",
-    "SinkArrowSymbol":"None",
-    "zIndex":0
-  },
-  {
-    "ID":"7de44af7-4a6b-4f7c-86b7-f3ae7820f906",
-    "SourceID":"fb6cdd16-b4f6-4fac-b6bf-f93854f77179",
-    "SinkID":"0f6115ad-8ca8-4019-bcb3-45021e96d152",
-    "SourceConnectorName":"PinBLink_4",
-    "SinkConnectorName":"PinBLink_12",
-    "SourceArrowSymbol":"None",
-    "SinkArrowSymbol":"None",
-    "zIndex":0
-  },
-  {
-    "ID":"ae9d52d1-9a98-492b-a7dc-2cd0574c1061",
-    "SourceID":"7ae19651-bf00-402e-b52c-c4b959083061",
-    "SinkID":"0f6115ad-8ca8-4019-bcb3-45021e96d152",
-    "SourceConnectorName":"PinBLink_4",
-    "SinkConnectorName":"PinBLink_10",
-    "SourceArrowSymbol":"None",
-    "SinkArrowSymbol":"None",
-    "zIndex":0
-  },
-  {
-    "ID":"8f301302-622e-450b-af41-3b3337bbcfb4",
-    "SourceID":"f7aae46b-5fae-45a1-9f1b-386007549589",
-    "SinkID":"0f6115ad-8ca8-4019-bcb3-45021e96d152",
-    "SourceConnectorName":"PinBLink_1",
-    "SinkConnectorName":"PinBLink_20",
-    "SourceArrowSymbol":"None",
-    "SinkArrowSymbol":"None",
-    "zIndex":0
-  },
-  {
-    "ID":"65e0bfe2-8fdb-4a7c-b43b-aaf55d6bca85",
-    "SourceID":"50ed4566-ba0c-424b-b351-cceed4e195ca",
-    "SinkID":"0f6115ad-8ca8-4019-bcb3-45021e96d152",
-    "SourceConnectorName":"PinBLink_1",
-    "SinkConnectorName":"PinBLink_22",
-    "SourceArrowSymbol":"None",
-    "SinkArrowSymbol":"None",
-    "zIndex":0
-  },
-  {
-    "ID":"7a7f566f-567e-416e-ba3e-94b90886cb1b",
-    "SourceID":"0f6115ad-8ca8-4019-bcb3-45021e96d152",
-    "SinkID":"55231414-783a-4c98-9d5e-beec72099233",
-    "SourceConnectorName":"PinBLink_3",
-    "SinkConnectorName":"PinBLink_1",
-    "SourceArrowSymbol":"None",
-    "SinkArrowSymbol":"None",
-    "zIndex":0
-  },
-  {
-    "ID":"b3c1b5e5-369e-4684-b5e8-68ea3153129c",
-    "SourceID":"0f6115ad-8ca8-4019-bcb3-45021e96d152",
-    "SinkID":"1658622e-193c-45dd-b35e-6c41863183c4",
-    "SourceConnectorName":"PinBLink_5",
-    "SinkConnectorName":"PinBLink_1",
-    "SourceArrowSymbol":"None",
-    "SinkArrowSymbol":"None",
-    "zIndex":0
-  },
-  {
-    "ID":"f594fda2-7a3f-4ad8-9386-b6acc9456af1",
-    "SourceID":"0f6115ad-8ca8-4019-bcb3-45021e96d152",
-    "SinkID":"d710b9cf-f339-4601-88d1-e751eeb30ba0",
-    "SourceConnectorName":"PinBLink_7",
-    "SinkConnectorName":"PinBLink_1",
-    "SourceArrowSymbol":"None",
-    "SinkArrowSymbol":"None",
-    "zIndex":0
-  },
-  {
-    "ID":"f6cb2d71-7591-455f-b0ef-fd32fb5cf876",
-    "SourceID":"0f6115ad-8ca8-4019-bcb3-45021e96d152",
-    "SinkID":"2d027898-dfd3-4a02-ae48-c1e57ae4f69b",
-    "SourceConnectorName":"PinBLink_9",
-    "SinkConnectorName":"PinBLink_1",
-    "SourceArrowSymbol":"None",
-    "SinkArrowSymbol":"None",
-    "zIndex":0
-  },
-  {
-    "ID":"f5a8ac63-2a00-42d4-bc70-1a733396ab1a",
-    "SourceID":"0f6115ad-8ca8-4019-bcb3-45021e96d152",
-    "SinkID":"39f69b7d-d7de-4246-b18b-7a9533633f85",
-    "SourceConnectorName":"PinBLink_11",
-    "SinkConnectorName":"PinBLink_1",
-    "SourceArrowSymbol":"None",
-    "SinkArrowSymbol":"None",
-    "zIndex":0
-  },
-  {
-    "ID":"2b2714d5-66c5-4970-a6e2-c6c2eab79ad7",
-    "SourceID":"0f6115ad-8ca8-4019-bcb3-45021e96d152",
-    "SinkID":"15fefce0-5abf-49b5-b6ec-98ef5bf19b21",
-    "SourceConnectorName":"PinBLink_13",
-    "SinkConnectorName":"PinBLink_1",
-    "SourceArrowSymbol":"None",
-    "SinkArrowSymbol":"None",
-    "zIndex":0
-  },
-  {
-    "ID":"a9c7533b-6223-471b-ba52-2ca924d7fdd6",
-    "SourceID":"c645efb0-df1e-4a75-81ec-95440011c7d8",
-    "SinkID":"ea82121c-b610-4ba5-a516-368eda30c9a1",
-    "SourceConnectorName":"PinBLink_1",
-    "SinkConnectorName":"PinBLink_1",
-    "SourceArrowSymbol":"None",
-    "SinkArrowSymbol":"None",
-    "zIndex":0
-  },
-  {
-    "ID":"0806caea-098e-406a-a6c2-f485cba215e0",
-    "SourceID":"c645efb0-df1e-4a75-81ec-95440011c7d8",
-    "SinkID":"759852f8-9837-47b2-8d52-31a3884ff0c3",
-    "SourceConnectorName":"PinBLink_2",
-    "SinkConnectorName":"PinBLink_1",
-    "SourceArrowSymbol":"None",
-    "SinkArrowSymbol":"None",
-    "zIndex":0
-  },
-  {
-    "ID":"7e747473-ad70-4c81-8a2e-6bda9c16abdf",
-    "SourceID":"b4742328-18cc-4b18-a4ee-af2c19023dff",
-    "SinkID":"7de9425d-8359-496b-8b75-01769a7c565c",
-    "SourceConnectorName":"PinBLink_1",
-    "SinkConnectorName":"PinBLink_2",
-    "SourceArrowSymbol":"None",
-    "SinkArrowSymbol":"None",
-    "zIndex":0
-  },
-  {
-    "ID":"c1c343c8-0151-4631-b21b-5d55beba2b56",
-    "SourceID":"049f62c7-6ff7-4dca-845f-2fa5fa3d16e2",
-    "SinkID":"ecfdcf62-61b4-43bf-8afe-1b86413493b6",
-    "SourceConnectorName":"PinBLink_1",
-    "SinkConnectorName":"PinBLink_3",
-    "SourceArrowSymbol":"None",
-    "SinkArrowSymbol":"None",
-    "zIndex":0
-  },
-  {
-    "ID":"f6450dde-db99-46d7-b30c-4b98ef427a41",
-    "SourceID":"d19a38b9-75eb-4c8e-a162-2e4aa4b758b2",
-    "SinkID":"3e1cc049-a16b-4ff1-acb4-8d890a36ec05",
-    "SourceConnectorName":"PinBLink_4",
-    "SinkConnectorName":"PinBLink_2",
-    "SourceArrowSymbol":"None",
-    "SinkArrowSymbol":"None",
-    "zIndex":0
-  },
-  {
-    "ID":"f179f739-3186-489b-8fe3-b7fd14e00f70",
-    "SourceID":"43706d43-079c-4d51-a195-f04b3e5f9e85",
-    "SinkID":"5ab3fa4c-c06e-432e-b554-6554ef175290",
-    "SourceConnectorName":"PinBLink_1",
-    "SinkConnectorName":"PinBLink_2",
-    "SourceArrowSymbol":"None",
-    "SinkArrowSymbol":"None",
-    "zIndex":0
-  }
-]

+ 0 - 1
outApp/HelloWorld-win32-x64/resources/app/static/data/EnityView.json

@@ -1 +0,0 @@
-[]

+ 0 - 376
outApp/HelloWorld-win32-x64/resources/app/static/data/EnityWindow.json

@@ -1,376 +0,0 @@
-[
-  {
-    "ID":"64a2f252-370a-4bc6-a817-3397f8abb4dc",
-    "IsVisibility":true,
-    "IsLock":false,
-    "Name":"主页",
-    "IsMain":true,
-    "ShowActionList":[
-
-    ],
-    "HideActionList":[
-
-    ],
-    "BackIconObjID":"156",
-    "BackIcon":"156.png",
-    "IsRunVisiable":true,
-    "BrackgroupStr":"#FF272634",
-    "WinType":0,
-    "ClientId":null,
-    "IsShow":false,
-    "Code":"64a2f252-370a-4bc6-a817-3397f8abb4dc",
-    "IsPanel":true,
-    "EnityName":"Window",
-    "ActionType":3,
-    "Left":0,
-    "Top":0,
-    "Width":1024,
-    "Height":768,
-    "ZIndex":0,
-    "GroupNumber":"",
-    "isSyn":false,
-    "WindowID":null,
-    "PanelID":null,
-    "IsWindow":true
-  },
-  {
-    "ID":"cb2687fd-931a-4b38-a76d-9c3ea171b8d8",
-    "IsVisibility":false,
-    "IsLock":false,
-    "Name":"音频控制",
-    "IsMain":false,
-    "ShowActionList":[
-
-    ],
-    "HideActionList":[
-
-    ],
-    "BackIconObjID":"",
-    "BackIcon":null,
-    "IsRunVisiable":true,
-    "BrackgroupStr":"#00FFFFFF",
-    "WinType":0,
-    "ClientId":null,
-    "IsShow":false,
-    "Code":"cb2687fd-931a-4b38-a76d-9c3ea171b8d8",
-    "IsPanel":true,
-    "EnityName":"Window",
-    "ActionType":3,
-    "Left":128,
-    "Top":440,
-    "Width":691,
-    "Height":282,
-    "ZIndex":10000,
-    "GroupNumber":"1",
-    "isSyn":false,
-    "WindowID":null,
-    "PanelID":null,
-    "IsWindow":true
-  },
-  {
-    "ID":"b7872c9a-45ec-46c6-a388-f8d364a9f2d7",
-    "IsVisibility":false,
-    "IsLock":false,
-    "Name":"V1",
-    "IsMain":false,
-    "ShowActionList":[
-
-    ],
-    "HideActionList":[
-
-    ],
-    "BackIconObjID":"132",
-    "BackIcon":"132.png",
-    "IsRunVisiable":false,
-    "BrackgroupStr":"#FFF0F8FF",
-    "WinType":0,
-    "ClientId":null,
-    "IsShow":false,
-    "Code":"b7872c9a-45ec-46c6-a388-f8d364a9f2d7",
-    "IsPanel":true,
-    "EnityName":"Window",
-    "ActionType":3,
-    "Left":0,
-    "Top":0,
-    "Width":1920,
-    "Height":1080,
-    "ZIndex":20000,
-    "GroupNumber":"",
-    "isSyn":false,
-    "WindowID":null,
-    "PanelID":null,
-    "IsWindow":true
-  },
-  {
-    "ID":"027ab76d-6b9c-46ac-abe6-75b8059f786b",
-    "IsVisibility":false,
-    "IsLock":false,
-    "Name":"摄像机控制",
-    "IsMain":false,
-    "ShowActionList":[
-
-    ],
-    "HideActionList":[
-
-    ],
-    "BackIconObjID":"",
-    "BackIcon":null,
-    "IsRunVisiable":true,
-    "BrackgroupStr":"#00FFFFFF",
-    "WinType":0,
-    "ClientId":null,
-    "IsShow":false,
-    "Code":"027ab76d-6b9c-46ac-abe6-75b8059f786b",
-    "IsPanel":true,
-    "EnityName":"Window",
-    "ActionType":3,
-    "Left":103,
-    "Top":449,
-    "Width":695,
-    "Height":279,
-    "ZIndex":30000,
-    "GroupNumber":"1",
-    "isSyn":false,
-    "WindowID":null,
-    "PanelID":null,
-    "IsWindow":true
-  },
-  {
-    "ID":"9a0dff23-8633-4e7f-89bf-cc4f68ec88e1",
-    "IsVisibility":true,
-    "IsLock":false,
-    "Name":"LED智慧屏",
-    "IsMain":false,
-    "ShowActionList":[
-
-    ],
-    "HideActionList":[
-
-    ],
-    "BackIconObjID":"",
-    "BackIcon":null,
-    "IsRunVisiable":false,
-    "BrackgroupStr":"#00FFFFFF",
-    "WinType":0,
-    "ClientId":null,
-    "IsShow":false,
-    "Code":"9a0dff23-8633-4e7f-89bf-cc4f68ec88e1",
-    "IsPanel":true,
-    "EnityName":"Window",
-    "ActionType":3,
-    "Left":112,
-    "Top":40,
-    "Width":706,
-    "Height":402,
-    "ZIndex":40000,
-    "GroupNumber":"2",
-    "isSyn":false,
-    "WindowID":null,
-    "PanelID":null,
-    "IsWindow":true
-  },
-  {
-    "ID":"d80a8b6e-9f88-41ff-b3a7-1ff8d6ee37a5",
-    "IsVisibility":true,
-    "IsLock":false,
-    "Name":"电源控制",
-    "IsMain":false,
-    "ShowActionList":[
-
-    ],
-    "HideActionList":[
-
-    ],
-    "BackIconObjID":"",
-    "BackIcon":null,
-    "IsRunVisiable":false,
-    "BrackgroupStr":"#00FFFFFF",
-    "WinType":0,
-    "ClientId":null,
-    "IsShow":false,
-    "Code":"d80a8b6e-9f88-41ff-b3a7-1ff8d6ee37a5",
-    "IsPanel":true,
-    "EnityName":"Window",
-    "ActionType":3,
-    "Left":121,
-    "Top":445,
-    "Width":690,
-    "Height":274,
-    "ZIndex":50000,
-    "GroupNumber":"1",
-    "isSyn":false,
-    "WindowID":null,
-    "PanelID":null,
-    "IsWindow":true
-  },
-  {
-    "ID":"a12b287f-f68c-4efa-b652-d6e5b0a09d0d",
-    "IsVisibility":false,
-    "IsLock":false,
-    "Name":"环境控制",
-    "IsMain":false,
-    "ShowActionList":[
-
-    ],
-    "HideActionList":[
-
-    ],
-    "BackIconObjID":"",
-    "BackIcon":null,
-    "IsRunVisiable":false,
-    "BrackgroupStr":"#00FFFFFF",
-    "WinType":0,
-    "ClientId":null,
-    "IsShow":false,
-    "Code":"a12b287f-f68c-4efa-b652-d6e5b0a09d0d",
-    "IsPanel":true,
-    "EnityName":"Window",
-    "ActionType":3,
-    "Left":124,
-    "Top":443,
-    "Width":692,
-    "Height":278,
-    "ZIndex":60000,
-    "GroupNumber":"1",
-    "isSyn":false,
-    "WindowID":null,
-    "PanelID":null,
-    "IsWindow":true
-  },
-  {
-    "ID":"d9868551-b579-4258-9bc7-7c1f733773f5",
-    "IsVisibility":false,
-    "IsLock":false,
-    "Name":"电脑控制",
-    "IsMain":false,
-    "ShowActionList":[
-
-    ],
-    "HideActionList":[
-
-    ],
-    "BackIconObjID":"182",
-    "BackIcon":"182.png",
-    "IsRunVisiable":false,
-    "BrackgroupStr":"#00FFFFFF",
-    "WinType":0,
-    "ClientId":null,
-    "IsShow":false,
-    "Code":"d9868551-b579-4258-9bc7-7c1f733773f5",
-    "IsPanel":true,
-    "EnityName":"Window",
-    "ActionType":3,
-    "Left":124,
-    "Top":445,
-    "Width":696,
-    "Height":277,
-    "ZIndex":70000,
-    "GroupNumber":"1",
-    "isSyn":false,
-    "WindowID":null,
-    "PanelID":null,
-    "IsWindow":true
-  },
-  {
-    "ID":"08208721-41cc-4f1e-937b-3a1627389049",
-    "IsVisibility":false,
-    "IsLock":false,
-    "Name":"拼接屏",
-    "IsMain":false,
-    "ShowActionList":[
-
-    ],
-    "HideActionList":[
-
-    ],
-    "BackIconObjID":"",
-    "BackIcon":null,
-    "IsRunVisiable":true,
-    "BrackgroupStr":"#00FFFFFF",
-    "WinType":0,
-    "ClientId":null,
-    "IsShow":false,
-    "Code":"08208721-41cc-4f1e-937b-3a1627389049",
-    "IsPanel":true,
-    "EnityName":"Window",
-    "ActionType":3,
-    "Left":128,
-    "Top":44,
-    "Width":685,
-    "Height":402,
-    "ZIndex":80000,
-    "GroupNumber":"2",
-    "isSyn":false,
-    "WindowID":null,
-    "PanelID":null,
-    "IsWindow":true
-  },
-  {
-    "ID":"ab842585-0c91-4e65-bfed-a219bcaaeb43",
-    "IsVisibility":false,
-    "IsLock":false,
-    "Name":"投影机",
-    "IsMain":false,
-    "ShowActionList":[
-
-    ],
-    "HideActionList":[
-
-    ],
-    "BackIconObjID":"",
-    "BackIcon":null,
-    "IsRunVisiable":true,
-    "BrackgroupStr":"#00FFFFFF",
-    "WinType":0,
-    "ClientId":null,
-    "IsShow":false,
-    "Code":"ab842585-0c91-4e65-bfed-a219bcaaeb43",
-    "IsPanel":true,
-    "EnityName":"Window",
-    "ActionType":3,
-    "Left":125,
-    "Top":38,
-    "Width":705,
-    "Height":406,
-    "ZIndex":90000,
-    "GroupNumber":"2",
-    "isSyn":false,
-    "WindowID":null,
-    "PanelID":null,
-    "IsWindow":true
-  },
-  {
-    "ID":"6bee9008-ccd6-49e1-864d-3b9b73d3a61b",
-    "IsVisibility":false,
-    "IsLock":false,
-    "Name":"电源提示",
-    "IsMain":false,
-    "ShowActionList":[
-
-    ],
-    "HideActionList":[
-
-    ],
-    "BackIconObjID":"200",
-    "BackIcon":"200.png",
-    "IsRunVisiable":false,
-    "BrackgroupStr":"#FF272634",
-    "WinType":0,
-    "ClientId":null,
-    "IsShow":false,
-    "Code":"6bee9008-ccd6-49e1-864d-3b9b73d3a61b",
-    "IsPanel":true,
-    "EnityName":"Window",
-    "ActionType":3,
-    "Left":144,
-    "Top":60,
-    "Width":618,
-    "Height":306,
-    "ZIndex":100000,
-    "GroupNumber":"",
-    "isSyn":false,
-    "WindowID":null,
-    "PanelID":null,
-    "IsWindow":true
-  }
-]

+ 4 - 10
outApp/HelloWorld-win32-x64/resources/app/yarn.lock

@@ -595,13 +595,12 @@ aws4@^1.8.0:
   resolved "https://registry.yarnpkg.com/aws4/-/aws4-1.9.1.tgz#7e33d8f7d449b3f673cd72deb9abdc552dbe528e"
   integrity sha512-wMHVg2EOHaMRxbzgFJ9gtjOOCrI80OHLG14rxi28XwOW8ux6IiEbRCGGGqCtdAIg4FQCbW20k9RsT4y3gJlFug==
 
-axios@^0.18.0:
-  version "0.18.1"
-  resolved "https://registry.yarnpkg.com/axios/-/axios-0.18.1.tgz#ff3f0de2e7b5d180e757ad98000f1081b87bcea3"
-  integrity sha512-0BfJq4NSfQXd+SkFdrvFbG7addhYSBA2mQwISr46pD6E5iqkWg02RAs8vyTT/j0RTnoYmeXauBuSv1qKwR179g==
+axios@^0.19.2:
+  version "0.19.2"
+  resolved "https://registry.yarnpkg.com/axios/-/axios-0.19.2.tgz#3ea36c5d8818d0d5f8a8a97a6d36b86cdc00cb27"
+  integrity sha512-fjgm5MvRHLhx+osE2xoekY70AhARk3a6hkN+3Io1jc00jtquGvxYlKlsFUhmUET0V5te6CcZI7lcv2Ym61mjHA==
   dependencies:
     follow-redirects "1.5.10"
-    is-buffer "^2.0.2"
 
 babel-code-frame@^6.26.0:
   version "6.26.0"
@@ -4609,11 +4608,6 @@ is-buffer@^1.0.2, is-buffer@^1.1.5:
   resolved "https://registry.yarnpkg.com/is-buffer/-/is-buffer-1.1.6.tgz#efaa2ea9daa0d7ab2ea13a97b2b8ad51fefbe8be"
   integrity sha512-NcdALwpXkTm5Zvvbk7owOUSvVvBKDgKP5/ewfXEznmQFfs4ZRmanOeKBTjRVjka3QFoN6XJ+9F3USqfHqTaU5w==
 
-is-buffer@^2.0.2:
-  version "2.0.4"
-  resolved "https://registry.yarnpkg.com/is-buffer/-/is-buffer-2.0.4.tgz#3e572f23c8411a5cfd9557c849e3665e0b290623"
-  integrity sha512-Kq1rokWXOPXWuaMAqZiJW4XxsmD9zGx9q4aePabbn3qCRGedtH7Cm+zV8WETitMfu1wdh+Rvd6w5egwSngUX2A==
-
 is-callable@^1.1.4, is-callable@^1.1.5:
   version "1.1.5"
   resolved "https://registry.yarnpkg.com/is-callable/-/is-callable-1.1.5.tgz#f7e46b596890456db74e7f6e976cb3273d06faab"

+ 1 - 1
package.json

@@ -15,7 +15,7 @@
     "pack:main": "cross-env NODE_ENV=production webpack --progress --colors --config .electron-vue/webpack.main.config.js",
     "pack:renderer": "cross-env NODE_ENV=production webpack --progress --colors --config .electron-vue/webpack.renderer.config.js",
     "postinstall": "",
-    "packager": "electron-packager ./ HelloWorld --win=x64 --out ./outApp  --overwrite --icon=./build/icons/icon.ico"
+    "packager": "electron-packager ./ VedioApp --win=x64 --out ./outApp  --overwrite --icon=./build/icons/icon.ico"
   },
   "build": {
     "productName": "vedio_app",

+ 1 - 1
src/renderer/assets/less/login.less

@@ -19,7 +19,7 @@
 .login {
   width: 100%;
   height: 980px;
-  //background-color: @BrackgroupStr;
+  background-color: @BrackgroupStr;
   background-size: 100% 100%;
   position: relative;
 

+ 29 - 23
src/renderer/components/Login.vue

@@ -1,12 +1,12 @@
 <!--登录界面-->
 <template>
-    <div class="login">
-        <header class="login-header" :style="{background:loginJson[0].BrackgroupStr}">
+    <div class="login" :style="loginStyle">
+        <header class="login-header" >
             <h1>分布式视频处理系统</h1>
         </header>
 
-        <section class="login-content">
-            <h2>用户登录</h2>
+        <section class="login-content" :style="loginContentStyle">
+            <h2 :style="{fontSize:loginJson[0].FontSize}">用户登录</h2>
             <el-form :model="ruleForm" status-icon :rules="rules" ref="ruleForm" label-width="55px" class="login-form">
                 <el-form-item label="用户名" prop="username">
                     <el-input v-model="ruleForm.username" prefix-icon="el-icon-user"></el-input>
@@ -24,7 +24,6 @@
 </template>
 
 <script>
-    import '../assets/less/login.less'
     import loginJson from '../../../static/EnityLogin'
 
     export default {
@@ -52,7 +51,20 @@
                         { validator: validatePasswrod, trigger: 'blur' }
                     ]
                 },
-                loginJson
+                loginJson,
+                loginStyle: {
+                    "background": loginJson[0].BrackgroupStr,
+                    "font-size":loginJson[0].FontSize
+                },
+                loginContentStyle: {
+                    "width": loginJson[0].Width + 'px',
+                    "height": loginJson[0].Height + 'px',
+                    "background-color": loginJson[0].ForegroundStr,
+                    "border": `1px solid ${loginJson[0].BorderStr}`,
+                    "left":loginJson[0].Left + 'px',
+                    "top":loginJson[0].Top + 'px',
+                    "z-index": loginJson[0].ZIndex
+                }
             }
         },
 
@@ -82,48 +94,42 @@
 </script>
 
 <style lang="less">
-
-    /*.login {
+    .login {
         width: 100%;
         height: 980px;
-        background-image: url('../assets/images/bg.jpg');
         background-size: 100% 100%;
+        position: relative;
 
         .login-header {
             display: flex;
             align-items: center;
             height: 80px;
             background-color: rgba(21, 20, 13, 0.5);
-            img {
-                width: 40px;
-                height: 40px;
-                margin: 0 15px 0 50px;
-            }
             h1 {
-                font-size: 30px;
                 color: white;
                 margin-left:20px;
             }
         }
 
         .login-content {
-            width: 400px;
-            height: 300px;
-            background-color: #fff;
-            margin: 50px auto;
-            padding: 20px 40px;
-            border-radius: 2px;
+
+            position: absolute;
+
             h2 {
                 text-align: center;
-                font-size: 30px;
                 font-weight:bold;
                 margin-bottom: 20px;
             }
+
+            .el-input {
+                width:90%;
+            }
+
             .login-form {
                 .login-form-button {
                     width: 100%;
                 }
             }
         }
-    }*/
+    }
 </style>

+ 4 - 4
static/EnityLogin.json

@@ -1,10 +1,10 @@
 [
     {
         "IsBorder":true,
-        "BorderStr":"#FFFFFFFF",
-        "ForegroundStr":"#FFD6D6D6",
-        "BTNForegroundStr":"#FF000000",
-        "BrackgroupStr":"#ff0000",
+        "BorderStr":"#FFFFFF",
+        "ForegroundStr":"#D6D6D6",
+        "BTNForegroundStr":"#000000",
+        "BrackgroupStr":"#03A9F4",
         "BackIconObjID":"",
         "BackIcon":null,
         "ActionIconObjID":"",