Merge branch 'main' of github.com:le5le-com/visualization-design

src/services/defaults.ts

@@ -932,6 +932,16 @@ export const formComponents = [
           height: 30,
           name: 'text',
           text: '乐吾乐le5le - 大屏可视化',
+          textAutoAdjust: true,
+          props: {
+            custom: [
+              {
+                key: 'textAutoAdjust',
+                label: '文本自动大小',
+                type: 'bool',
+              },
+            ],
+          },
         },
       },
       {
@@ -1149,12 +1159,13 @@ export const formComponents = [
         name: '时间',
         icon: 'l-clock',
         data: {
-          name: 'leTime',
+          name: 'time',
           width: 300,
           height: 40,
           text: '当前时间',
+          lineWidth:0,
           timeFormat:
-            '`${year}年${month}月${day}日 ${hours}时${minutes}分${seconds}秒 星期${week}`',
+            '`${year}-${month}-${day} ${hours}:${minutes}:${seconds} 星期${week}`',
           props: {
             custom: [
               {
@@ -1162,6 +1173,11 @@ export const formComponents = [
                 label: '显示格式',
                 type: 'string',
               },
+              {
+                key: 'borderWidth',
+                label: '显示格式',
+                type: 'string',
+              },
             ],
           },
         },
@@ -1174,9 +1190,9 @@ export const formComponents = [
           width: 300,
           height: 40,
           text: '倒计时',
-          calculativeTime: '2023/9/23 00:00:00', //配置未来的时间
+          deadline: '2024/1/1 00:00:00', //配置未来的时间
           timeFormat:
-            '`距离杭州亚运会还有：${day}天${hours}时${minutes}分${seconds}秒`',
+            '`距离2024年还有：${day}天${hours}时${minutes}分${seconds}秒`',
           props: {
             custom: [
               {
@@ -1185,8 +1201,8 @@ export const formComponents = [
                 type: 'string',
               },
               {
-                key: 'calculativeTime',
-                label: '参考时间',
+                key: 'deadline',
+                label: '截止时间',
                 type: 'string',
               },
             ],
@@ -1208,23 +1224,28 @@ export const formComponents = [
             {
               label: '2022-01-01',
               content: '事件一',
+              circleBg: '#BFDBFF',
+              circleShadow:'#4583FF33',
+              color:'#BFDBFF',
+              textColor:'#FFFFFF'
               // path: 'M71.3,61.9v2.21L56.66,66V63.82l3.27-.43.25-1-2.39.31V60.84l2.84-.37.21-.87-3.4.44V57.85l13.08-1.73v2.2l-6.85.9-.21.88,6-.79-.15,2.85ZM58.11,66.56,69.86,65v5.63L58.11,72.19Zm2.59,3.09,6.44-.84V67.52l-6.44.85ZM62.78,63l3.87-.51.07-.95L63,62.05Z',
             },
-            {
-              label: '2022-01-01',
-              content: '事件一',
-            },
             {
               label: '2022-02-01',
               content: '事件二',
+              circleBg: '#BFDBFF',
+              circleShadow:'#4583FF33',
+              textColor:'#FFFFFF'
             },
             {
               label: '2022-03-01',
               content: '事件三',
+              textColor:'#FFFFFF66'
             },
             {
               label: '2022-04-01',
               content: '事件四',
+              textColor:'#FFFFFF66'
             },
           ],
           text: '时间轴',
@@ -1273,23 +1294,28 @@ export const formComponents = [
             {
               label: '2022-01-01',
               content: '事件一',
+              circleBg: '#BFDBFF',
+              circleShadow:'#4583FF33',
+              color:'#BFDBFF',
+              textColor:'#FFFFFF'
               // path: 'M71.3,61.9v2.21L56.66,66V63.82l3.27-.43.25-1-2.39.31V60.84l2.84-.37.21-.87-3.4.44V57.85l13.08-1.73v2.2l-6.85.9-.21.88,6-.79-.15,2.85ZM58.11,66.56,69.86,65v5.63L58.11,72.19Zm2.59,3.09,6.44-.84V67.52l-6.44.85ZM62.78,63l3.87-.51.07-.95L63,62.05Z',
             },
-            {
-              label: '2022-01-01',
-              content: '事件一',
-            },
             {
               label: '2022-02-01',
               content: '事件二',
+              circleBg: '#BFDBFF',
+              circleShadow:'#4583FF33',
+              textColor:'#FFFFFF'
             },
             {
               label: '2022-03-01',
               content: '事件三',
+              textColor:'#FFFFFF66'
             },
             {
               label: '2022-04-01',
               content: '事件四',
+              textColor:'#FFFFFF66'
             },
           ],
           props: {
@@ -1325,10 +1351,15 @@ export const formComponents = [
         name: '日历',
         icon: 'l-rili',
         data: {
-          width: 200,
-          height: 200,
+          width: 280,
+          height: 326,
           hiddenText: true,
           name: 'calendar',
+          background: '#fff0',
+          hoverTextColor: '#fff',
+          dbInput:true,
+          // input: true,
+          text:'8月'
         },
       },
     ],
@@ -1613,6 +1644,8 @@ export const formComponents = [
           expanded: ['1', '2'],
           fontSize: 20,
           disableInput: true,
+          // iconFamily:'l-icon',
+          // icon:'\ue607',
           data: [
             {
               key: '1',
@@ -1709,7 +1742,7 @@ export const formComponents = [
           data: [
             {
               type: 'text',
-              color: '',
+              color: '#FFFFFFD9',
               x: 0,
               text: '业务指标',
             },
@@ -1757,12 +1790,12 @@ export const formComponents = [
           iconLeft: 8,
           textAlign: 'left',
           color: 'rgba(235, 235, 235, 1)',
-          background: 'rgba(255, 255, 255, 1)',
+          background: '#272C33',
           textLeft: 30,
           shadow: false,
-          textColor: 'rgba(0, 0, 0, 1)',
+          textColor: '#FFF',
           hoverTextColor: 'rgba(0, 0, 0, 1)',
-          shadowColor: 'rgba(250, 247, 247, 0.5)',
+          shadowColor: '#313740',
           shadowOffsetX: 6,
           shadowOffsetY: 6,
           shadowBlur: 20,
@@ -1789,16 +1822,16 @@ export const formComponents = [
           textLeft: 30,
           textTop: 30,
           color: 'rgba(235, 235, 235, 1)',
-          background: 'rgba(255, 255, 255, 1)',
+          background: '#272C33',
           shadow: false,
-          textColor: '#666666',
+          textColor: '#FFFFFF99',
           hoverTextColor: '#666666',
           shadowColor: 'rgba(250, 247, 247, 0.5)',
           shadowOffsetX: 6,
           shadowOffsetY: 6,
           shadowBlur: 20,
           heading: '标题名称',
-          headingColor: '#000',
+          headingColor: '#FFF',
           headingSize: 16,
           // headingWeight: 'bold',
           props: {
@@ -2120,45 +2153,41 @@ export const formComponents = [
           height: 60,
           externElement: true,
           selectedKeys: ['1'],
-          activeColor: '#4E85E5',
+          // activeColor: '#4E85E5',
+          iconPosition:'left',
           data: [
             {
               key: '1',
-              icon: 't-icon t-align-top',
-              title: '平台中心',
+              icon: 'l-icon l-user',
+              title: '个人中心',
               children: [
                 {
                   key: '1-1',
-                  icon: 't-icon t-align-top',
+                  icon: 'l-icon l-fly',
                   title: '测试测试',
                 },
               ],
             },
             {
               key: '2',
-              icon: 't-icon t-04',
+              icon: 'l-icon l-panel',
               title: '安全运行',
             },
             {
               key: '3',
-              icon: 't-icon t-warn',
+              icon: 'l-icon l-align-center',
               title: '智慧能源',
             },
             {
               key: '4',
-              icon: 't-icon t-line-chart',
+              icon: 'l-icon l-kongzhuangtai1',
               title: '数据分析',
             },
             {
               key: '5',
-              icon: 't-icon t-pie-chart',
+              icon: 'l-icon l-quanjutishi',
               title: '运维管理',
             },
-            {
-              key: '6',
-              icon: 't-icon t-dashboard-chart',
-              title: '资产设置',
-            },
           ],
         },
       },
@@ -2175,7 +2204,7 @@ export const formComponents = [
               title: '实时监测',
               key: '0',
               show: true,
-              icon: 't-icon t-10',
+              icon: 'l-icon t-10',
               children: [
                 {
                   title: '站点看板',
@@ -2549,9 +2578,9 @@ export const formComponents = [
           textAlign: 'left',
           input: true,
           color: '#D9D9D9FF',
-          textColor: '#000000FF',
-          hoverTextColor: '#000000FF',
-          activeTextColor: '#000000FF',
+          textColor: '#FFFFFF',
+          hoverTextColor: '#FFFFFF',
+          activeTextColor: '#FFFFFF',
           textLeft: 10,
           dropdownList: [
             {

src/views/components/PenProps.vue

@@ -143,7 +143,7 @@
           </div>
 
           <t-collapse
-            :defaultValue="['1', '2', '3', '4']"
+            :defaultValue="['1', '2', '3', '4', '5']"
             expandIconPlacement="right"
             :borderless="true"
           >