slw 1.0.0-alpha.3 → 1.0.0-alpha.5

package/lib/{index-656e59c3.js → index-ae82bf80.js}

@@ -8525,7 +8525,7 @@ PictureUpload.name = "slw-picture-upload";
 PictureUpload.install = (Q) => {
   Q.component(PictureUpload.name, PictureUpload);
 };
-const windowGrid_vue_vue_type_style_index_0_scoped_f42eb57c_lang = "", _withScopeId$9 = (Q) => (pushScopeId("data-v-f42eb57c"), Q = Q(), popScopeId(), Q), _hoisted_1$l2 = {
+const windowGrid_vue_vue_type_style_index_0_scoped_33131aad_lang = "", _withScopeId$9 = (Q) => (pushScopeId("data-v-33131aad"), Q = Q(), popScopeId(), Q), _hoisted_1$l2 = {
   class: "slw-window-grid-container",
   style: { height: "100%" }
 }, _hoisted_2$kY = /* @__PURE__ */ _withScopeId$9(() => /* @__PURE__ */ createElementVNode("span", { class: "vxe-table--cell-main-area" }, null, -1)), _hoisted_3$hY = /* @__PURE__ */ _withScopeId$9(() => /* @__PURE__ */ createElementVNode("span", { class: "vxe-table--cell-active-area" }, null, -1)), _hoisted_4$ay = /* @__PURE__ */ _withScopeId$9(() => /* @__PURE__ */ createElementVNode("span", { class: "vxe-table--cell-copy-area" }, null, -1)), _hoisted_5$4Y = [
@@ -8661,61 +8661,50 @@ const windowGrid_vue_vue_type_style_index_0_scoped_f42eb57c_lang = "", _withScop
           total: "data.count"
         },
         ajax: {
-          query: async ({ page: H, sorts: X, filters: G, form: K }, Z) => {
-            var se;
+          query: async ({ page: H, sorts: X, filters: G, form: K }) => {
+            var le;
             if (gridData.value.noSearchData) {
               delete gridData.value.noSearchData;
               return;
             }
-            if (Z != null && Z.clearGrid) {
-              for (let ue in queryFormData.value)
-                queryFormData.value[ue] = null;
-              return localStorage.setItem(gridData.value.params._region_id + preTag.value, JSON.stringify(queryFormData.value)), {
-                data: {
-                  data: [],
-                  count: 0
-                },
-                status: 200
-              };
-            }
-            let ee = getParentRegion(), te = null;
-            ee != null && ee.params && (te = ee.params.subtableSearchExParams);
-            const ne = Object.assign({}, gridData.value.params.queryParams, queryFormData.value, Z, te);
-            Object.entries(ne).forEach(([ce, ue]) => {
-              var he;
-              if (ue == null && (queryFormData.value[ce] = null), ne[ce] instanceof Array) {
-                let de = gridData.value.formConfig.items.filter((ge) => ge.field == ce)[0], fe = (he = de == null ? void 0 : de.itemRender) == null ? void 0 : he.name, pe = XEUtils$4.clone(ne[ce], !0);
-                fe == "ElTimePicker" ? (ne[ce] = pe[0], ne["end_" + ce] = pe[1]) : ["ElDateRangePicker", "ElDateTimeRangePicker"].includes(fe) && (ne[ce] = pe[0], ne["end_" + ce] = pe[1], queryFormData.value[ce] = pe[0], queryFormData.value["end_" + ce] = pe[1]);
+            let Z = getParentRegion(), ee = null;
+            Z != null && Z.params && (ee = Z.params.subtableSearchExParams);
+            const te = Object.assign({}, queryFormData.value, ee);
+            Object.entries(te).forEach(([se, ce]) => {
+              var ue;
+              if (ce == null && (queryFormData.value[se] = null), te[se] instanceof Array) {
+                let he = gridData.value.formConfig.items.filter((pe) => pe.field == se)[0], de = (ue = he == null ? void 0 : he.itemRender) == null ? void 0 : ue.name, fe = XEUtils$4.clone(te[se], !0);
+                de == "ElTimePicker" ? (te[se] = fe[0], te["end_" + se] = fe[1]) : ["ElDateRangePicker", "ElDateTimeRangePicker"].includes(de) && (te[se] = fe[0], te["end_" + se] = fe[1], queryFormData.value[se] = fe[0], queryFormData.value["end_" + se] = fe[1]);
               }
             });
-            const oe = X[0];
-            oe && (ne.$_sort_column = oe.property, ne.$_sort_type = oe.order);
-            for (let { property: ce, datas: ue } of G) {
-              let he = ue.join(","), de = gridData.value.columns.filter((fe) => fe.field == ce)[0];
-              if ((de == null ? void 0 : de.dataType) == "LIST" && ((se = de == null ? void 0 : de.itemRender.options) == null ? void 0 : se.length) > 0) {
-                let fe = de.itemRender.options.filter((pe) => pe.label.indexOf(he) > -1)[0];
-                fe && (he = fe.value);
-              } else if ((de == null ? void 0 : de.dataType) == "TABLE") {
-                let pe = (await getSelectorData({ _region_id: gridData.value.params._region_id }, de.id, de.selectorId)).filter((ge) => ge.NAME.indexOf(he) > -1)[0];
-                pe && (he = pe.VALUE);
+            const ne = X[0];
+            ne && (te.$_sort_column = ne.property, te.$_sort_type = ne.order);
+            for (let { property: se, datas: ce } of G) {
+              let ue = ce.join(","), he = gridData.value.columns.filter((de) => de.field == se)[0];
+              if ((he == null ? void 0 : he.dataType) == "LIST" && ((le = he == null ? void 0 : he.itemRender.options) == null ? void 0 : le.length) > 0) {
+                let de = he.itemRender.options.filter((fe) => fe.label.indexOf(ue) > -1)[0];
+                de && (ue = de.value);
+              } else if ((he == null ? void 0 : he.dataType) == "TABLE") {
+                let fe = (await getSelectorData({ _region_id: gridData.value.params._region_id }, he.id, he.selectorId)).filter((pe) => pe.NAME.indexOf(ue) > -1)[0];
+                fe && (ue = fe.VALUE);
               }
-              ne[ce.toLowerCase()] = he;
+              te[se.toLowerCase()] = ue;
             }
-            if (ne.page = H.currentPage, ne.limit = H.pageSize, ne._region_id = gridData.value.params._region_id, gridData.value.params.parentRowId && (ne[gridData.value.params.parentRowId] = gridData.value.params.parentRowIdValue), Object.keys(ne).forEach((ce) => {
-              ne[ce] instanceof Object && (ne[ce] = Object.values(ne[ce]).join());
-            }), Q ? Object.keys(Q).forEach((ce) => {
-              const ue = ce.toLowerCase();
-              ne.hasOwnProperty(ue) && (ne[ue] = Q[ce]);
-            }) : localStorage.setItem(gridData.value.params._region_id + preTag.value, JSON.stringify(queryFormData.value)), gridData.value.params.exportForm = XEUtils$4.clone(ne, !0), queryBeforeList && queryBeforeList.length > 0) {
-              let ce = {};
-              if (queryBeforeList.forEach((ue) => {
-                if (ue && typeof ue == "function")
+            if (te.page = H.currentPage, te.limit = H.pageSize, te._region_id = gridData.value.params._region_id, gridData.value.params.parentRowId && (te[gridData.value.params.parentRowId] = gridData.value.params.parentRowIdValue), Object.keys(te).forEach((se) => {
+              te[se] instanceof Object && (te[se] = Object.values(te[se]).join());
+            }), Q ? Object.keys(Q).forEach((se) => {
+              const ce = se.toLowerCase();
+              te.hasOwnProperty(ce) && (te[ce] = Q[se]);
+            }) : localStorage.setItem(gridData.value.params._region_id + preTag.value, JSON.stringify(queryFormData.value)), gridData.value.params.exportForm = XEUtils$4.clone(te, !0), queryBeforeList && queryBeforeList.length > 0) {
+              let se = {};
+              if (queryBeforeList.forEach((ce) => {
+                if (ce && typeof ce == "function")
                   try {
-                    ce = ue();
-                  } catch (he) {
-                    console.error(he);
+                    se = ce();
+                  } catch (ue) {
+                    console.error(ue);
                   }
-              }), ce === !1)
+              }), se === !1)
                 return {
                   data: {
                     data: [],
@@ -8724,69 +8713,69 @@ const windowGrid_vue_vue_type_style_index_0_scoped_f42eb57c_lang = "", _withScop
                   status: 200
                 };
             }
-            const re = axios.post("/window/data/" + gridData.value.params.datasourceCode, ne);
-            let ae = {};
-            return re.then((ce) => {
-              let ue = {};
-              if (ce && ce.data && ce.data.result && ce.data.data && ce.data.data.length > 0) {
-                let pe = function(me) {
-                  me.forEach((_e, we) => {
-                    let xe = 0;
-                    gridData.value.toolbarConfig.buttons.forEach(($e) => {
-                      if (typeof $e.type < "u") {
-                        $e.btnLoad[fe] = !1;
-                        const ke = $e.displayLogic ? displayLogic($e.displayLogic, {
-                          ..._e,
+            const oe = axios.post("/window/data/" + gridData.value.params.datasourceCode, te);
+            let re = {};
+            return oe.then((se) => {
+              let ce = {};
+              if (se && se.data && se.data.result && se.data.data && se.data.data.length > 0) {
+                let fe = function(ve) {
+                  ve.forEach((me, _e) => {
+                    let we = 0;
+                    gridData.value.toolbarConfig.buttons.forEach((xe) => {
+                      if (typeof xe.type < "u") {
+                        xe.btnLoad[de] = !1;
+                        const $e = xe.displayLogic ? displayLogic(xe.displayLogic, {
+                          ...me,
                           ...assembleParentData(gridData.value.params.parentData)
-                        }) : !0, Se = $e.showInGrid && ke, Ee = !$e.showInGrid && ke;
-                        if ($e.btnShowInGrid[fe] = Se, $e.btnShow[fe] = Ee, he = he || Se, Se)
-                          if ($e.iconComponent)
-                            xe = xe + 0.7;
+                        }) : !0, ke = xe.showInGrid && $e, Se = !xe.showInGrid && $e;
+                        if (xe.btnShowInGrid[de] = ke, xe.btnShow[de] = Se, ue = ue || ke, ke)
+                          if (xe.iconComponent)
+                            we = we + 0.7;
                           else {
-                            let Pe = $e.name.match(/[\u4e00-\u9fa5]/g);
-                            if (Pe) {
-                              let Ne = Math.ceil(Pe.length / 2);
-                              xe += Ne;
+                            let Ee = xe.name.match(/[\u4e00-\u9fa5]/g);
+                            if (Ee) {
+                              let Pe = Math.ceil(Ee.length / 2);
+                              we += Pe;
                             } else {
-                              let Ne = Math.ceil($e.name.length / 6);
-                              xe += Ne;
+                              let Pe = Math.ceil(xe.name.length / 6);
+                              we += Pe;
                             }
                           }
                       }
-                    }), xe > de && (de = xe), _e._INDEX = fe, fe++, _e._CHILDS && _e._CHILDS.length > 0 && pe(_e._CHILDS);
+                    }), we > he && (he = we), me._INDEX = de, de++, me._CHILDS && me._CHILDS.length > 0 && fe(me._CHILDS);
                   });
-                }, he = !1, de = 0, fe = 0;
-                pe(ce.data.data);
-                let ge = !1;
-                gridData.value.columns.forEach((me) => {
-                  if (me.colId == "_operation_" && me.title == "操作") {
-                    me.width != de * 60 && de * 60 >= 60 && (ge = !0, me.width = de.toFixed(1) * 60);
+                }, ue = !1, he = 0, de = 0;
+                fe(se.data.data);
+                let pe = !1;
+                gridData.value.columns.forEach((ve) => {
+                  if (ve.colId == "_operation_" && ve.title == "操作") {
+                    ve.width != he * 60 && he * 60 >= 60 && (pe = !0, ve.width = he.toFixed(1) * 60);
                     return;
                   }
-                }), ge && getCurRegion().loadColumn(gridData.value.columns), gridData.value.params.rowIndex != null && (rowIndex.value = gridData.value.params.rowIndex), ce.data.data.length > rowIndex.value ? ue = ce.data.data[rowIndex.value] : ue = ce.data.data[0];
-                const ve = getCurRegion();
-                if (ve) {
-                  const me = ve.getColumnById("_operation_");
-                  me && he && ve.showColumn(me);
+                }), pe && getCurRegion().loadColumn(gridData.value.columns), gridData.value.params.rowIndex != null && (rowIndex.value = gridData.value.params.rowIndex), se.data.data.length > rowIndex.value ? ce = se.data.data[rowIndex.value] : ce = se.data.data[0];
+                const ge = getCurRegion();
+                if (ge) {
+                  const ve = ge.getColumnById("_operation_");
+                  ve && ue && ge.showColumn(ve);
                 }
-                !isEditGridInitData.value && gridData.value.type === "EDIT_GRID" && editGridInitData(ue);
+                !isEditGridInitData.value && gridData.value.type === "EDIT_GRID" && editGridInitData(ce);
               }
-              rowClickCommon(ue, rowIndex.value), queryAfterList && queryAfterList.length > 0 && queryAfterList.forEach((he) => {
-                var de;
-                if (he && typeof he == "function")
+              rowClickCommon(ce, rowIndex.value), queryAfterList && queryAfterList.length > 0 && queryAfterList.forEach((ue) => {
+                var he;
+                if (ue && typeof ue == "function")
                   try {
-                    ae = he(((de = ce == null ? void 0 : ce.data) == null ? void 0 : de.data) || []);
-                  } catch (fe) {
-                    console.error(fe);
+                    re = ue(((he = se == null ? void 0 : se.data) == null ? void 0 : he.data) || []);
+                  } catch (de) {
+                    console.error(de);
                   }
               });
-            }), typeof await re > "u" || ae === !1 ? {
+            }), typeof await oe > "u" || re === !1 ? {
               data: {
                 data: [],
                 count: 0
               },
               status: 200
-            } : re;
+            } : oe;
           }
         }
       }, gridData.value.params.parentRegionId && (gridData.value.proxyConfig.autoLoad = !1);
@@ -9151,14 +9140,16 @@ const windowGrid_vue_vue_type_style_index_0_scoped_f42eb57c_lang = "", _withScop
       }, G.params.queryParams !== null && typeof G.params.queryParams < "u" && (G.params.queryParams.unQuery = !0), G.formData._button_id = gridData.value.params.edit_button_id, G._reload = () => reload(), rowDbClick(G);
     }, reload = () => {
       var Q;
-      (Q = getCurRegion()) == null || Q.commitProxy("query");
+      (Q = getCurRegion()) == null || Q.commitProxy("reload");
     }, clearGrid = () => {
-      getCurRegion().commitProxy("query", { clearGrid: !0 });
+      for (let Q in queryFormData.value)
+        queryFormData.value[Q] = null;
+      localStorage.setItem(gridData.value.params._region_id + preTag.value, JSON.stringify(queryFormData.value)), getCurRegion().reloadData();
     }, resetGrid = () => {
       var Q;
       for (let H in queryFormData.value)
         queryFormData.value[H] = null;
-      (Q = getCurRegion()) == null || Q.commitProxy("query");
+      (Q = getCurRegion()) == null || Q.commitProxy("reload");
     }, getCheckedData = () => {
       const Q = getCurRegion();
       return Q ? Q.getCheckboxRecords().concat(Q.getCheckboxReserveRecords()) : null;
@@ -9183,7 +9174,14 @@ const windowGrid_vue_vue_type_style_index_0_scoped_f42eb57c_lang = "", _withScop
           }));
         });
       }
-      H && rowClickCommon(H, X);
+      H ? rowClickCommon(H, X) : allCheckboxFunList && allCheckboxFunList.length > 0 && allCheckboxFunList.forEach((K) => {
+        if (K && typeof K == "function")
+          try {
+            K(G);
+          } catch (Z) {
+            console.error(Z);
+          }
+      });
     }, getSelectRecord = () => {
       const Q = getCurRegion();
       return Q ? Q.getCurrentRecord() : null;
@@ -9837,6 +9835,8 @@ const windowGrid_vue_vue_type_style_index_0_scoped_f42eb57c_lang = "", _withScop
       G._field_id = H, G._select_id = X;
       let K = await axios.post("/window/selector", $qs.stringify(G));
       return (Z = K == null ? void 0 : K.data) == null ? void 0 : Z.data;
+    }, allCheckboxFunList = [], addAllCheckboxFun = (Q) => {
+      allCheckboxFunList.push(Q);
     };
     return onMounted(async () => {
       gridData.value.addListener && getCurRegion() && addListener(), gridData.value.type === "TREE_STRUCTURE" && (gridData.value.menuConfig = {
@@ -9851,7 +9851,7 @@ const windowGrid_vue_vue_type_style_index_0_scoped_f42eb57c_lang = "", _withScop
             size: "default",
             type: Q.viewType,
             style: Q.css,
-            loading: Q.btnLoad[rowIndex.value],
+            loading: Q.btnLoad[rowIndex],
             plain: Q.plain
           },
           events: { click: toolBarButtonClick }
@@ -9874,6 +9874,9 @@ const windowGrid_vue_vue_type_style_index_0_scoped_f42eb57c_lang = "", _withScop
             return te.setHours(23), te.setMinutes(59), te.setSeconds(59), ee.valueOf() > te.valueOf();
           };
         }
+      }), gridData.value.params.queryParams && Object.keys(gridData.value.params.queryParams).forEach((Q) => {
+        const H = Q.toLowerCase();
+        queryFormData.value.hasOwnProperty(H) && !queryFormData.value[H] && (queryFormData.value[H] = gridData.value.params.queryParams[Q]);
       }), gridData.value.params.queryFormData = queryFormData.value, gridData.value.columns.forEach((Q) => {
         Q.hasOwnProperty("field") && !Q.hasOwnProperty("treeNode") && (Q.events.change = onFieldChange, Q.events["on-change"] = onFieldChange, Q.events.keyup = onFieldEnter, Q.editRender.events = Q.events, Q.itemRender.events = Q.events), Q.itemRender && Q.itemRender.props._select_id && (formSelectMap.value[Q.id] = Q);
       }), searchData(), regionMap.value[gridData.value.params.code + "-" + preTag.value] = curRegion.value, regionMap.value[gridData.value.params.code] = curRegion.value, evalEvent(gridData.value.params.formEvents.regionInit), gridData.value.params.parentRegionId && addGridClickEvent(rowClickEmitFun), curRegion.value.closeModal = () => {
@@ -10150,7 +10153,7 @@ const windowGrid_vue_vue_type_style_index_0_scoped_f42eb57c_lang = "", _withScop
       ]);
     };
   }
-}, WindowGrid = /* @__PURE__ */ _export_sfc(_sfc_main$e, [["__scopeId", "data-v-f42eb57c"]]);
+}, WindowGrid = /* @__PURE__ */ _export_sfc(_sfc_main$e, [["__scopeId", "data-v-33131aad"]]);
 WindowGrid.name = "slw-window-grid";
 WindowGrid.install = (Q) => {
   Q.component(WindowGrid.name, WindowGrid);
@@ -42462,7 +42465,7 @@ var js = js$1.exports;
   })(Q);
 })(js$1);
 var jsExports = js$1.exports;
