lw-cdp-ui 1.2.13 → 1.2.15

package/dist/components/lwFlow/nodeEdit/index.vue

@@ -3,6 +3,7 @@
              title="节点编辑"
              direction="rtl"
              :append-to-body="true"
+             :size="600"
              :before-close="close">
     <div class="drawer-form">
       <el-collapse v-model="activeName"

package/dist/components/lwFormJson/JsonItem.vue

@@ -9,7 +9,8 @@
     <template #item="{element: item, index}">
       <el-col :span="['list'].includes(item.component) ? 24 : item.span || 24"
               :class="{ borderItem: hideBorder, cur: hideBorder &&  curIndex == (item.name || item?.options?.items[0]?.name) }"
-              v-if="!hideHandle(item)">
+              v-if="!hideHandle(item)"
+              @click.capture="changeClick(item)">
         <!-- 组合 -->
         <template v-if="['object'].includes(item.component)">
           <el-form-item :label="item.label"
@@ -73,8 +74,7 @@
         </template>
         <FormItem v-else
                   :item="item"
-                  :form="form"
-                  @click="changeClick(item)">
+                  :form="form">
           <!-- 没有组件是component值 就是插槽名称 -->
           <template v-if="!['input', 'upload', 'checkbox', 'checkboxGroup', 'switch', 'select', 'treeSelect', 'cascader', 'date', 'number', 'radio', 'color', 'rate', 'slider','tags'].includes(item.component)"
                     v-slot:[item.component]>
@@ -177,8 +177,8 @@ export default {
   display: flex;
   flex-wrap: wrap;
   // gap: 10px;
+  padding-bottom: 10px;
   > div {
-    margin-bottom: 10px;
     .title-name {
       margin-top: 0;
     }
@@ -269,6 +269,9 @@ export default {
 }
 :deep(.el-form-item) {
   position: relative;
+  .el-form-item {
+    margin-bottom: 18px;
+  }
 }
 .add-btn {
   top: 0px;

package/dist/components/lwFormJson/index.vue

@@ -128,6 +128,7 @@ export default {
     return {
       form: {},
       curItem: {},
+      menuList: [],
       scrollObserverEnabled: true,
       renderLoading: false,
       activeNames: '布局组件'
@@ -151,6 +152,29 @@ export default {
       immediate: true,
       deep: true
     },
+    custom: {
+      handler(val) {
+        this.menuList = []
+        if (val && val.length > 0) {
+          let menuIndex = MenuList.findIndex((item) => {
+            return item.title == '自定义组件'
+          })
+
+          if (menuIndex > -1) {
+            MenuList[menuIndex].list = val
+          } else {
+            let custom = {
+              title: '自定义组件',
+              list: val
+            }
+            MenuList.push(custom)
+          }
+        }
+        this.menuList = MenuList
+      },
+      immediate: true,
+      deep: true
+    },
   },
   computed: {
     hasConfig() {
@@ -158,26 +182,6 @@ export default {
     },
     hasValue() {
       return Object.keys(this.modelValue).length > 0
-    },
-    // 合并自定义组件
-    menuList() {
-      let custom = {}
-      if (this.custom && this.custom.length > 0) {
-        let menuIndex = MenuList.findIndex((item) => {
-          return item.title == '自定义组件'
-        })
-
-        if (menuIndex > -1) {
-          MenuList[menuIndex].list = this.custom
-        } else {
-          custom = {
-            title: '自定义组件',
-            list: this.custom
-          }
-          MenuList.push(custom)
-        }
-      }
-      return MenuList
     }
   },
   mounted() {

package/dist/lw-cdp-ui.esm.js

@@ -8321,7 +8321,8 @@ function Yy(e, t, n, a, r, o) {
         o.hideHandle(L) ? $("", !0) : (g(), I(h, {
           key: 0,
           span: ["list"].includes(L.component) ? 24 : L.span || 24,
-          class: Me({ borderItem: n.hideBorder, cur: n.hideBorder && o.curIndex == (L.name || ((X = (Q = L == null ? void 0 : L.options) == null ? void 0 : Q.items[0]) == null ? void 0 : X.name)) })
+          class: Me({ borderItem: n.hideBorder, cur: n.hideBorder && o.curIndex == (L.name || ((X = (Q = L == null ? void 0 : L.options) == null ? void 0 : Q.items[0]) == null ? void 0 : X.name)) }),
+          onClickCapture: (J) => o.changeClick(L)
         }, {
           default: _(() => {
             var J, H;
@@ -8419,8 +8420,7 @@ function Yy(e, t, n, a, r, o) {
               }, 1032, ["onClickCapture"])) : (g(), I(w, {
                 key: 2,
                 item: L,
-                form: n.form,
-                onClick: (ee) => o.changeClick(L)
+                form: n.form
               }, ot({ _: 2 }, [
                 ["input", "upload", "checkbox", "checkboxGroup", "switch", "select", "treeSelect", "cascader", "date", "number", "radio", "color", "rate", "slider", "tags"].includes(L.component) ? void 0 : {
                   name: L.component,
@@ -8432,7 +8432,7 @@ function Yy(e, t, n, a, r, o) {
                   ]),
                   key: "0"
                 }
-              ]), 1032, ["item", "form", "onClick"])),
+              ]), 1032, ["item", "form"])),
               n.hideBorder && o.curIndex == (L.name || ((H = (J = L == null ? void 0 : L.options) == null ? void 0 : J.items[0]) == null ? void 0 : H.name)) ? (g(), T("div", Gy, [
                 y(f, {
                   class: "btn",
@@ -8460,13 +8460,13 @@ function Yy(e, t, n, a, r, o) {
             ];
           }),
           _: 2
-        }, 1032, ["span", "class"]))
+        }, 1032, ["span", "class", "onClickCapture"]))
       ];
     }),
     _: 3
   }, 8, ["list", "disabled", "class"]);
 }
