Merge pull request #86 from zhanxu33/develop

发布体验问题
TencentBlueKing · Jun 10, 2022 · 16e98e0 · 16e98e0
2 parents 9d104e6 + 71677a4
commit 16e98e0
Show file tree

Hide file tree

Showing 5 changed files with 21 additions and 10 deletions.
diff --git a/lib/client/src/components/render/html.vue b/lib/client/src/components/render/html.vue
@@ -52,15 +52,18 @@
             },
 
             updateMethods () {
-                (this.renderOptions.methodCode || []).forEach((method) => {
+                if (this.renderOptions?.methodCode?.length > 0) {
                     let parent = this.$parent
                     while (parent && parent._uid !== this.parentId) {
                         parent = parent.$parent
                     }
                     if (parent) {
-                        this[method] = parent[method]
+                        const userKeys = Object.keys(parent).filter((key) => /^[^_$]/.test(key)) || []
+                        userKeys.forEach((userKey) => {
+                            this[userKey] = parent[userKey]
+                        })
                     }
-                })
+                }
             }
         },
 

diff --git a/lib/client/src/components/render/pc/render-slot.js b/lib/client/src/components/render/pc/render-slot.js
@@ -42,6 +42,10 @@ export default {
         } while (curSlot && Object.keys(curSlot).length > 0)
 
         const html = `<render-slot>${render(...slotRenderParams, key)}</render-slot>`
-        return transformHtmlToVnode(html).children
+        const slotChildrenInstance = transformHtmlToVnode(html).children || []
+        slotChildrenInstance?.forEach((vnode) => {
+            vnode.key = vnode.key + key
+        })
+        return slotChildrenInstance
     }
 }
diff --git a/lib/client/src/element-materials/modifier/component/form/index.vue b/lib/client/src/element-materials/modifier/component/form/index.vue
@@ -33,6 +33,7 @@
                 ghost-class="block-item-ghost"
                 :list="formItemList"
                 handle=".option-col-drag"
+                :group="{ name: 'form-item-list', pull: false, put: false }"
                 @change="handleSort">
                 <transition-group
                     type="transition"

diff --git a/lib/client/src/views/index/components/action-tool/components/common/use-save.js b/lib/client/src/views/index/components/action-tool/components/common/use-save.js
@@ -41,12 +41,12 @@ const checkValueConfig = rootNode => {
     const checkRemote = (data, componentId, name) => {
         // 兼容 methodCode 平铺的老数据
         let methodData = data?.payload?.methodData
-        if (typeof methodData === 'string') {
+        if (data?.payload?.methodCode) {
             methodData = {
-                methodCode: methodData
+                methodCode: data?.payload?.methodCode
             }
         }
-        if (data.valueType === 'remote' && !methodData.methodCode) {
+        if (data.valueType === 'remote' && !methodData?.methodCode) {
             errorStack.push(`组件【${componentId}】的【${name}】的属性初始值来源配置为函数，但没有选择函数`)
         }
     }

diff --git a/lib/server/project-template/project-init-code/lib/client/src/components/html.vue b/lib/server/project-template/project-init-code/lib/client/src/components/html.vue
@@ -52,15 +52,18 @@
             },
 
             updateMethods () {
-                (this.renderOptions.methodCode || []).forEach((method) => {
+                if (this.renderOptions?.methodCode?.length > 0) {
                     let parent = this.$parent
                     while (parent && parent._uid !== this.parentId) {
                         parent = parent.$parent
                     }
                     if (parent) {
-                        this[method] = parent[method]
+                        const userKeys = Object.keys(parent).filter((key) => /^[^_$]/.test(key)) || []
+                        userKeys.forEach((userKey) => {
+                            this[userKey] = parent[userKey]
+                        })
                     }
-                })
+                }
             }
         },