form-custom-test 3.0.58 → 3.0.60

package/dist/render.es.js

@@ -8609,7 +8609,6 @@ var fieldMixin = {
     },
     initEventHandler() {
       this.on$("setFormData", (newFormData) => {
-        console.log("formModel of globalModel----------", this.globalModel.formModel);
         if (!this.subFormItemFlag) {
           this.setValue(newFormData[this.field.options.name]);
         }
@@ -8867,16 +8866,12 @@ var fieldMixin = {
     },
     setColHidden(colName, hidden) {
       const hiddenVal = !!hidden;
-      console.log("colName", colName);
       if (Array.isArray(colName)) {
         let anySet = false;
         colName.forEach((cName) => {
-          console.log("cName", cName);
           const col2 = this.findColByName(cName);
-          console.log("col", col2);
           if (col2 && col2.options) {
-            col2.options.hidden = hiddenVal;
-            console.log("col.options.hidden", col2.options.hidden);
+            col2.options.hidden = hiddenVa;
             anySet = true;
           }
         });
@@ -8898,13 +8893,11 @@ var fieldMixin = {
         }
       }
       if (!foundRef && (!this.subFormItemFlag || this.designState)) {
-        console.log(2222222);
         foundRef = this.refList[widgetName];
       }
       if (!foundRef && !!showError) {
         this.$message.error(this.i18nt("render.hint.refNotFound") + widgetName);
       }
-      console.log(foundRef, "foundRef");
       return foundRef;
     },
     getFieldEditor() {
@@ -10674,29 +10667,10 @@ function _sfc_render$M(_ctx, _cache, $props, $setup, $data, $options) {
           "on-exceed": $options.handleFileExceed,
           "before-upload": $options.beforeFileUpload,
           "on-progress": $options.handleProgress
-        }, {
+        }, createSlots({
           tip: withCtx(() => [
             !!$props.field.options.uploadTip ? (openBlock(), createElementBlock("div", _hoisted_2$h, toDisplayString($props.field.options.uploadTip), 1)) : createCommentVNode("", true)
           ]),
-          default: withCtx(() => [
-            $props.field.options.allowDrag ? (openBlock(), createElementBlock(Fragment, { key: 0 }, [
-              createVNode(_component_el_icon, { class: "el-icon--upload" }, {
-                default: withCtx(() => [
-                  createVNode(_component_upload_filled)
-                ]),
-                _: 1
-              }),
-              _cache[0] || (_cache[0] = createElementVNode("div", { class: "el-upload__text" }, " \u70B9\u51FB\u6216\u62D6\u62FD\u6587\u4EF6\u5230\u6B64\u533A\u57DF\u4E0A\u4F20 ", -1))
-            ], 64)) : (openBlock(), createBlock(_component_el_button, {
-              key: 1,
-              type: "primary"
-            }, {
-              default: withCtx(() => [..._cache[1] || (_cache[1] = [
-                createTextVNode(" \u9009\u62E9\u6587\u4EF6", -1)
-              ])]),
-              _: 1
-            }))
-          ]),
           file: withCtx(({ file }) => [
             createElementVNode("div", _hoisted_3$e, [
               createElementVNode("div", _hoisted_4$c, [
@@ -10720,8 +10694,32 @@ function _sfc_render$M(_ctx, _cache, $props, $setup, $data, $options) {
               ])
             ])
           ]),
-          _: 1
-        }, 8, ["disabled", "style", "action", "headers", "data", "with-credentials", "multiple", "file-list", "show-file-list", "class", "limit", "on-success", "on-error", "drag", "on-exceed", "before-upload", "on-progress"]),
+          _: 2
+        }, [
+          !$props.field.options.disabled ? {
+            name: "default",
+            fn: withCtx(() => [
+              $props.field.options.allowDrag ? (openBlock(), createElementBlock(Fragment, { key: 0 }, [
+                createVNode(_component_el_icon, { class: "el-icon--upload" }, {
+                  default: withCtx(() => [
+                    createVNode(_component_upload_filled)
+                  ]),
+                  _: 1
+                }),
+                _cache[0] || (_cache[0] = createElementVNode("div", { class: "el-upload__text" }, " \u70B9\u51FB\u6216\u62D6\u62FD\u6587\u4EF6\u5230\u6B64\u533A\u57DF\u4E0A\u4F20 ", -1))
+              ], 64)) : (openBlock(), createBlock(_component_el_button, {
+                key: 1,
+                type: "primary"
+              }, {
+                default: withCtx(() => [..._cache[1] || (_cache[1] = [
+                  createTextVNode(" \u9009\u62E9\u6587\u4EF6", -1)
+                ])]),
+                _: 1
+              }))
+            ]),
+            key: "0"
+          } : void 0
+        ]), 1032, ["disabled", "style", "action", "headers", "data", "with-credentials", "multiple", "file-list", "show-file-list", "class", "limit", "on-success", "on-error", "drag", "on-exceed", "before-upload", "on-progress"]),
         createVNode(_component_el_progress, {
           style: normalizeStyle({
             display: $data.showProgress ? "inline-flex" : "none",
@@ -10734,7 +10732,7 @@ function _sfc_render$M(_ctx, _cache, $props, $setup, $data, $options) {
     _: 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"]);
 }
-var fileUploadWidget = /* @__PURE__ */ _export_sfc$1(_sfc_main$M, [["render", _sfc_render$M], ["__scopeId", "data-v-6d3ed7e0"]]);
+var fileUploadWidget = /* @__PURE__ */ _export_sfc$1(_sfc_main$M, [["render", _sfc_render$M], ["__scopeId", "data-v-06821a9a"]]);
 var __glob_0_7 = /* @__PURE__ */ Object.freeze(/* @__PURE__ */ Object.defineProperty({
   __proto__: null,
   "default": fileUploadWidget
@@ -23330,6 +23328,7 @@ function _sfc_render$C(_ctx, _cache, $props, $setup, $data, $options) {
     "sub-form-row-id": $props.subFormRowId
   }, {
     default: withCtx(() => [
+      createTextVNode(toDisplayString($data.fieldModel) + " ", 1),
       createVNode(_component_el_select, {
         ref: "fieldEditor",
         modelValue: $data.fieldModel,
@@ -23367,7 +23366,7 @@ function _sfc_render$C(_ctx, _cache, $props, $setup, $data, $options) {
     _: 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"]);
 }
-var selectWidget = /* @__PURE__ */ _export_sfc$1(_sfc_main$C, [["render", _sfc_render$C], ["__scopeId", "data-v-97221160"]]);
+var selectWidget = /* @__PURE__ */ _export_sfc$1(_sfc_main$C, [["render", _sfc_render$C], ["__scopeId", "data-v-42d4e5c2"]]);
 var __glob_0_17 = /* @__PURE__ */ Object.freeze(/* @__PURE__ */ Object.defineProperty({
   __proto__: null,
   "default": selectWidget
@@ -25884,13 +25883,13 @@ function registerIcon(app) {
 if (typeof window !== "undefined") {
   let loadSvg = function() {
     var body = document.body;
-    var svgDom = document.getElementById("__svg__icons__dom__1773378552777__");
+    var svgDom = document.getElementById("__svg__icons__dom__1773796342503__");
     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__1773378552777__";
+      svgDom.id = "__svg__icons__dom__1773796342503__";
       svgDom.setAttribute("xmlns", "http://www.w3.org/2000/svg");
       svgDom.setAttribute("xmlns:link", "http://www.w3.org/1999/xlink");
     }
@@ -32114,8 +32113,9 @@ const _sfc_main$j = {
       if (handler) {
         try {
           if (eventName === "onConfirm" && args.length > 0) {
-            const fn = new Function("checkedNodes", handler);
-            fn.call(this, args[0]);
+            const nodes = args[0];
+            const fn = new Function("checkedNodes", "selectedNodes", "selectedValue", handler);
+            fn.call(this, nodes, nodes, nodes);
           } else if (args.length > 0) {
             const paramNames = args.map((_, index2) => `arg${index2}`).join(", ");
             const fn = new Function(paramNames, handler);
@@ -32253,7 +32253,7 @@ function _sfc_render$j(_ctx, _cache, $props, $setup, $data, $options) {
     _: 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"]);
 }
-var PersonTreeWidget = /* @__PURE__ */ _export_sfc$1(_sfc_main$j, [["render", _sfc_render$j], ["__scopeId", "data-v-0f7a3e8a"]]);
+var PersonTreeWidget = /* @__PURE__ */ _export_sfc$1(_sfc_main$j, [["render", _sfc_render$j], ["__scopeId", "data-v-824e8a98"]]);
 const _sfc_main$i = {
   name: "radio-other-widget",
   componentName: "FieldWidget",
@@ -61330,18 +61330,21 @@ const _sfc_main = {
     }
   },
   methods: {
+    hasExistingValue() {
+      var _a;
+      const v = (_a = this.fieldModel) != null ? _a : this.oldFieldValue;
+      return v !== void 0 && v !== null && v !== "";
+    },
     async getCurrentUser() {
       const { data: data2 } = await service({
         method: "get",
         url: "unified-system/employee/loginInfo?accessType=0"
       });
-      console.log(this.currentUserType, "data");
       if (this.currentUserType === "username") {
         this.fieldModel = data2.username;
       } else if (this.currentUserType === "deptName") {
         this.fieldModel = data2.deptName;
       }
-      console.log(this.oldFieldValue, this.fieldModel, "this.oldFieldValue");
       this.syncUpdateFormModel(this.fieldModel);
       this.emitFieldDataChange(this.fieldModel, this.oldFieldValue);
     }
@@ -61358,7 +61361,8 @@ const _sfc_main = {
     },
     "field.options.type": {
       handler(newVal, oldVal) {
-        console.log(newVal, "currentUserType changed from", oldVal, "to", newVal);
+        if (oldVal === void 0)
+          return;
         this.getCurrentUser();
       },
       immediate: false
@@ -61372,6 +61376,8 @@ const _sfc_main = {
     this.handleOnCreated();
   },
   mounted() {
+    if (this.hasExistingValue())
+      return;
     this.getCurrentUser();
   }
 };
@@ -61446,7 +61452,7 @@ const loadExtension = function(app) {
   registerCPEditor(app, "person-tree-cancelText", "person-tree-cancelText-editor", createInputTextEditor("cancelText", "extension.setting.personTreeCancelText"));
   registerCPEditor(app, "person-tree-hideFooter", "person-tree-hideFooter-editor", createBooleanEditor("hideFooter", "extension.setting.personTreeHideFooter"));
   registerEPEditor(app, "person-tree-onOpen", "person-tree-onOpen-editor", createEventHandlerEditor("onOpen", []));
-  registerEPEditor(app, "person-tree-onConfirm", "person-tree-onConfirm-editor", createEventHandlerEditor("onConfirm", []));
+  registerEPEditor(app, "person-tree-onConfirm", "person-tree-onConfirm-editor", createEventHandlerEditor("onConfirm", ["checkedNodes"]));
   registerEPEditor(app, "person-tree-onCancel", "person-tree-onCancel-editor", createEventHandlerEditor("onCancel", []));
   registerEPEditor(app, "person-tree-onClose", "person-tree-onClose-editor", createEventHandlerEditor("onClose", []));
   app.component(radioOtherItem.name, radioOtherItem);