Forráskód Böngészése

不让label文本自动换行

liuwei 4 éve
szülő
commit
3202cd8ef1
100 módosított fájl, 21 hozzáadás és 20094 törlés
  1. 4 3
      src/renderer/components/Label.vue
  2. BIN
      static/Data/1.jpg
  3. BIN
      static/Data/2.jpg
  4. BIN
      static/Data/3.jpg
  5. 1 230
      static/Data/EnityBigScreen.Data
  6. 1 4911
      static/Data/EnityButton.Data
  7. 1 8608
      static/Data/EnityDevice.Data
  8. 1 4182
      static/Data/EnityIcon.Data
  9. 1 170
      static/Data/EnityImage.Data
  10. 1 427
      static/Data/EnityLable.Data
  11. 1 35
      static/Data/EnityLogin.Data
  12. 1 24
      static/Data/EnityMemory.Data
  13. 1 106
      static/Data/EnitySignalPreviewList.Data
  14. 1 230
      static/Data/EnitySlider.Data
  15. 1 7
      static/Data/EnitySystem.data
  16. 1 16
      static/Data/EnityTimer.Data
  17. 1 346
      static/Data/EnityTopology.Data
  18. 1 422
      static/Data/EnityTopologyConnection.Data
  19. 1 1
      static/Data/EnityView.Data
  20. 1 376
      static/Data/EnityWindow.Data
  21. 1 0
      static/Data/新测试项目.prj
  22. 0 0
      static/Data1/1.png
  23. 0 0
      static/Data1/10.png
  24. 0 0
      static/Data1/100.png
  25. 0 0
      static/Data1/101.png
  26. 0 0
      static/Data1/102.png
  27. 0 0
      static/Data1/103.png
  28. 0 0
      static/Data1/104.png
  29. 0 0
      static/Data1/105.png
  30. 0 0
      static/Data1/106.png
  31. 0 0
      static/Data1/107.png
  32. 0 0
      static/Data1/108.png
  33. 0 0
      static/Data1/109.png
  34. 0 0
      static/Data1/11.png
  35. 0 0
      static/Data1/110.png
  36. 0 0
      static/Data1/111.png
  37. 0 0
      static/Data1/112.png
  38. 0 0
      static/Data1/113.png
  39. 0 0
      static/Data1/114.png
  40. 0 0
      static/Data1/115.png
  41. 0 0
      static/Data1/116.png
  42. 0 0
      static/Data1/117.png
  43. 0 0
      static/Data1/118.png
  44. 0 0
      static/Data1/119.png
  45. 0 0
      static/Data1/12.png
  46. 0 0
      static/Data1/120.png
  47. 0 0
      static/Data1/121.png
  48. 0 0
      static/Data1/122.png
  49. 0 0
      static/Data1/123.png
  50. 0 0
      static/Data1/124.png
  51. 0 0
      static/Data1/125.png
  52. 0 0
      static/Data1/126.png
  53. 0 0
      static/Data1/127.png
  54. 0 0
      static/Data1/128.png
  55. 0 0
      static/Data1/129.png
  56. 0 0
      static/Data1/13.png
  57. 0 0
      static/Data1/130.png
  58. 0 0
      static/Data1/131.png
  59. 0 0
      static/Data1/132.png
  60. 0 0
      static/Data1/133.png
  61. 0 0
      static/Data1/134.png
  62. 0 0
      static/Data1/135.png
  63. 0 0
      static/Data1/136.png
  64. 0 0
      static/Data1/137.png
  65. 0 0
      static/Data1/138.png
  66. 0 0
      static/Data1/139.png
  67. 0 0
      static/Data1/14.png
  68. 0 0
      static/Data1/140.png
  69. 0 0
      static/Data1/141.png
  70. 0 0
      static/Data1/142.png
  71. 0 0
      static/Data1/143.png
  72. 0 0
      static/Data1/144.png
  73. 0 0
      static/Data1/145.png
  74. 0 0
      static/Data1/146.png
  75. 0 0
      static/Data1/147.png
  76. 0 0
      static/Data1/148.png
  77. 0 0
      static/Data1/149.png
  78. 0 0
      static/Data1/15.png
  79. 0 0
      static/Data1/150.png
  80. 0 0
      static/Data1/151.png
  81. 0 0
      static/Data1/152.png
  82. 0 0
      static/Data1/153.png
  83. 0 0
      static/Data1/154.png
  84. 0 0
      static/Data1/155.png
  85. 0 0
      static/Data1/156.png
  86. 0 0
      static/Data1/157.png
  87. 0 0
      static/Data1/158.png
  88. 0 0
      static/Data1/159.png
  89. 0 0
      static/Data1/16.png
  90. 0 0
      static/Data1/160.png
  91. 0 0
      static/Data1/161.png
  92. 0 0
      static/Data1/162.png
  93. 0 0
      static/Data1/163.png
  94. 0 0
      static/Data1/164.png
  95. 0 0
      static/Data1/165.png
  96. 0 0
      static/Data1/166.png
  97. 0 0
      static/Data1/167.png
  98. 0 0
      static/Data1/168.png
  99. 0 0
      static/Data1/169.png
  100. 0 0
      static/Data/17.png