-const index$o = /* @__PURE__ */ getDefaultExportFromCjs(jsExports), windowForm_vue_vue_type_style_index_0_scoped_3b9acef8_lang = "", _withScopeId$8 = (Q) => (pushScopeId("data-v-3b9acef8"), Q = Q(), popScopeId(), Q), _hoisted_1$l1 = { class: "slw-window-form" }, _hoisted_2$kX = {
+const index$o = /* @__PURE__ */ getDefaultExportFromCjs(jsExports), windowForm_vue_vue_type_style_index_0_scoped_dd626eb7_lang = "", _withScopeId$8 = (Q) => (pushScopeId("data-v-dd626eb7"), Q = Q(), popScopeId(), Q), _hoisted_1$l1 = { class: "slw-window-form" }, _hoisted_2$kX = {
   key: 0,
   class: "form-title"
 }, _hoisted_3$hX = ["onClick"], _hoisted_4$ax = ["onClick"], _hoisted_5$4X = ["onClick"], _hoisted_6$20 = ["onClick"], _hoisted_7$13 = ["onClick"], _sfc_main$d = {
@@ -42553,7 +42556,7 @@ const index$o = /* @__PURE__ */ getDefaultExportFromCjs(jsExports), windowForm_v
         for (let X = 0; X < H.length; X++) {
           let G = formConfig.value.editRules[H[X]], K = formConfig.value.columns.filter((Z) => Z.field == H[X])[0];
           if (K) {
-            (K.dataType == "TABLE" || K.dataType == "LIST") && (G[0].validator = ({ itemValue: ee, rule: te, rules: ne, data: oe, field: re }) => {
+            G[0].required && (K.dataType == "TABLE" || K.dataType == "LIST") && (G[0].validator = ({ itemValue: ee, rule: te, rules: ne, data: oe, field: re }) => {
               if (!oe[re] || oe[re].length == 0)
                 return new Error(te.message);
             });
@@ -42616,12 +42619,17 @@ const index$o = /* @__PURE__ */ getDefaultExportFromCjs(jsExports), windowForm_v
     }), computeOnlyShowBtn = computed(() => {
       let Q = !1;
       return formConfig.value.columns.filter((X) => X.displayForm).length == 0 && (Q = !0), Q;
-    });
+    }), computeTitleWidth = computed(() => formConfig.value.params.formTitleWidth ? formConfig.value.params.formTitleWidth : "115"), computeItemGroup = computed(() => (Q) => formConfig.value.params.setColumnsGroup ? Q.children : formConfig.value.columns);
     onMounted(async () => {
       var H, X, G, K;
       if (formConfig.value.params.linkUrl)
         return;
-      formLoading.value = !0, formConfig.value.columns.forEach((Z, ee, te) => {
+      formLoading.value = !0, formConfig.value.params.columnsGroup = [
+        {
+          title: "",
+          children: []
+        }
+      ], formConfig.value.columns.forEach((Z, ee, te) => {
         Z.hasOwnProperty("field") && !Z.hasOwnProperty("treeNode") && (Z.events.change = onFieldChange, Z.events.keyup = onFieldEnter, Z.events.click = onFieldClick), (Z == null ? void 0 : Z.dataType) === "IMG" && (uploadConfig.value.isHaveImgField = !0, fieldPreviewMap.value[Z.field] = []);
       }), await evalEvent(formConfig.value.params.formEvents.dataInit);
       let Q = !0;
@@ -42703,7 +42711,7 @@ const index$o = /* @__PURE__ */ getDefaultExportFromCjs(jsExports), windowForm_v
           for (let X in Object.values(H)) {
             const G = Object.values(H)[X];
             setTimeout(() => {
-              $message.error(G[0][0].rule.$options.message);
+              $message.error(G[0][0].rule.message);
             }, X * 800);
           }
           emits("saveLoadingChange");
@@ -43061,11 +43069,29 @@ const index$o = /* @__PURE__ */ getDefaultExportFromCjs(jsExports), windowForm_v
       X && (X.itemRender.name = H, H == "ElCheckbox" && nextTick(() => {
         formData.value[Q.toUpperCase()] = [];
       }));
+    }, setTitleWidth = (Q) => {
+      formConfig.value.params.formTitleWidth = Q;
+    }, setFormGroup = (Q) => {
+      if (Q instanceof Array && Q.length > 0) {
+        formConfig.value.params.setColumnsGroup = !0;
+        let H = Q.reduce((X, G) => X.concat(G.children), []);
+        formConfig.value.columns.forEach((X) => {
+          X.field && !H.includes(X.field.toLowerCase()) && formConfig.value.params.columnsGroup[0].children.push(X);
+        }), Q.forEach((X) => {
+          let G = {
+            title: X.title,
+            children: []
+          };
+          formConfig.value.columns.forEach((K) => {
+            K.field && X.children.includes(K.field.toLowerCase()) && G.children.push(K);
+          }), formConfig.value.params.columnsGroup.push(G);
+        });
+      }
     }, throwFunction = (Q) => {
       Q.getData = () => getData(), Q.submitData = () => submitData(), Q.getValue = (H) => getValue(H), Q.setValue = (H, X) => setValue(H, X), Q.checkSubmitData = () => checkSubmitData(), Q.searchData = (H) => searchData(H), Q.displayFormItem = (H, X) => displayFormItem(H, X), Q.reset = () => reset(), Q.clearData = () => clearData(), Q.setFieldName = (H, X) => setFieldName(H, X), Q.setFormItemProperty = (H, X, G) => setFormItemProperty(H, X, G), Q.getTableFieldSelectData = (H) => getTableFieldSelectData(H), Q.setFormSelectOption = (H, X) => setFormSelectOption(H, X);
     };
     return __expose({ submitData, validateDataChg, getValue, getRegion, getData }), (Q, H) => {
-      const X = resolveComponent("el-icon"), G = resolveComponent("el-button"), K = resolveComponent("el-input"), Z = resolveComponent("vxe-form-item"), ee = resolveComponent("vxe-form"), te = resolveComponent("el-dialog");
+      const X = resolveComponent("el-icon"), G = resolveComponent("el-button"), K = resolveComponent("el-input"), Z = resolveComponent("vxe-form-item"), ee = resolveComponent("vxe-form-group"), te = resolveComponent("vxe-form"), ne = resolveComponent("el-dialog");
       return openBlock(), createElementBlock("div", _hoisted_1$l1, [
         unref(formConfig).type === "FORM" ? (openBlock(), createElementBlock("div", {
           key: 0,
@@ -43078,20 +43104,20 @@ const index$o = /* @__PURE__ */ getDefaultExportFromCjs(jsExports), windowForm_v
             class: "form-buttons",
             style: normalizeStyle(computeOptBtnStyle.value("top"))
           }, [
-            (openBlock(!0), createElementBlock(Fragment, null, renderList(buttons.value, (ne) => (openBlock(), createBlock(G, {
-              key: ne.id,
+            (openBlock(!0), createElementBlock(Fragment, null, renderList(buttons.value, (oe) => (openBlock(), createBlock(G, {
+              key: oe.id,
               "auto-insert-space": "",
-              style: normalizeStyle("margin: 2px 2px 2px 2px;" + ne.css),
+              style: normalizeStyle("margin: 2px 2px 2px 2px;" + oe.css),
               type: "primary",
-              loading: ne.loading,
-              onClick: (oe) => btnClickFun(ne)
+              loading: oe.loading,
+              onClick: (re) => btnClickFun(oe)
             }, createSlots({
               default: withCtx(() => [
-                createTextVNode(" " + toDisplayString(unref($T)(ne.name)), 1)
+                createTextVNode(" " + toDisplayString(unref($T)(oe.name)), 1)
               ]),
               _: 2
             }, [
-              ne.iconComponent ? {
+              oe.iconComponent ? {
                 name: "icon",
                 fn: withCtx(() => [
                   createVNode(X, {
@@ -43099,7 +43125,7 @@ const index$o = /* @__PURE__ */ getDefaultExportFromCjs(jsExports), windowForm_v
                     style: { verticalAlign: "middle" }
                   }, {
                     default: withCtx(() => [
-                      (openBlock(), createBlock(resolveDynamicComponent(ne.iconComponent)))
+                      (openBlock(), createBlock(resolveDynamicComponent(oe.iconComponent)))
                     ]),
                     _: 2
                   }, 1024)
@@ -43109,165 +43135,176 @@ const index$o = /* @__PURE__ */ getDefaultExportFromCjs(jsExports), windowForm_v
             ]), 1032, ["style", "loading", "onClick"]))), 128))
           ], 4)) : createCommentVNode("", !0)
         ], 4)) : createCommentVNode("", !0),
-        createVNode(ee, {
+        createVNode(te, {
           ref_key: "form",
           ref: form,
           data: unref(formData),
           rules: editRules.value,
           loading: unref(formLoading),
           "title-align": "right",
-          "title-width": "115",
+          "title-width": computeTitleWidth.value,
           class: normalizeClass({ "single-row": unref(formConfig).params.singleRow })
         }, {
           default: withCtx(() => [
-            (openBlock(!0), createElementBlock(Fragment, null, renderList(unref(formConfig).columns, (ne) => (openBlock(), createElementBlock(Fragment, {
-              key: ne.title
-            }, [
-              ne.colType !== "showInGrid" ? (openBlock(), createBlock(Z, {
-                key: 0,
-                field: ne.field,
-                title: computeItemTitle.value(ne.title),
-                "title-overflow": "tooltip",
-                span: computeSpan.value(ne),
-                "item-render": ne.itemRender,
-                "title-prefix": ne.titlePrefix,
-                visible: ne.displayForm,
-                style: normalizeStyle(ne.style),
-                "class-name": computeItemClass.value(ne),
-                "visible-method": ne.editRender.props.displayLogic ? displayLogicEvent : null
-              }, createSlots({ _: 2 }, [
-                ne.dataType === "EDITOR" ? {
-                  name: "default",
-                  fn: withCtx(() => [
-                    createVNode(unref(T$2), {
-                      modelValue: unref(formData)[ne.field],
-                      "onUpdate:modelValue": (oe) => unref(formData)[ne.field] = oe,
-                      extensions: [getCodeLanguagePlugin(ne.language), unref(EditorView).lineWrapping],
-                      onReady: (oe) => handleReady(ne.field, oe),
-                      onFocus: (oe) => isRef(editorFocusField) ? editorFocusField.value = ne.field : editorFocusField = ne.field,
-                      "auto-destroy": ""
-                    }, null, 8, ["modelValue", "onUpdate:modelValue", "extensions", "onReady", "onFocus"]),
-                    createElementVNode("div", {
-                      class: "editor-operation-btn",
-                      style: normalizeStyle(computeEditorBtnStyle.value(ne.field))
-                    }, [
-                      ne.language == "javascript" ? (openBlock(), createElementBlock("i", {
-                        key: 0,
-                        title: "美化",
-                        class: "iconfont icon-magic-stick",
-                        onClick: (oe) => onEditorBtnClick(ne, "beautify")
-                      }, null, 8, _hoisted_3$hX)) : createCommentVNode("", !0),
-                      createElementVNode("i", {
-                        title: "全选",
-                        class: "iconfont icon-check-square",
-                        onClick: (oe) => onEditorBtnClick(ne, "checkAll")
-                      }, null, 8, _hoisted_4$ax),
-                      createElementVNode("i", {
-                        title: "复制",
-                        class: "iconfont icon-document-copy",
-                        onClick: (oe) => onEditorBtnClick(ne, "copy")
-                      }, null, 8, _hoisted_5$4X),
-                      createElementVNode("i", {
-                        title: "清空",
-                        class: "iconfont icon-clear",
-                        onClick: (oe) => onEditorBtnClick(ne, "clear")
-                      }, null, 8, _hoisted_6$20),
-                      ne.language == "javascript" ? (openBlock(), createElementBlock("i", {
-                        key: 1,
-                        title: "组合式API转换",
-                        class: "iconfont icon-swap",
-                        onClick: (oe) => onEditorBtnClick(ne, "swap")
-                      }, null, 8, _hoisted_7$13)) : createCommentVNode("", !0)
-                    ], 4)
-                  ]),
-                  key: "0"
-                } : ne.dataType === "STRING" && ne.canScan === !0 ? {
-                  name: "default",
-                  fn: withCtx(() => [
-                    createVNode(K, {
-                      modelValue: unref(formData)[ne.field],
-                      "onUpdate:modelValue": (oe) => unref(formData)[ne.field] = oe,
-                      onKeyup: (oe) => onIconInputEnter(ne, oe),
-                      onChange: (oe) => onIconInputChange(ne)
-                    }, {
-                      suffix: withCtx(() => [
-                        createElementVNode("i", {
-                          class: "iconfont icon-scan1",
-                          onClick: (oe) => onScanIconClick(ne),
-                          style: { cursor: "pointer" }
-                        }, null, 8, ["onClick"])
-                      ]),
-                      _: 2
-                    }, 1032, ["modelValue", "onUpdate:modelValue", "onKeyup", "onChange"])
-                  ]),
-                  key: "1"
-                } : ne.itemRender.props.suffixIconfont || ne.itemRender.props.prefixIconfont ? {
-                  name: "default",
-                  fn: withCtx(() => [
-                    createVNode(K, {
-                      modelValue: unref(formData)[ne.field],
-                      "onUpdate:modelValue": (oe) => unref(formData)[ne.field] = oe,
-                      clearable: !1,
-                      onKeyup: (oe) => onIconInputEnter(ne, oe),
-                      onChange: (oe) => onIconInputChange(ne)
-                    }, createSlots({ _: 2 }, [
-                      ne.itemRender.props.suffixIconfont ? {
-                        name: "suffix",
-                        fn: withCtx(() => [
+            (openBlock(!0), createElementBlock(Fragment, null, renderList(unref(formConfig).params.columnsGroup, (oe) => (openBlock(), createBlock(ee, {
+              span: "24",
+              title: oe.title,
+              "content-class-name": oe.title ? "vxe-form--group-content-border" : "",
+              "title-bold": "",
+              vertical: ""
+            }, {
+              default: withCtx(() => [
+                (openBlock(!0), createElementBlock(Fragment, null, renderList(computeItemGroup.value(oe), (re) => (openBlock(), createElementBlock(Fragment, {
+                  key: re.title
+                }, [
+                  re.colType !== "showInGrid" ? (openBlock(), createBlock(Z, {
+                    key: 0,
+                    field: re.field,
+                    title: computeItemTitle.value(re.title),
+                    "title-overflow": "tooltip",
+                    span: computeSpan.value(re),
+                    "item-render": re.itemRender,
+                    "title-prefix": re.titlePrefix,
+                    visible: re.displayForm,
+                    style: normalizeStyle(re.style),
+                    "class-name": computeItemClass.value(re),
+                    "visible-method": re.editRender.props.displayLogic ? displayLogicEvent : null
+                  }, createSlots({ _: 2 }, [
+                    re.dataType === "EDITOR" ? {
+                      name: "default",
+                      fn: withCtx(() => [
+                        createVNode(unref(T$2), {
+                          modelValue: unref(formData)[re.field],
+                          "onUpdate:modelValue": (ae) => unref(formData)[re.field] = ae,
+                          extensions: [getCodeLanguagePlugin(re.language), unref(EditorView).lineWrapping],
+                          onReady: (ae) => handleReady(re.field, ae),
+                          onFocus: (ae) => isRef(editorFocusField) ? editorFocusField.value = re.field : editorFocusField = re.field,
+                          "auto-destroy": ""
+                        }, null, 8, ["modelValue", "onUpdate:modelValue", "extensions", "onReady", "onFocus"]),
+                        createElementVNode("div", {
+                          class: "editor-operation-btn",
+                          style: normalizeStyle(computeEditorBtnStyle.value(re.field))
+                        }, [
+                          re.language == "javascript" ? (openBlock(), createElementBlock("i", {
+                            key: 0,
+                            title: "美化",
+                            class: "iconfont icon-magic-stick",
+                            onClick: (ae) => onEditorBtnClick(re, "beautify")
+                          }, null, 8, _hoisted_3$hX)) : createCommentVNode("", !0),
                           createElementVNode("i", {
-                            class: normalizeClass("iconfont " + ne.itemRender.props.suffixIconfont),
-                            onClick: (oe) => onIconClick(ne),
-                            style: { cursor: "pointer" }
-                          }, null, 10, ["onClick"])
-                        ]),
-                        key: "0"
-                      } : ne.itemRender.props.prefixIconfont ? {
-                        name: "prefix",
-                        fn: withCtx(() => [
+                            title: "全选",
+                            class: "iconfont icon-check-square",
+                            onClick: (ae) => onEditorBtnClick(re, "checkAll")
+                          }, null, 8, _hoisted_4$ax),
                           createElementVNode("i", {
-                            class: normalizeClass("iconfont " + ne.itemRender.props.prefixIconfont),
-                            onClick: (oe) => onIconClick(ne),
-                            style: { cursor: "pointer" }
-                          }, null, 10, ["onClick"])
-                        ]),
-                        key: "1"
-                      } : void 0
-                    ]), 1032, ["modelValue", "onUpdate:modelValue", "onKeyup", "onChange"])
-                  ]),
-                  key: "2"
-                } : ne.dataType === "IMG" ? {
-                  name: "default",
-                  fn: withCtx(() => [
-                    createVNode(unref(PictureUpload), {
-                      uploadConfig: unref(uploadConfig),
-                      filePreviewList: unref(fieldPreviewMap)[ne.field],
-                      "onUpdate:filePreviewList": (oe) => unref(fieldPreviewMap)[ne.field] = oe
-                    }, null, 8, ["uploadConfig", "filePreviewList", "onUpdate:filePreviewList"])
-                  ]),
-                  key: "3"
-                } : void 0
-              ]), 1032, ["field", "title", "span", "item-render", "title-prefix", "visible", "style", "class-name", "visible-method"])) : createCommentVNode("", !0)
-            ], 64))), 128)),
+                            title: "复制",
+                            class: "iconfont icon-document-copy",
+                            onClick: (ae) => onEditorBtnClick(re, "copy")
+                          }, null, 8, _hoisted_5$4X),
+                          createElementVNode("i", {
+                            title: "清空",
+                            class: "iconfont icon-clear",
+                            onClick: (ae) => onEditorBtnClick(re, "clear")
+                          }, null, 8, _hoisted_6$20),
+                          re.language == "javascript" ? (openBlock(), createElementBlock("i", {
+                            key: 1,
+                            title: "组合式API转换",
+                            class: "iconfont icon-swap",
+                            onClick: (ae) => onEditorBtnClick(re, "swap")
+                          }, null, 8, _hoisted_7$13)) : createCommentVNode("", !0)
+                        ], 4)
+                      ]),
+                      key: "0"
+                    } : re.dataType === "STRING" && re.canScan === !0 ? {
+                      name: "default",
+                      fn: withCtx(() => [
+                        createVNode(K, {
+                          modelValue: unref(formData)[re.field],
+                          "onUpdate:modelValue": (ae) => unref(formData)[re.field] = ae,
+                          onKeyup: (ae) => onIconInputEnter(re, ae),
+                          onChange: (ae) => onIconInputChange(re)
+                        }, {
+                          suffix: withCtx(() => [
+                            createElementVNode("i", {
+                              class: "iconfont icon-scan1",
+                              onClick: (ae) => onScanIconClick(re),
+                              style: { cursor: "pointer" }
+                            }, null, 8, ["onClick"])
+                          ]),
+                          _: 2
+                        }, 1032, ["modelValue", "onUpdate:modelValue", "onKeyup", "onChange"])
+                      ]),
+                      key: "1"
+                    } : re.itemRender.props.suffixIconfont || re.itemRender.props.prefixIconfont ? {
+                      name: "default",
+                      fn: withCtx(() => [
+                        createVNode(K, {
+                          modelValue: unref(formData)[re.field],
+                          "onUpdate:modelValue": (ae) => unref(formData)[re.field] = ae,
+                          clearable: !1,
+                          onKeyup: (ae) => onIconInputEnter(re, ae),
+                          onChange: (ae) => onIconInputChange(re)
+                        }, createSlots({ _: 2 }, [
+                          re.itemRender.props.suffixIconfont ? {
+                            name: "suffix",
+                            fn: withCtx(() => [
+                              createElementVNode("i", {
+                                class: normalizeClass("iconfont " + re.itemRender.props.suffixIconfont),
+                                onClick: (ae) => onIconClick(re),
+                                style: { cursor: "pointer" }
+                              }, null, 10, ["onClick"])
+                            ]),
+                            key: "0"
+                          } : re.itemRender.props.prefixIconfont ? {
+                            name: "prefix",
+                            fn: withCtx(() => [
+                              createElementVNode("i", {
+                                class: normalizeClass("iconfont " + re.itemRender.props.prefixIconfont),
+                                onClick: (ae) => onIconClick(re),
+                                style: { cursor: "pointer" }
+                              }, null, 10, ["onClick"])
+                            ]),
+                            key: "1"
+                          } : void 0
+                        ]), 1032, ["modelValue", "onUpdate:modelValue", "onKeyup", "onChange"])
+                      ]),
+                      key: "2"
+                    } : re.dataType === "IMG" ? {
+                      name: "default",
+                      fn: withCtx(() => [
+                        createVNode(unref(PictureUpload), {
+                          uploadConfig: unref(uploadConfig),
+                          filePreviewList: unref(fieldPreviewMap)[re.field],
+                          "onUpdate:filePreviewList": (ae) => unref(fieldPreviewMap)[re.field] = ae
+                        }, null, 8, ["uploadConfig", "filePreviewList", "onUpdate:filePreviewList"])
+                      ]),
+                      key: "3"
+                    } : void 0
+                  ]), 1032, ["field", "title", "span", "item-render", "title-prefix", "visible", "style", "class-name", "visible-method"])) : createCommentVNode("", !0)
+                ], 64))), 128))
+              ]),
+              _: 2
+            }, 1032, ["title", "content-class-name"]))), 256)),
             unref(formConfig).type === "FORM" && buttons.value.length > 0 && unref(formConfig).params.buttonPosition.includes("BOTTOM") ? (openBlock(), createBlock(Z, {
               key: 0,
               align: computeOptBtnStyle.value("bottom"),
               span: "24"
             }, {
               default: withCtx(() => [
-                (openBlock(!0), createElementBlock(Fragment, null, renderList(buttons.value, (ne) => (openBlock(), createBlock(G, {
-                  key: ne.id,
+                (openBlock(!0), createElementBlock(Fragment, null, renderList(buttons.value, (oe) => (openBlock(), createBlock(G, {
+                  key: oe.id,
                   "auto-insert-space": "",
-                  style: normalizeStyle("margin: 2px 2px 2px 2px;" + ne.css),
+                  style: normalizeStyle("margin: 2px 2px 2px 2px;" + oe.css),
                   type: "primary",
-                  loading: ne.loading,
-                  onClick: (oe) => btnClickFun(ne)
+                  loading: oe.loading,
+                  onClick: (re) => btnClickFun(oe)
                 }, createSlots({
                   default: withCtx(() => [
-                    createTextVNode(" " + toDisplayString(unref($T)(ne.name)), 1)
+                    createTextVNode(" " + toDisplayString(unref($T)(oe.name)), 1)
                   ]),
                   _: 2
                 }, [
-                  ne.iconComponent ? {
+                  oe.iconComponent ? {
                     name: "icon",
                     fn: withCtx(() => [
                       createVNode(X, {
@@ -43275,7 +43312,7 @@ const index$o = /* @__PURE__ */ getDefaultExportFromCjs(jsExports), windowForm_v
                         style: { verticalAlign: "middle" }
                       }, {
                         default: withCtx(() => [
-                          (openBlock(), createBlock(resolveDynamicComponent(ne.iconComponent)))
+                          (openBlock(), createBlock(resolveDynamicComponent(oe.iconComponent)))
                         ]),
                         _: 2
                       }, 1024)
@@ -43288,12 +43325,12 @@ const index$o = /* @__PURE__ */ getDefaultExportFromCjs(jsExports), windowForm_v
             }, 8, ["align"])) : createCommentVNode("", !0)
           ]),
           _: 1
-        }, 8, ["data", "rules", "loading", "class"]),
-        createVNode(te, {
+        }, 8, ["data", "rules", "loading", "title-width", "class"]),
+        createVNode(ne, {
           ref: "pictureUploadModal",
           width: "20%",
           modelValue: unref(uploadConfig).show,
-          "onUpdate:modelValue": H[0] || (H[0] = (ne) => unref(uploadConfig).show = ne),
+          "onUpdate:modelValue": H[0] || (H[0] = (oe) => unref(uploadConfig).show = oe),
           "z-index": 1e3,
           draggable: "",
           "append-to-body": "",
@@ -43309,7 +43346,7 @@ const index$o = /* @__PURE__ */ getDefaultExportFromCjs(jsExports), windowForm_v
       ]);
     };
   }
-}, WindowForm = /* @__PURE__ */ _export_sfc(_sfc_main$d, [["__scopeId", "data-v-3b9acef8"]]);
+}, WindowForm = /* @__PURE__ */ _export_sfc(_sfc_main$d, [["__scopeId", "data-v-dd626eb7"]]);
 WindowForm.name = "slw-window-form";
 WindowForm.install = (Q) => {
   Q.component(WindowForm.name, WindowForm);
@@ -59085,7 +59122,7 @@ const windowDesigner_vue_vue_type_style_index_0_scoped_a3ebe962_lang = "", _with
   emits: ["update:type", "update:rootLayout", "update:viewData", "update:rowData"],
   setup(Q, { emit: H }) {
     const X = Q, G = defineAsyncComponent(
-      () => import("./index-5418c07e.js")
+      () => import("./index-30bdf62f.js")
     );
     let K = useVModel(X, "type", H), Z = useVModel(X, "rootLayout", H), ee = useVModel(X, "viewData", H), te = useVModel(X, "rowData", H), ne = ref(0), oe = ref(null);
     oe.value = createDesigner();
@@ -165456,7 +165493,7 @@ function reConsole() {
   }
 }
 console.info(
-  `%cSLW %cVer 1.0.0-alpha.3%c
+  `%cSLW %cVer 1.0.0-alpha.5%c
 %c指引文档：%chttp://slwdoc.js.sforcecon.com:5900/%c
 %c启光文档：%chttp://docs.js.sforcecon.com:5900/notepad/view/592`,
   "color:#409EFF;font-size: 22px;font-weight:bolder;text-shadow: 2px 2px 4px #84c1ff;",