Commit Graph

12 Commits

Author SHA1 Message Date
aixianling
a5dbdbe778 Merge branch 'dev' into vite
# Conflicts:
#	examples/router/autoRoutes.js
#	package.json
#	packages/bigscreen/designer/components/Add.vue
#	project/dv/apps/AppGridDV.vue
#	vue.config.js
2022-08-23 11:14:38 +08:00
aixianling
35e612d35c 特制化,使标题跟随菜单目录变化 2022-08-18 17:27:50 +08:00
aixianling
6522a101ea BUG 30542 2022-07-14 09:04:25 +08:00
aixianling
da8e8f0d65 Merge branch 'dev' into vite
# Conflicts:
#	examples/main.js
#	examples/router/autoRoutes.js
#	package.json
#	packages/bigscreen/designer/AppDesigner.vue
#	packages/bigscreen/designer/components/Add.vue
#	packages/bigscreen/designer/components/Layout.vue
#	packages/bigscreen/designer/components/List.vue
#	packages/bigscreen/designer/components/SourceData.vue
#	packages/bigscreen/designer/components/form/DataConfig.vue
#	packages/bigscreen/designer/config.js
#	packages/bigscreen/viewer/AppGigscreenViewer.vue
#	packages/conv/creditScore/scoreManage/scoreChange.vue
#	packages/index.js
#	project/dv/apps/AppGridDV.vue
#	project/dvui/components/AiMonitor/dhVideo.vue
#	project/dvui/components/AiSwiper.vue
#	project/dvui/layout/AiDvBackground.vue
#	project/dvui/layout/AiDvSummary/AiDvSummary.vue
#	project/dvui/layout/AiDvWrapper/AiDvWrapper.vue
#	project/dvui/package.json
#	public/index.html
#	vue.config.js
2022-07-07 09:01:40 +08:00
aixianling
d57fd8a7a2 BUG 30387 2022-07-06 11:12:15 +08:00
liuye
b9964d64b0 fix 2022-06-28 09:15:10 +08:00
aixianling
eda3252c95 评论调整 2022-06-06 09:16:39 +08:00
aixianling
8424a06217 消除警告 2022-05-25 13:39:30 +08:00
aixianling
67d3ad9bca 增加是否可评论 2022-05-25 11:55:34 +08:00
liuye
fd5f976dcf 29586 2022-05-18 11:47:31 +08:00
aixianling
e91d1f73dc Merge branch 'dev' into vite
# Conflicts:
#	examples/App.vue
#	examples/router/autoRoutes.js
#	examples/utils/index.js
#	package.json
#	packages/wechat/AppProjectActivities/components/Event.vue
#	project/dv/apps/AppHomesteadDV.vue
#	vue.config.js
2022-05-10 20:06:15 +08:00
aixianling
036ee91533 目录代码整合 2022-05-10 20:02:37 +08:00