Merge branch 'feature/1.1.1' into develop

Author: Little-LittleProgrammer

CHANGELOG.md

@@ -42,7 +42,7 @@ pnpm i && pnpm playground
     4. 请求方法属性
   4. 事件与全局状态管理类
 ```
-// scheams最终协议, 七猫低代码协议标准,待定
+// scheams最终协议, 低代码协议标准,待定
 // scheams格式例子
 {
     type: 'root', // root | page | container

README.md

@@ -1,4 +1,4 @@
 # port
 VITE_PORT = 8090
 VITE_APP_RELEASE_VERSION = 'vue-project-temp 1.0.0'
-VITE_GLOB_APP_TITLE = '七猫低代码平台'
+VITE_GLOB_APP_TITLE = '低代码平台'

apps/quantum-backend/.env

@@ -18,17 +18,17 @@
     "@qimao/quantum-editor": "workspace:*",
     "@qimao/quantum-sandbox": "workspace:*",
     "@ant-design/icons-vue": "6.1.0",
-    "@q-front-npm-configs/vite": "~1.2.5-beta.1",
-    "@q-front-npm/hooks": "~1.2.5-beta.1",
-    "@q-front-npm/http": "~1.2.9-beta.2",
-    "@q-front-npm/shared": "~1.2.4-beta.0",
-    "@q-front-npm/vue3-antd-pc-ui": "~1.2.10-beta.5",
-    "@q-front-npm/vue3-pc-ui": "~1.2.5-beta.5",
+    "@q-front-npm-configs/vite": "~1.2.5",
+    "@q-front-npm/hooks": "~1.2.5",
+    "@q-front-npm/http": "~1.2.9",
+    "@q-front-npm/shared": "~1.2.4",
+    "@q-front-npm/vue3-antd-pc-ui": "~1.2.10",
+    "@q-front-npm/vue3-pc-ui": "~1.2.5",
     "ant-design-vue": "~4.0.6",
     "axios": "0.27.2",
     "dayjs": "1.11.7",
     "element-resize-detector": "1.2.4",
-    "lodash-es": "4.17.21",
+    "lodash-es": "^4.17.21",
     "nprogress": "0.2.0",
     "pinia": "~2.1.6",
     "sortablejs": "^1.15.0",

apps/quantum-backend/package.json

@@ -74,7 +74,7 @@ export default defineComponent({
             } else {
                 const _res = import('@/menus/index');
                 const _list = (await _res).default;
-                sysStore.initMenuData = '/quantum-editor/backend/manage/h5-manage';
+                sysStore.initMenuData = '/quantum-editor/';
                 sysStore.set_format_route_list(_list);
                 sysStore.menuDataLoadingEnd = true;
                 getSearchButton.value && get_net_router(sysStore.mainMenuData as Required<IMenuData>[]);

apps/quantum-backend/src/App.vue

@@ -2,7 +2,15 @@
 <template>
     <div class="classic-sidebar-comp">
         <a-tabs size="small">
-            <a-tab-pane v-for="group in compList" :key="group.text" :tab="group.text">
+            <a-tab-pane v-for="group in compList" :key="group.text" >
+                <template #tab>
+                    <template v-if="group.helpMessage">
+                        <a-tooltip :title="group.helpMessage">
+                            <q-antd-icon type="InfoCircleOutlined" />
+                        </a-tooltip>
+                    </template>
+                    {{group.text}}
+                </template>
                 <div class="classic-sidebar-comp-tab">
                     <template
                         v-for="item in group.children"
@@ -45,21 +53,33 @@ defineOptions({
 })
 
 const services = inject<IServices>('services');
-const compList = computed(() => services?.componentService.getList())
+const compList = computed(() => services?.componentService.getList());
+const emits = defineEmits(['add'])
 
 function addComp(item: IComponentItem) {
-    const width = services?.editorService?.get('sandbox')?.designWidth
-    services?.editorService.add({
-        label: item.text,
-        type: item.component,
-        ...{
-            ...item.data,
-            style: {
-                height: '',
-                width: width
-            }
-        },
-    })
+    const itemType = item.itemType || 'add'
+    const width = services?.editorService?.get('sandbox')?.designWidth;
+    if (itemType === 'add') {
+        services?.editorService.add({
+            label: item.text,
+            type: item.component,
+            ...{
+                ...item.data,
+                style: {
+                    height: '',
+                    width: width
+                }
+            },
+        })
+    } else if (itemType === 'cover') {
+        services?.editorService.update({
+            type: 'root',
+            field: 'root',
+            ...item.data
+        })
+    }
+    emits('add')
+    
 }
 
 </script>

apps/quantum-backend/src/components/classic/sidebar/comp-list/index.vue

@@ -1,26 +1,31 @@
 <!--  -->
 <template>
     <div class="classic-sidebar">
-        <comp-list></comp-list>
-        <props-list></props-list>
+        <comp-list @add="addComp"></comp-list>
+        <props-list :isAdd="cnt"></props-list>
     </div>
 </template>
 
 <script lang='ts' setup>
 import { IServices } from '@qimao/quantum-editor';
-import { PropType, provide, reactive } from 'vue'
+import { PropType, provide, reactive, ref } from 'vue'
 import CompList from './comp-list/index.vue'
 import PropsList from './props-list/index.vue'
 defineOptions({
      name: 'Sidebar'
-})
+});
 const props = defineProps({
     services: {
         type: Object as PropType<IServices>,
         default: () => {}
     }
 })
-provide('services', props.services)
+provide('services', props.services);
+
+const cnt = ref(0)
+function addComp() {
+    cnt.value++
+}
 
 </script>
 <style lang='scss' scoped>