slw 1.0.0-beta.11 → 1.0.0-beta.12

package/lib/{index-fcb3b122.js → index-00c74bd6.js}

@@ -1,5 +1,5 @@
 import { pushScopeId as P, popScopeId as V, createElementVNode as h, resolveComponent as g, openBlock as o, createElementBlock as p, createBlock as f, normalizeClass as T, normalizeStyle as A, withModifiers as R, withCtx as r, renderSlot as q, createCommentVNode as _, Fragment as B, createVNode as s, mergeProps as k, renderList as j, toDisplayString as E, normalizeProps as K, guardReactiveProps as Q, resolveDynamicComponent as Z, defineAsyncComponent as $, computed as F, unref as D, withDirectives as ee, vShow as te } from "vue";
-import { _ as x, d as S, a as L, u as N } from "./index-7d1a1d7f.js";
+import { _ as x, d as S, a as L, u as N } from "./index-ed748dab.js";
 import "vue-router";
 const I = {
   computed: {},

package/lib/{index-7d1a1d7f.js → index-ed748dab.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_9c9d16d3_lang = "", _withScopeId$9 = (Q) => (pushScopeId("data-v-9c9d16d3"), Q = Q(), popScopeId(), Q), _hoisted_1$l2 = {
+const windowGrid_vue_vue_type_style_index_0_scoped_27867b98_lang = "", _withScopeId$9 = (Q) => (pushScopeId("data-v-27867b98"), Q = Q(), popScopeId(), Q), _hoisted_1$l2 = {
   class: "slw-window-grid-container",
   style: { height: "100%" }
 }, _hoisted_2$kZ = /* @__PURE__ */ _withScopeId$9(() => /* @__PURE__ */ createElementVNode("span", { class: "vxe-table--cell-main-area" }, null, -1)), _hoisted_3$hZ = /* @__PURE__ */ _withScopeId$9(() => /* @__PURE__ */ createElementVNode("span", { class: "vxe-table--cell-active-area" }, null, -1)), _hoisted_4$az = /* @__PURE__ */ _withScopeId$9(() => /* @__PURE__ */ createElementVNode("span", { class: "vxe-table--cell-copy-area" }, null, -1)), _hoisted_5$4Z = [
@@ -8549,7 +8549,7 @@ const windowGrid_vue_vue_type_style_index_0_scoped_9c9d16d3_lang = "", _withScop
   emits: ["update:gridData", "jumpDesign"],
   setup(__props, { expose: __expose, emit }) {
     const props = __props, axios = inject("$axios"), hiprint = inject("$hiprint"), serverPrint = inject("$serverPrint"), regionMap = inject("$regionMap"), focusInput = inject("$focusInput"), base64Encode = inject("$base64Encode"), base64Decode = inject("$base64Decode"), $T = inject("$t"), httpHeaders = inject("$httpHeaders"), addGridClickEvent = inject("$addGridClickEvent"), showPreView = inject("$showPreView"), showPreViewClose = inject("$showPreViewClose"), preViewCloseCallback = inject("$preViewCloseCallback"), toggleModalLoading = inject("$toggleModalLoading"), closePreModal = inject("$closePreModal"), rowDbClick = inject("$rowDbClick"), $Modal = inject("$modal"), $qs = inject("$qs"), $ElMessage = inject("$ElMessage"), $vxeMessage = inject("$vxeMessage"), $vxeConfirm = inject("$vxeConfirm"), $vxeOpen = inject("$vxeOpen"), $vxeReadFile = inject("$vxeReadFile"), openModal = inject("$openModal"), closeModal = inject("$closeModal"), evalDefaultValue = inject("$evalDefaultValue"), callGridClickEvents = inject("$callGridClickEvents"), ElMessageBox = inject("$ElMessageBox"), addOnActivatedFun = inject("$addOnActivatedFun"), debounce = inject("$debounce"), router = inject("$router"), $components = inject("$components"), $componentsPath = inject("$componentsPath"), $externalFun = inject("$externalFun"), beginEdit = inject("$beginEdit"), endEdit = inject("$endEdit"), route = useRoute();
-    let success = inject("$success"), error = inject("$error"), gridData = useVModel$1(props, "gridData", emit), rowIndex = ref(0), isImport = ref(!1), importUrl = ref(`${(axios == null ? void 0 : axios.baseUrl) || ""}/window/import`), importBtnId = ref(""), uploadConfig = ref({
+    let success = inject("$success", null), error = inject("$error", null), gridData = useVModel$1(props, "gridData", emit), rowIndex = ref(0), isImport = ref(!1), importUrl = ref(`${(axios == null ? void 0 : axios.baseUrl) || ""}/window/import`), importBtnId = ref(""), uploadConfig = ref({
       show: !1,
       dataId: "",
       regionId: "",
@@ -9837,6 +9837,15 @@ const windowGrid_vue_vue_type_style_index_0_scoped_9c9d16d3_lang = "", _withScop
           return;
         }
       });
+    }, computeNewLine = () => {
+      let Q = gridData.value.formConfig.items.filter((H) => H.visible);
+      for (let [H, X] of Q.entries())
+        if (H > 0) {
+          X.span = X.span ? X.span : 12;
+          let G = Q[H - 1];
+          Number(X.span) > 24 ? (X.aLine = !0, X.residue = 0) : (X.aLine = !1, X.residue = 24 - Number(X.span), G && (G.aLine || G.residue - Number(X.span) < 0) || H == 0 ? X.residue = 24 - Number(X.span) : G.residue - Number(X.span) >= 0 && (X.residue = G.residue - Number(X.span))), (X.itemRender.props.newLine === !0 || X.itemRender.props.newLine === "Y") && (G.span = Number(G.span) + Number(G.residue), G.residue = 0, X.residue = 24 - Number(X.span));
+        } else
+          H == 0 && (X.span = X.span ? Number(X.span) : 12, X.residue = X.span > 24 ? 0 : 24 - Number(X.span));
     };
     return onMounted(async () => {
       gridData.value.addListener && getCurRegion() && addListener(), gridData.value.type === "TREE_STRUCTURE" && (gridData.value.menuConfig = {
@@ -9856,7 +9865,7 @@ const windowGrid_vue_vue_type_style_index_0_scoped_9c9d16d3_lang = "", _withScop
           },
           events: { click: toolBarButtonClick }
         });
-      }), gridData.value.formConfig.items.forEach((Q) => {
+      }), computeNewLine(), gridData.value.formConfig.items.forEach((Q) => {
         var H, X, G, K;
         if (queryFormData.value[Q.field] = null, (H = Q == null ? void 0 : Q.itemRender) != null && H.defaultValue && (queryFormData.value[Q.field] = Q.itemRender.defaultValue), (G = (X = Q == null ? void 0 : Q.itemRender) == null ? void 0 : X.events) != null && G.hasOwnProperty("change") && (Q.itemRender.events.change = onQueryFieldChange), Q.querys && getSelectorData({ _region_id: gridData.value.params._region_id }, Q.querys.id, Q.querys.selectorId).then((Z) => {
           const ee = Z.map((te) => Object.assign(
@@ -10178,7 +10187,7 @@ const windowGrid_vue_vue_type_style_index_0_scoped_9c9d16d3_lang = "", _withScop
       ]);
     };
   }
-}, WindowGrid = /* @__PURE__ */ _export_sfc(_sfc_main$e, [["__scopeId", "data-v-9c9d16d3"]]);
+}, WindowGrid = /* @__PURE__ */ _export_sfc(_sfc_main$e, [["__scopeId", "data-v-27867b98"]]);
 WindowGrid.name = "slw-window-grid";
 WindowGrid.install = (Q) => {
   Q.component(WindowGrid.name, WindowGrid);
@@ -42490,7 +42499,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_ced375e6_lang = "", _withScopeId$8 = (Q) => (pushScopeId("data-v-ced375e6"), Q = Q(), popScopeId(), Q), _hoisted_1$l1 = { class: "slw-window-form" }, _hoisted_2$kY = {
+const index$o = /* @__PURE__ */ getDefaultExportFromCjs(jsExports), windowForm_vue_vue_type_style_index_0_scoped_22828ab0_lang = "", _withScopeId$8 = (Q) => (pushScopeId("data-v-22828ab0"), Q = Q(), popScopeId(), Q), _hoisted_1$l1 = { class: "slw-window-form" }, _hoisted_2$kY = {
   key: 0,
   class: "form-title"
 }, _hoisted_3$hY = ["onClick"], _hoisted_4$ay = ["onClick"], _hoisted_5$4Y = ["onClick"], _hoisted_6$20 = ["onClick"], _hoisted_7$13 = ["onClick"], _hoisted_8$G = ["onClick"], _sfc_main$d = {
@@ -42505,7 +42514,7 @@ const index$o = /* @__PURE__ */ getDefaultExportFromCjs(jsExports), windowForm_v
     const props = __props, axios = inject("$axios"), hiprint = inject("$hiprint"), serverPrint = inject("$serverPrint"), showPreView = inject("$showPreView"), showPreViewClose = inject("$showPreViewClose"), preViewCloseCallback = inject("$preViewCloseCallback"), toggleModalLoading = inject("$toggleModalLoading"), $Modal = inject("$modal"), $qs = inject("$qs"), $ElMessage = inject("$ElMessage"), $vxeMessage = inject("$vxeMessage"), base64Encode = inject("$base64Encode"), base64Decode = inject("$base64Decode"), $vxeConfirm = inject("$vxeConfirm"), $T = inject("$t"), openModal = inject("$openModal"), closeModal = inject("$closeModal"), focusInput = inject("$focusInput"), evalDefaultValue = inject("$evalDefaultValue");
     let regionMap = inject("$regionMap");
     const ElMessageBox = inject("$ElMessageBox"), addOnActivatedFun = inject("$addOnActivatedFun"), debounce = inject("$debounce"), router = inject("$router"), $externalFun = inject("$externalFun"), endEdit = inject("$endEdit"), route = useRoute();
-    let success = inject("$success"), error = inject("$error"), formConfig = useVModel$1(props, "formConfig", emits), gridData = ref(formConfig.value), formData = ref({}), fieldColumnMap = ref({}), formDataClone = ref({}), formLoading = ref(!1), queryTimeout = ref(null);
+    let success = inject("$success", null), error = inject("$error", null), formConfig = useVModel$1(props, "formConfig", emits), gridData = ref(formConfig.value), formData = ref({}), fieldColumnMap = ref({}), formDataClone = ref({}), formLoading = ref(!1), queryTimeout = ref(null);
     const $modal = $Modal;
     let uploadConfig = ref({
       show: !1,
@@ -43428,7 +43437,7 @@ const index$o = /* @__PURE__ */ getDefaultExportFromCjs(jsExports), windowForm_v
       ]);
     };
   }
-}, WindowForm = /* @__PURE__ */ _export_sfc(_sfc_main$d, [["__scopeId", "data-v-ced375e6"]]);
+}, WindowForm = /* @__PURE__ */ _export_sfc(_sfc_main$d, [["__scopeId", "data-v-22828ab0"]]);
 WindowForm.name = "slw-window-form";
 WindowForm.install = (Q) => {
   Q.component(WindowForm.name, WindowForm);
@@ -59205,7 +59214,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-fcb3b122.js")
+      () => import("./index-00c74bd6.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();
@@ -59290,7 +59299,7 @@ WindowDesigner.name = "slw-window-designer";
 WindowDesigner.install = (Q) => {
   Q.component(WindowDesigner.name, WindowDesigner);
 };
-const windowIndex_vue_vue_type_style_index_0_scoped_21f3837c_lang = "", _withScopeId$1 = (Q) => (pushScopeId("data-v-21f3837c"), Q = Q(), popScopeId(), Q), _hoisted_1$kS = { class: "slw-config-window-container" }, _hoisted_2$kR = { class: "child-table-p" }, _sfc_main$2 = {
+const windowIndex_vue_vue_type_style_index_0_scoped_60f64c7e_lang = "", _withScopeId$1 = (Q) => (pushScopeId("data-v-60f64c7e"), Q = Q(), popScopeId(), Q), _hoisted_1$kS = { class: "slw-config-window-container" }, _hoisted_2$kR = { class: "child-table-p" }, _sfc_main$2 = {
   __name: "window-index",
   props: {
     windowId: {
@@ -60424,7 +60433,7 @@ const windowIndex_vue_vue_type_style_index_0_scoped_21f3837c_lang = "", _withSco
       ]);
     };
   }
-}, WindowIndex = /* @__PURE__ */ _export_sfc(_sfc_main$2, [["__scopeId", "data-v-21f3837c"]]);
+}, WindowIndex = /* @__PURE__ */ _export_sfc(_sfc_main$2, [["__scopeId", "data-v-60f64c7e"]]);
 WindowIndex.name = "slw-window-index";
 WindowIndex.install = (Q) => {
   Q.component(WindowIndex.name, WindowIndex);
@@ -127334,7 +127343,7 @@ const CryptoJS = /* @__PURE__ */ getDefaultExportFromCjs(cryptoJsExports), decry
       padding: CryptoJS.pad.Pkcs7
     }).ciphertext.toString();
   }
-}, FilterComponent_vue_vue_type_style_index_0_scoped_d9189950_lang = "", _withScopeId = (Q) => (pushScopeId("data-v-d9189950"), Q = Q(), popScopeId(), Q), _hoisted_1 = {
+}, FilterComponent_vue_vue_type_style_index_0_scoped_0474707b_lang = "", _withScopeId = (Q) => (pushScopeId("data-v-0474707b"), Q = Q(), popScopeId(), Q), _hoisted_1 = {
   key: 0,
   class: "slw-filter-component"
 }, _hoisted_2 = {
@@ -127359,7 +127368,7 @@ const CryptoJS = /* @__PURE__ */ getDefaultExportFromCjs(cryptoJsExports), decry
           const ue = de.filter((pe) => pe.field == le.field.toLowerCase())[0];
           if (ue) {
             const { itemRender: pe } = ue, { props: fe } = pe;
-            G.value = pe.name, G.value == "VxeSelect" ? K.value = pe.options : G.value.includes("ElDate") ? Z.value = fe.type : G.value == "ElTimePicker" ? (Z.value = fe.type, ee.value = fe.isRange) : G.value == "ElInputNumber" && (te.value = fe, fe.isRange && (X.value.data = [0, 0]));
+            G.value = pe.name, G.value == "VxeSelect" || G.value == "ElSelect" ? K.value = pe.options : G.value.includes("ElDate") ? Z.value = fe.type : G.value == "ElTimePicker" ? (Z.value = fe.type, ee.value = fe.isRange) : G.value == "ElInputNumber" && (te.value = fe, fe.isRange && (X.value.data = [0, 0]));
           }
         }
       }
