Merge branch 'pro' into gdrtvu

78adf71c · 王鹏飞 · 76c9c231 · ce677e6d · 78adf71c · 78adf71c
--- a/package-lock.json
+++ b/package-lock.json
--- a/package.json
+++ b/package.json
--- a/src/api/base.ts
+++ b/src/api/base.ts
--- a/src/api/rfm.ts
+++ b/src/api/rfm.ts
--- a/src/components/ConnectionIcon.vue
+++ b/src/components/ConnectionIcon.vue
--- a/src/components/ViewGroup.vue
+++ b/src/components/ViewGroup.vue
--- a/src/components/ViewLabel.vue
+++ b/src/components/ViewLabel.vue
--- a/src/components/base/AppList.vue
+++ b/src/components/base/AppList.vue
--- a/src/components/rule/CustomRule.vue
+++ b/src/components/rule/CustomRule.vue
--- a/src/components/rule/EventRule.vue
+++ b/src/components/rule/EventRule.vue
--- a/src/components/rule/LabelRule.vue
+++ b/src/components/rule/LabelRule.vue
--- a/src/components/rule/LevelRule.vue
+++ b/src/components/rule/LevelRule.vue
--- a/src/components/rule/RFMRule.vue
+++ b/src/components/rule/RFMRule.vue
--- a/src/components/rule/RFMRuleItem.vue
+++ b/src/components/rule/RFMRuleItem.vue
--- a/src/components/rule/SingleUserRule.vue
+++ b/src/components/rule/SingleUserRule.vue
--- a/src/components/rule/UserActionRule.vue
+++ b/src/components/rule/UserActionRule.vue
--- a/src/components/rule/UserRule.vue
+++ b/src/components/rule/UserRule.vue
--- a/src/composables/useAllData.ts
+++ b/src/composables/useAllData.ts
--- a/src/composables/useRFMData.ts
+++ b/src/composables/useRFMData.ts
--- a/src/modules/analyze/user/components/UserLabel.vue
+++ b/src/modules/analyze/user/components/UserLabel.vue
--- a/src/modules/connect/components/FormDialog.vue
+++ b/src/modules/connect/components/FormDialog.vue
--- a/src/modules/connect/components/ListItem.vue
+++ b/src/modules/connect/components/ListItem.vue
--- a/src/modules/connect/components/UserDataDialog.vue
+++ b/src/modules/connect/components/UserDataDialog.vue
--- a/src/modules/connect/views/Index.vue
+++ b/src/modules/connect/views/Index.vue
--- a/src/modules/connect/views/View.vue
+++ b/src/modules/connect/views/View.vue
--- a/src/modules/group/api.ts
+++ b/src/modules/group/api.ts
--- a/src/modules/group/components/BindMembers.vue
+++ b/src/modules/group/components/BindMembers.vue
--- a/src/modules/group/components/FormDialog.vue
+++ b/src/modules/group/components/FormDialog.vue
--- a/src/modules/group/components/ViewDialog.vue
+++ b/src/modules/group/components/ViewDialog.vue
--- a/src/modules/group/types.ts
+++ b/src/modules/group/types.ts
--- a/src/modules/group/views/Index.vue
+++ b/src/modules/group/views/Index.vue
--- a/src/modules/label/api.ts
+++ b/src/modules/label/api.ts
--- a/src/modules/label/components/LabelRuleDialog.vue
+++ b/src/modules/label/components/LabelRuleDialog.vue
--- a/src/modules/label/components/LabelType.vue
+++ b/src/modules/label/components/LabelType.vue
--- a/src/modules/label/components/LabelViewDialog.vue
+++ b/src/modules/label/components/LabelViewDialog.vue
--- a/src/modules/label/composables/useLabelType.ts
+++ b/src/modules/label/composables/useLabelType.ts
--- a/src/modules/label/types.ts
+++ b/src/modules/label/types.ts
--- a/src/modules/label/views/Index.vue
+++ b/src/modules/label/views/Index.vue
--- a/src/modules/material/all/api.ts
+++ b/src/modules/material/all/api.ts
--- a/src/modules/material/all/components/AIChat.vue
+++ b/src/modules/material/all/components/AIChat.vue
--- a/src/modules/material/all/components/ChuangKitDesign.vue
+++ b/src/modules/material/all/components/ChuangKitDesign.vue
--- a/src/modules/material/all/components/ImageDesign.vue
+++ b/src/modules/material/all/components/ImageDesign.vue
--- a/src/modules/material/all/components/StepOne.vue
+++ b/src/modules/material/all/components/StepOne.vue
--- a/src/modules/material/all/components/StepThree.vue
+++ b/src/modules/material/all/components/StepThree.vue
--- a/src/modules/material/all/components/StepTwo.vue
+++ b/src/modules/material/all/components/StepTwo.vue
--- a/src/modules/material/all/components/ViewDialog.vue
+++ b/src/modules/material/all/components/ViewDialog.vue
--- a/src/modules/material/all/composables/useChat.ts
+++ b/src/modules/material/all/composables/useChat.ts
--- a/src/modules/material/all/views/Index.vue
+++ b/src/modules/material/all/views/Index.vue
--- a/src/modules/material/all/views/Update.vue
+++ b/src/modules/material/all/views/Update.vue
--- a/src/modules/material/audio/views/Index.vue
+++ b/src/modules/material/audio/views/Index.vue
--- a/src/modules/material/card/views/Index.vue
+++ b/src/modules/material/card/views/Index.vue
--- a/src/modules/material/h5/views/Index.vue
+++ b/src/modules/material/h5/views/Index.vue
--- a/src/modules/material/image/views/Index.vue
+++ b/src/modules/material/image/views/Index.vue
--- a/src/modules/material/mini/views/Index.vue
+++ b/src/modules/material/mini/views/Index.vue
--- a/src/modules/material/qrcode/views/Index.vue
+++ b/src/modules/material/qrcode/views/Index.vue
--- a/src/modules/material/text/views/Index.vue
+++ b/src/modules/material/text/views/Index.vue
--- a/src/modules/material/video/views/Index.vue
+++ b/src/modules/material/video/views/Index.vue
--- a/src/modules/metadata/event/components/FieldDialog.vue
+++ b/src/modules/metadata/event/components/FieldDialog.vue
--- a/src/modules/metadata/event/types.ts
+++ b/src/modules/metadata/event/types.ts
--- a/src/modules/metadata/event/views/Index.vue
+++ b/src/modules/metadata/event/views/Index.vue
--- a/src/modules/metadata/user/components/FormDialog.vue
+++ b/src/modules/metadata/user/components/FormDialog.vue
--- a/src/modules/metadata/user/views/Index.vue
+++ b/src/modules/metadata/user/views/Index.vue
--- a/src/modules/user/components/ViewProgressDialog.vue
+++ b/src/modules/user/components/ViewProgressDialog.vue
--- a/src/modules/user/types.ts
+++ b/src/modules/user/types.ts
--- a/src/modules/user/views/Image.vue
+++ b/src/modules/user/views/Image.vue
--- a/src/modules/user/views/Index.vue
+++ b/src/modules/user/views/Index.vue
--- a/src/router/index.ts
+++ b/src/router/index.ts
--- a/src/stores/menu.ts
+++ b/src/stores/menu.ts
--- a/src/stores/user.ts
+++ b/src/stores/user.ts
--- a/src/types.ts
+++ b/src/types.ts
--- a/src/utils/dictionary.ts
+++ b/src/utils/dictionary.ts
--- a/src/utils/permission.ts
+++ b/src/utils/permission.ts
--- a/src/utils/upload.ts
+++ b/src/utils/upload.ts