+ 4 - 3
src/renderer/components/Label.vue

@@ -2,12 +2,12 @@
 
 <template>
     <div>
-        <label v-for="item in labelJson"
+        <div v-for="item in labelJson"
                :style="{
-                 fontSize:item.FontSize*bigScale + 'px',
                  position:'absolute',
                  left:item.Left*bigScale+'px',
                  top:item.Top*bigScale+'px',
+                 fontSize:item.FontSize*bigScale + 'px',
                  width:item.Width*bigScale + 'px',
                  height:item.Height*bigScale + 'px',
                  zIndex:item.ZIndex,
@@ -15,9 +15,10 @@
                  color:`#${item.ForegroundStr.slice(3)}`,
                  textAlign:'center',
                  lineHeight:item.Height*bigScale + 'px',
+                 whiteSpace:'nowrap'
             }">
             {{item.Text}}
-        </label>
+        </div>
     </div>
 </template>
 

BIN
static/Data/1.jpg


BIN
static/Data/2.jpg


BIN
static/Data/3.jpg


A különbségek nem kerülnek megjelenítésre, a fájl túl nagy
+ 1 - 230
static/Data/EnityBigScreen.Data


A különbségek nem kerülnek megjelenítésre, a fájl túl nagy
+ 1 - 4911
static/Data/EnityButton.Data


A különbségek nem kerülnek megjelenítésre, a fájl túl nagy
+ 1 - 8608
static/Data/EnityDevice.Data


A különbségek nem kerülnek megjelenítésre, a fájl túl nagy
+ 1 - 4182
static/Data/EnityIcon.Data


A különbségek nem kerülnek megjelenítésre, a fájl túl nagy
+ 1 - 170
static/Data/EnityImage.Data


A különbségek nem kerülnek megjelenítésre, a fájl túl nagy
+ 1 - 427
static/Data/EnityLable.Data


+ 1 - 35
static/Data/EnityLogin.Data

@@ -1,35 +1 @@
-[
-    {
-        "IsBorder":true,
-        "BorderStr":"#FFFFFFFF",
-        "ForegroundStr":"#FFD6D6D6",
-        "BTNForegroundStr":"#FF000000",
-        "BrackgroupStr":"#FF03A9F4",
-        "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
-    }
-]
+[]

+ 1 - 24
static/Data/EnityMemory.Data

@@ -1,24 +1 @@
-[
-  {
-    "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
-  }
-]
+[{"ID":"01","Code":"01","Name":"LoginUser","isInt":false,"Value":null,"IsSyn":false,"IsSystem":true,"Mark":null,"ActionType":4},{"ID":"02","Code":"02","Name":"LoginRole","isInt":false,"Value":null,"IsSyn":false,"IsSystem":true,"Mark":null,"ActionType":4}]

A különbségek nem kerülnek megjelenítésre, a fájl túl nagy
+ 1 - 106
static/Data/EnitySignalPreviewList.Data


+ 1 - 230
static/Data/EnitySlider.Data

@@ -1,230 +1 @@
-[
-  {
-    "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
-  }
-]
+[]

+ 1 - 7
static/Data/EnitySystem.data

@@ -1,7 +1 @@
-{
-  "ServerIP":"http://112.74.78.188",
-  "ServerPort":8080,
-  "Users":[
-
-  ]
-}
+{"ServerIP":"http://112.74.78.188","ServerPort":8080,"Users":[]}

+ 1 - 16
static/Data/EnityTimer.Data

@@ -1,16 +1 @@
-[
-  {
-    "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
-  }
-]
+[]

A különbségek nem kerülnek megjelenítésre, a fájl túl nagy
+ 1 - 346
static/Data/EnityTopology.Data


