agilebuilder-ui 1.0.40 → 1.0.41-beta1

package/lib/super-ui.js

@@ -12339,7 +12339,7 @@ function parseCondition(entity, conditionList, isSql, tableName, additionalParam
       n.indexOf("parent_+_") !== -1 ? (n = n.replace("parent_+_", ""), n = n.split("_+_")[1], i = getValue$2(parentFormData, n, isSql)) : i = getValue$2(entity, n, isSql), o && i == null && (i = getValue$2(entity, o, isSql));
     const l = t.operator, f = t.propValue, p = t.dataType, y = t.variableIsNull;
     let x;
-    pageContext ? x = getPropValueNew$1(f, pageContext) : x = getPropValue(
+    pageContext ? x = getPropValueNew(f, pageContext) : x = getPropValue(
       f,
       entity,
       additionalParamMap,
@@ -12436,7 +12436,7 @@ function getLastNDay(e) {
   console.log(`getLastNDay从 ${k} 开始，到 ${O} 结束`), retur[t];
 }
 function getPropValue(e, t, n, o, i, l, f) {
-  return getPropValueNew$1(e, { entity: { data: t, context: o, request: n, parent: i, row: l, task: f } });
+  return getPropValueNew(e, { entity: { data: t, context: o, request: n, parent: i, row: l, task: f } });
 }
 function getAdditionalParamMap$1(e) {
   if (e && e.entity) {
@@ -12446,7 +12446,7 @@ function getAdditionalParamMap$1(e) {
     return n && Object.assign(t, n), t;
   }
 }
-function getPropValueNew$1(e, t) {
+function getPropValueNew(e, t) {
   let n = null;
   if (e && e !== null && e !== "") {
     const o = t && t.entity ? t.entity.data : null, i = getAdditionalParamMap$1(t), l = t && t.entity ? t.entity.context : null, f = t && t.entity ? t.entity.parent ? t.entity.parent : t.entity.data : null, p = t && t.entity ? t.entity.row : null, y = t && t.entity ? t.entity.task : null, x = t && t.entity ? t.entity.system : null;
@@ -12511,7 +12511,7 @@ function analysisValue(e, t, n, o, i) {
   const f = e.split("-#-#");
   return f != null && f.length > 0 && f.forEach((p) => {
     let y;
-    i ? y = getPropValueNew$1(
+    i ? y = getPropValueNew(
       p,
       i
     ) : y = getPropValue(
@@ -17327,6 +17327,9 @@ const ViewImageDialog = /* @__PURE__ */ _export_sfc$1(_sfc_main$19, [["render",
     if (this.column.componentType === "inputNumber" && this.setInputNumberConfig(), this.column.valueSetOptions && this.column.componentType !== "inputNumber") {
       const t = JSON.parse(this.column.valueSetOptions);
       t && t.valueSetOptions && (this.valueSetOptions = t.valueSetOptions), t.dynamicDataSourceCode && t.dynamicDataSourceCode !== "" && (this.dynamicDataSourceCode = t.dynamicDataSourceCode);
+    } else if (this.column.componentType === "switch") {
+      const t = JSON.parse(this.column.valueSetOptions);
+      t && (this.valueSetOptions = t);
     }
     if (this.column.orgTreeSet) {
       const t = JSON.parse(this.column.orgTreeSet);
@@ -17691,6 +17694,7 @@ const ViewImageDialog = /* @__PURE__ */ _export_sfc$1(_sfc_main$19, [["render",
         const t = Number(e);
         return setEntityFieldValue(this.row, this.column.prop, t), t;
       }
+      return e;
     },
     refresData(e) {
       $emit(this, "refresData", e);
@@ -17737,6 +17741,18 @@ const ViewImageDialog = /* @__PURE__ */ _export_sfc$1(_sfc_main$19, [["render",
     },
     isInvalidValue(e) {
       return e == null || e === "";
+    },
+    getSwitchConfig(e) {
+      if (this.valueSetOptions && this.valueSetOptions[e])
+        return this.valueSetOptions[e];
+      if (e === "activeValue")
+        return this.dataSourceType === "mysql" ? !0 : 1;
+      if (e === "inactiveValue")
+        return this.dataSourceType === "mysql" ? !1 : 0;
+      if (e === "offColor")
+        return "#ff4949";
+      if (e === "onColor")
+        return "#13ce66";
     }
   }
 };
@@ -18037,29 +18053,29 @@ function _sfc_render$U(e, t, n, o, i, l) {
       onChange: t[73] || (t[73] = (z) => l.cellEvent("change", z)),
       onFocus: t[74] || (t[74] = (z) => l.cellEvent("focus", z)),
       onInput: t[75] || (t[75] = (z) => l.cellEvent("input", z))
-    }, null, 8, ["modelValue", "controls-position", "disabled", "max", "min", "precision", "step"])) : (n.type === "switch" || n.column.dataType === "BOOLEAN") && i.dataSourceType === "mysql" ? (openBlock(), createBlock(H, {
+    }, null, 8, ["modelValue", "controls-position", "disabled", "max", "min", "precision", "step"])) : n.type === "switch" || n.column.dataType === "BOOLEAN" ? (openBlock(), createBlock(H, {
       key: 15,
       ref: "item",
       modelValue: i.innerValue,
       "onUpdate:modelValue": t[76] || (t[76] = (z) => i.innerValue = z),
+      "active-text": l.getSwitchConfig("activeText"),
+      "active-value": l.getSwitchConfig("activeValue"),
       disabled: i.disabled,
-      "active-color": "#13ce66",
-      "inactive-color": "#ff4949",
+      "inactive-text": l.getSwitchConfig("inactiveText"),
+      "inactive-value": l.getSwitchConfig("inactiveValue"),
+      "active-color": l.getSwitchConfig("onColor"),
+      "inactive-color": l.getSwitchConfig("offColor"),
       onChange: t[77] || (t[77] = (z) => l.cellEvent("change", z)),
       onInput: t[78] || (t[78] = (z) => l.cellEvent("input", z, !0))
-    }, null, 8, ["modelValue", "disabled"])) : n.type === "switch" || n.column.dataType === "BOOLEAN" ? (openBlock(), createBlock(H, {
+    }, null, 8, ["modelValue", "active-text", "active-value", "disabled", "inactive-text", "inactive-value", "active-color", "inactive-color"])) : n.type === "slider" ? (openBlock(), createBlock(J, {
       key: 16,
       ref: "item",
       modelValue: i.innerValue,
       "onUpdate:modelValue": t[79] || (t[79] = (z) => i.innerValue = z),
-      "active-value": 1,
       disabled: i.disabled,
-      "inactive-value": 0,
-      "active-color": "#13ce66",
-      "inactive-color": "#ff4949",
       onChange: t[80] || (t[80] = (z) => l.cellEvent("change", z)),
       onInput: t[81] || (t[81] = (z) => l.cellEvent("input", z, !0))
-    }, null, 8, ["modelValue", "disabled"])) : n.type === "slider" ? (openBlock(), createBlock(J, {
+    }, null, 8, ["modelValue", "disabled"])) : n.type === "rate" ? (openBlock(), createBlock(q, {
       key: 17,
       ref: "item",
       modelValue: i.innerValue,
@@ -18067,16 +18083,8 @@ function _sfc_render$U(e, t, n, o, i, l) {
       disabled: i.disabled,
       onChange: t[83] || (t[83] = (z) => l.cellEvent("change", z)),
       onInput: t[84] || (t[84] = (z) => l.cellEvent("input", z, !0))
-    }, null, 8, ["modelValue", "disabled"])) : n.type === "rate" ? (openBlock(), createBlock(q, {
-      key: 18,
-      ref: "item",
-      modelValue: i.innerValue,
-      "onUpdate:modelValue": t[85] || (t[85] = (z) => i.innerValue = z),
-      disabled: i.disabled,
-      onChange: t[86] || (t[86] = (z) => l.cellEvent("change", z)),
-      onInput: t[87] || (t[87] = (z) => l.cellEvent("input", z, !0))
     }, null, 8, ["modelValue", "disabled"])) : i.deptManTree || i.deptTree || i.wgManTree || i.wgTree ? (openBlock(), createBlock(F, {
-      key: 19,
+      key: 18,
       "check-strictly": i.isCheckStrictly,
       "department-info": i.departmentInfo,
       disabled: i.disabled,
@@ -18125,11 +18133,11 @@ function _sfc_render$U(e, t, n, o, i, l) {
       _: 1
     }, 8, ["title", "visible"]),
     i.showSingleImgFlag ? (openBlock(), createBlock(fe, {
-      key: 20,
+      key: 19,
       deleteable: !i.disabled,
       downloadable: !i.disabled,
       "file-list": i.fileList,
-      onClose: t[88] || (t[88] = (z) => i.showSingleImgFlag = !1),
+      onClose: t[85] || (t[85] = (z) => i.showSingleImgFlag = !1),
       onDelete: l.deleteFile
     }, null, 8, ["deleteable", "downloadable", "file-list", "onDelete"])) : createCommentVNode("", !0)
   ], 4));
@@ -20750,7 +20758,7 @@ const NormalColumn = /* @__PURE__ */ _export_sfc$1(_sfc_main$13, [["render", _sf
     }
   },
   created() {
-    this.label = this.getHeader();
+    this.label = this.getHeader(), console.log("%c描述-181624", "color:#2E3435;background:#F8BB07;padding:3px;border-radius:2px", this.column);
   },
   methods: {
     getHeader() {
@@ -20767,7 +20775,7 @@ const NormalColumn = /* @__PURE__ */ _export_sfc$1(_sfc_main$13, [["render", _sf
 function _sfc_render$O(e, t, n, o, i, l) {
   const f = resolveComponent("el-table-column");
   return openBlock(), createBlock(f, {
-    width: "150",
+    width: n.column.width ? n.column.width : 150,
     align: n.column.groupHeader ? "center" : ""
   }, {
     header: withCtx(() => [
@@ -20797,7 +20805,7 @@ function _sfc_render$O(e, t, n, o, i, l) {
       }, null, 8, ["is-sql", "column", "list-code"]))), 128))
     ]),
     _: 1
-  }, 8, ["align"]);
+  }, 8, ["width", "align"]);
 }
 const GroupColumn = /* @__PURE__ */ _export_sfc$1(_sfc_main$12, [["render", _sfc_render$O]]);
 /**!