form-custom-test 3.0.83 → 3.0.85

package/dist/render.es.js

@@ -26025,13 +26025,13 @@ function registerIcon(app) {
 if (typeof window !== "undefined") {
   let loadSvg = function() {
     var body = document.body;
-    var svgDom = document.getElementById("__svg__icons__dom__1775562133472__");
+    var svgDom = document.getElementById("__svg__icons__dom__1775622342022__");
     if (!svgDom) {
       svgDom = document.createElementNS("http://www.w3.org/2000/svg", "svg");
       svgDom.style.position = "absolute";
       svgDom.style.width = "0";
       svgDom.style.height = "0";
-      svgDom.id = "__svg__icons__dom__1775562133472__";
+      svgDom.id = "__svg__icons__dom__1775622342022__";
       svgDom.setAttribute("xmlns", "http://www.w3.org/2000/svg");
       svgDom.setAttribute("xmlns:link", "http://www.w3.org/1999/xlink");
     }
@@ -32471,7 +32471,6 @@ const _sfc_main$i = {
     return {
       fieldModel: null,
       oldFieldValue: null,
-      radioValue: null,
       rules: [],
       inputValue: ""
     };
@@ -32491,6 +32490,21 @@ const _sfc_main$i = {
       ];
     }
   },
+  watch: {
+    fieldModel: {
+      handler(newVal) {
+        if (typeof newVal === "string" && newVal.includes("_RADIO_OTHER_")) {
+          this.radioValue = "_RADIO_OTHER_";
+          this.inputValue = newVal.split("_RADIO_OTHER_")[1];
+        } else {
+          this.radioValue = newVal;
+          this.inputValue = "";
+        }
+      }
+    },
+    immediate: true,
+    deep: true
+  },
   created() {
     this.initOptionItems();
     this.initFieldModel();
@@ -32512,8 +32526,8 @@ const _sfc_main$i = {
       this.inputValue = "";
       if (value2 === "_RADIO_OTHER_") {
         this.fieldModel = value2;
-        if (this.otherValue) {
-          this.syncUpdateFormModel(`${value2}${this.otherValue}`);
+        if (this.inputValue) {
+          this.syncUpdateFormModel(`${value2}&${this.inputValue}`);
         } else {
           this.syncUpdateFormModel(value2);
         }
@@ -32527,8 +32541,9 @@ const _sfc_main$i = {
       this.dispatch("VFormRender", "fieldValidation", [this.getPropName()]);
     },
     handleOtherValueChange() {
-      if (this.fieldModel === "_RADIO_OTHER_") {
-        const newValue = this.otherValue ? `${this.fieldModel}${this.otherValue}` : this.fieldModel;
+      if (this.radioValue === "_RADIO_OTHER_") {
+        const newValue = this.inputValue ? `${this.radioValue}&${this.inputValue}` : this.radioValue;
+        console.log(newValue, "newValue");
         this.oldFieldValue = this.fieldModel;
         this.syncUpdateFormModel(newValue);
         this.emitFieldDataChange(newValue, this.oldFieldValue);
@@ -32538,9 +32553,9 @@ const _sfc_main$i = {
   }
 };
 function _sfc_render$i(_ctx, _cache, $props, $setup, $data, $options) {
-  const _component_el_input = resolveComponent("el-input");
   const _component_el_radio = resolveComponent("el-radio");
   const _component_el_radio_group = resolveComponent("el-radio-group");
+  const _component_el_input = resolveComponent("el-input");
   const _component_form_item_wrapper = resolveComponent("form-item-wrapper");
   return openBlock(), createBlock(_component_form_item_wrapper, {
     designer: $props.designer,
@@ -32556,8 +32571,8 @@ function _sfc_render$i(_ctx, _cache, $props, $setup, $data, $options) {
   }, {
     default: withCtx(() => [
       createVNode(_component_el_radio_group, {
-        modelValue: $data.fieldModel,
-        "onUpdate:modelValue": _cache[1] || (_cache[1] = ($event) => $data.fieldModel = $event),
+        modelValue: _ctx.radioValue,
+        "onUpdate:modelValue": _cache[0] || (_cache[0] = ($event) => _ctx.radioValue = $event),
         class: normalizeClass({ "radio-group-block": $props.field.options.displayStyle === "block" }),
         disabled: $props.field.options.disabled,
         size: $options.widgetSize,
@@ -32573,22 +32588,22 @@ function _sfc_render$i(_ctx, _cache, $props, $setup, $data, $options) {
               style: normalizeStyle({ display: $props.field.options.displayStyle })
             }, {
               default: withCtx(() => [
-                createElementVNode("span", null, toDisplayString(item.label), 1),
-                $data.radioValue === "_RADIO_OTHER_" && item.value === "_RADIO_OTHER_" ? (openBlock(), createBlock(_component_el_input, {
-                  key: 0,
-                  class: "w-[200px] ml-10px",
-                  modelValue: $data.inputValue,
-                  "onUpdate:modelValue": _cache[0] || (_cache[0] = ($event) => $data.inputValue = $event),
-                  onChange: ($event) => $options.handleOtherValueChange(item.value),
-                  placeholder: "\u8BF7\u8F93\u5165\u5176\u4ED6\u9009\u9879"
-                }, null, 8, ["modelValue", "onChange"])) : createCommentVNode("", true)
+                createElementVNode("span", null, toDisplayString(item.label), 1)
               ]),
               _: 2
             }, 1032, ["label", "disabled", "border", "style"]);
           }), 128))
         ]),
         _: 1
-      }, 8, ["modelValue", "class", "disabled", "size", "onChange"])
+      }, 8, ["modelValue", "class", "disabled", "size", "onChange"]),
+      _ctx.radioValue === "_RADIO_OTHER_" ? (openBlock(), createBlock(_component_el_input, {
+        key: 0,
+        class: "w-[200px] ml-10px",
+        modelValue: $data.inputValue,
+        "onUpdate:modelValue": _cache[1] || (_cache[1] = ($event) => $data.inputValue = $event),
+        onInput: _cache[2] || (_cache[2] = ($event) => $options.handleOtherValueChange()),
+        placeholder: "\u8BF7\u8F93\u5165"
+      }, null, 8, ["modelValue"])) : createCommentVNode("", true)
     ]),
     _: 1
   }, 8, ["designer", "field", "rules", "design-state", "parent-widget", "parent-list", "index-of-parent-list", "sub-form-row-index", "sub-form-col-index", "sub-form-row-id"]);
@@ -61532,15 +61547,7 @@ const _sfc_main = {
         method: "get",
         url: "unified-system/employee/loginInfo?accessType=0"
       });
-      const { data: personList } = await service$1({
-        method: "get",
-        url: "/unified-system/employee/queryList",
-        params: {
-          userId: data2.id
-        }
-      });
-      const userInfo = personList ? personList[0] : {};
-      this.fieldModel = __spreadValues(__spreadValues({}, data2), userInfo);
+      this.fieldModel = data2;
       this.syncUpdateFormModel(this.fieldModel);
       this.emitFieldDataChange(this.fieldModel, this.oldFieldValue);
     }