A különbségek nem kerülnek megjelenítésre, a fájl túl nagy
+ 1 - 422
static/Data/EnityTopologyConnection.Data


+ 1 - 1
static/Data/EnityView.Data

@@ -1 +1 @@
-[]
+[]

A különbségek nem kerülnek megjelenítésre, a fájl túl nagy
+ 1 - 376
static/Data/EnityWindow.Data


+ 1 - 0
static/Data/新测试项目.prj

@@ -0,0 +1 @@
+{"Name":"新测试项目","DevWidth":1920,"DevHeight":1080,"UIAdaption":0}

static/Data/1.png → static/Data1/1.png


static/Data/10.png → static/Data1/10.png


static/Data/100.png → static/Data1/100.png


static/Data/101.png → static/Data1/101.png


static/Data/102.png → static/Data1/102.png


static/Data/103.png → static/Data1/103.png


static/Data/104.png → static/Data1/104.png


static/Data/105.png → static/Data1/105.png


static/Data/106.png → static/Data1/106.png


static/Data/107.png → static/Data1/107.png


static/Data/108.png → static/Data1/108.png


static/Data/109.png → static/Data1/109.png


static/Data/11.png → static/Data1/11.png


static/Data/110.png → static/Data1/110.png


static/Data/111.png → static/Data1/111.png


static/Data/112.png → static/Data1/112.png


static/Data/113.png → static/Data1/113.png


static/Data/114.png → static/Data1/114.png


static/Data/115.png → static/Data1/115.png


static/Data/116.png → static/Data1/116.png


static/Data/117.png → static/Data1/117.png


static/Data/118.png → static/Data1/118.png


static/Data/119.png → static/Data1/119.png


static/Data/12.png → static/Data1/12.png


static/Data/120.png → static/Data1/120.png


static/Data/121.png → static/Data1/121.png


static/Data/122.png → static/Data1/122.png


static/Data/123.png → static/Data1/123.png


static/Data/124.png → static/Data1/124.png


static/Data/125.png → static/Data1/125.png


static/Data/126.png → static/Data1/126.png


static/Data/127.png → static/Data1/127.png


static/Data/128.png → static/Data1/128.png


static/Data/129.png → static/Data1/129.png


static/Data/13.png → static/Data1/13.png


static/Data/130.png → static/Data1/130.png


static/Data/131.png → static/Data1/131.png


static/Data/132.png → static/Data1/132.png


static/Data/133.png → static/Data1/133.png


static/Data/134.png → static/Data1/134.png


static/Data/135.png → static/Data1/135.png


static/Data/136.png → static/Data1/136.png


static/Data/137.png → static/Data1/137.png


static/Data/138.png → static/Data1/138.png


static/Data/139.png → static/Data1/139.png


static/Data/14.png → static/Data1/14.png


static/Data/140.png → static/Data1/140.png


static/Data/141.png → static/Data1/141.png


static/Data/142.png → static/Data1/142.png


static/Data/143.png → static/Data1/143.png


static/Data/144.png → static/Data1/144.png


static/Data/145.png → static/Data1/145.png


static/Data/146.png → static/Data1/146.png


static/Data/147.png → static/Data1/147.png


static/Data/148.png → static/Data1/148.png


static/Data/149.png → static/Data1/149.png


static/Data/15.png → static/Data1/15.png


static/Data/150.png → static/Data1/150.png


static/Data/151.png → static/Data1/151.png


static/Data/152.png → static/Data1/152.png


static/Data/153.png → static/Data1/153.png


static/Data/154.png → static/Data1/154.png


static/Data/155.png → static/Data1/155.png


static/Data/156.png → static/Data1/156.png


static/Data/157.png → static/Data1/157.png


static/Data/158.png → static/Data1/158.png


static/Data/159.png → static/Data1/159.png


static/Data/16.png → static/Data1/16.png


static/Data/160.png → static/Data1/160.png


static/Data/161.png → static/Data1/161.png


static/Data/162.png → static/Data1/162.png


static/Data/163.png → static/Data1/163.png


static/Data/164.png → static/Data1/164.png


static/Data/165.png → static/Data1/165.png


static/Data/166.png → static/Data1/166.png


static/Data/167.png → static/Data1/167.png


static/Data/168.png → static/Data1/168.png


static/Data/169.png → static/Data1/169.png


+ 0 - 0
static/Data/17.png


Nem az összes módosított fájl került megjelenítésre, mert túl sok fájl változott