Commit 130092b0680b24368d9c3f39a14080ad65f86ead

Authored by xp.Huang
2 parents ad2f7444 ae05521f

Merge branch 'main_dev' into 'main'

Main dev

See merge request yunteng/thingskit-front!1252
@@ -21,6 +21,7 @@ export const getDeviceHistoryInfo = (params: Recordable, orderBy = OrderByEnum.D @@ -21,6 +21,7 @@ export const getDeviceHistoryInfo = (params: Recordable, orderBy = OrderByEnum.D
21 }, 21 },
22 { 22 {
23 joinPrefix: false, 23 joinPrefix: false,
  24 + withShareToken: true,
24 } 25 }
25 ); 26 );
26 }; 27 };
@@ -151,6 +151,8 @@ export const formSchema: FormSchema[] = [ @@ -151,6 +151,8 @@ export const formSchema: FormSchema[] = [
151 label: '启用模板', 151 label: '启用模板',
152 component: 'Switch', 152 component: 'Switch',
153 defaultValue: 0, 153 defaultValue: 0,
  154 + helpMessage:
  155 + '使用模板后,该组态自动拥有了模板的预设组件及配置。同时组态可以自由添加新的组件及配置。如模板有更新该组态不会同步更新。',
154 componentProps: ({ formActionType }) => { 156 componentProps: ({ formActionType }) => {
155 const { setFieldsValue } = formActionType; 157 const { setFieldsValue } = formActionType;
156 158