@@ -127382,7 +127391,7 @@ const CryptoJS = /* @__PURE__ */ getDefaultExportFromCjs(cryptoJsExports), decry
     }, ne), ne(), (ae, le) => {
       const se = resolveComponent("vxe-select"), ce = resolveComponent("el-date-picker"), de = resolveComponent("el-time-picker"), he = resolveComponent("el-input"), ue = resolveComponent("el-input-number"), pe = resolveComponent("vxe-input");
       return unref(X) ? (openBlock(), createElementBlock("div", _hoisted_1, [
-        unref(G) == "VxeSelect" ? (openBlock(), createBlock(se, {
+        unref(G) == "VxeSelect" || unref(G) == "ElSelect" ? (openBlock(), createBlock(se, {
           key: 0,
           modelValue: unref(X).data,
           "onUpdate:modelValue": le[0] || (le[0] = (fe) => unref(X).data = fe),
@@ -127460,7 +127469,7 @@ const CryptoJS = /* @__PURE__ */ getDefaultExportFromCjs(cryptoJsExports), decry
       ])) : createCommentVNode("", !0);
     };
   }
-}, FilterComponent = /* @__PURE__ */ _export_sfc(_sfc_main, [["__scopeId", "data-v-d9189950"]]);
+}, FilterComponent = /* @__PURE__ */ _export_sfc(_sfc_main, [["__scopeId", "data-v-0474707b"]]);
 function _isSlot(Q) {
   return typeof Q == "function" || Object.prototype.toString.call(Q) === "[object Object]" && !isVNode(Q);
 }
@@ -165713,7 +165722,7 @@ function reConsole() {
   }
 }
 console.info(
-  `%cSLW %cVer 1.0.0-beta.11%c
+  `%cSLW %cVer 1.0.0-beta.12%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;",

package/lib/index.js

@@ -1,4 +1,4 @@
-import { i as m } from "./index-7d1a1d7f.js";
+import { i as m } from "./index-ed748dab.js";
 import "vue";
 import "vue-router";
 export {