-const $y = /* @__PURE__ */ be(Ky, [["render", Yy], ["__scopeId", "data-v-202f0c7c"]]), Wy = {
+const $y = /* @__PURE__ */ be(Ky, [["render", Yy], ["__scopeId", "data-v-fc71052f"]]), Wy = {
   name: "TreeItem",
   components: {
     draggable: Tn
@@ -9791,6 +9791,7 @@ const v_ = /* @__PURE__ */ be(o_, [["render", g_], ["__scopeId", "data-v-ef9d371
     return {
       form: {},
       curItem: {},
+      menuList: [],
       scrollObserverEnabled: !0,
       renderLoading: !1,
       activeNames: "布局组件"
@@ -9810,6 +9811,25 @@ const v_ = /* @__PURE__ */ be(o_, [["render", g_], ["__scopeId", "data-v-ef9d371
       },
       immediate: !0,
       deep: !0
+    },
+    custom: {
+      handler(e) {
+        if (this.menuList = [], e && e.length > 0) {
+          let t = gn.findIndex((n) => n.title == "自定义组件");
+          if (t > -1)
+            gn[t].list = e;
+          else {
+            let n = {
+              title: "自定义组件",
+              list: e
+            };
+            gn.push(n);
+          }
+        }
+        this.menuList = gn;
+      },
+      immediate: !0,
+      deep: !0
     }
   },
   computed: {
@@ -9818,18 +9838,6 @@ const v_ = /* @__PURE__ */ be(o_, [["render", g_], ["__scopeId", "data-v-ef9d371
     },
     hasValue() {
       return Object.keys(this.modelValue).length > 0;
-    },
-    // 合并自定义组件
-    menuList() {
-      let e = {};
-      if (this.custom && this.custom.length > 0) {
-        let t = gn.findIndex((n) => n.title == "自定义组件");
-        t > -1 ? gn[t].list = this.custom : (e = {
-          title: "自定义组件",
-          list: this.custom
-        }, gn.push(e));
-      }
-      return gn;
     }
   },
   mounted() {
@@ -9920,7 +9928,7 @@ function w_(e, t, n, a, r, o) {
               "onUpdate:modelValue": t[0] || (t[0] = (B) => r.activeNames = B)
             }, {
               default: _(() => [
-                (g(!0), T(j, null, re(o.menuList, (B) => (g(), I(i, {
+                (g(!0), T(j, null, re(r.menuList, (B) => (g(), I(i, {
                   title: B.title,
                   name: B.title,
                   class: "menu-list-title"
@@ -10012,7 +10020,7 @@ function w_(e, t, n, a, r, o) {
     _: 3
   }, 8, ["style"]);
 }
-const k_ = /* @__PURE__ */ be(b_, [["render", w_], ["__scopeId", "data-v-3752ecb4"]]), S_ = {
+const k_ = /* @__PURE__ */ be(b_, [["render", w_], ["__scopeId", "data-v-65cb0380"]]), S_ = {
   props: {
     modelValue: { type: String, default: "" },
     // 传入的字符串
@@ -18347,6 +18355,7 @@ function _V(e, t, n, a, r, o) {
     title: "节点编辑",
     direction: "rtl",
     "append-to-body": !0,
+    size: 600,
     "before-close": o.close
   }, {
     footer: _(() => [
@@ -18440,7 +18449,7 @@ function _V(e, t, n, a, r, o) {
     _: 1
   }, 8, ["modelValue", "before-close"]);
 }
-const wV = /* @__PURE__ */ be(bV, [["render", _V], ["__scopeId", "data-v-6dfcf21e"]]), jh = [
+const wV = /* @__PURE__ */ be(bV, [["render", _V], ["__scopeId", "data-v-5aff8d01"]]), jh = [
   {
     title: "ET2L节点",
     list: [