Commit Graph

8 Commits

Author SHA1 Message Date
aixianling
2f79210970 Merge branch 'dev' into vite
# Conflicts:
#	package.json
#	packages/bigscreen/designer/AppDesigner.vue
#	packages/bigscreen/designer/components/Add.vue
#	packages/bigscreen/designer/components/Layout.vue
#	packages/bigscreen/designer/components/RenderElement.vue
#	packages/bigscreen/viewer/AppGigscreenViewer.vue
#	project/dvui/layout/AiDvPanel/AiDvPanel.vue
#	project/dvui/layout/AiDvWrapper/AiDvWrapper.vue
2022-05-09 14:36:16 +08:00
yanran200730
39f6cb1ff2 党建大屏 2022-05-06 16:26:11 +08:00
yanran200730
a0c2bf8f67 党建大屏 2022-05-05 18:00:21 +08:00
aixianling
4f0178c627 web端产品库 vite版本 2022-04-27 18:18:57 +08:00
yanran200730
a184ca666e 需求变更 2022-04-13 18:57:54 +08:00
yanran200730
49a2d392ad bug 2022-03-31 16:03:46 +08:00
aixianling
87231fdb1f dvui更换设置 2022-03-25 14:36:46 +08:00
aixianling
cc87206dbc 迁移大屏UI库和应用 2022-03-25 11:09:26 +08:00