form-custom-test 3.0.221 → 3.0.222

package/dist/designer.es.js

@@ -3862,6 +3862,7 @@ const currentUserSchema = {
     name: "",
     label: "\u5F53\u524D\u7528\u6237",
     type: "username",
+    valueType: "object",
     columnWidth: "auto",
     required: false,
     requiredHint: "",
@@ -4190,6 +4191,7 @@ var enLocale_extension = {
       meetingRoomRemoteUrl: "Request URL",
       allowMultiple: "Allow Multiple",
       currentUserType: "Current User Type",
+      currentUserValueType: "Value Type",
       selectTreeCheckStrictly: "Check Strictly",
       assetSelectButtonText: "Button Text",
       assetSelectTypeJson: "Asset Type Json",
@@ -4263,6 +4265,7 @@ var zhLocale_extension = {
       meetingRoomRemoteUrl: "\u8BF7\u6C42\u5730\u5740",
       allowMultiple: "\u662F\u5426\u591A\u9009",
       currentUserType: "\u5F53\u524D\u7528\u6237\u7C7B\u578B",
+      currentUserValueType: "\u503C\u7C7B\u578B",
       selectTreeCheckStrictly: "\u662F\u5426\u4E25\u683C\u9009\u4E2D",
       assetSelectButtonText: "\u6309\u94AE\u6587\u5B57",
       assetSelectTypeJson: "\u8D44\u4EA7\u7C7B\u578BJson",
@@ -69279,13 +69282,13 @@ function registerIcon(app) {
 if (typeof window !== "undefined") {
   let loadSvg = function() {
     var body = document.body;
-    var svgDom = document.getElementById("__svg__icons__dom__1783062042423__");
+    var svgDom = document.getElementById("__svg__icons__dom__1783064639584__");
     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__1783062042423__";
+      svgDom.id = "__svg__icons__dom__1783064639584__";
       svgDom.setAttribute("xmlns", "http://www.w3.org/2000/svg");
       svgDom.setAttribute("xmlns:link", "http://www.w3.org/1999/xlink");
     }
@@ -79435,20 +79438,26 @@ const _sfc_main$f = {
     return {
       fieldModel: null,
       oldFieldValue: null,
-      rules: []
+      rules: [],
+      rawUserData: null
     };
   },
   computed: {
     displayModel() {
+      var _a2, _b2, _c2, _d, _e, _f, _g, _h, _i;
+      if (this.isStringValueType) {
+        return (_a2 = this.fieldModel) != null ? _a2 : "";
+      }
       if (this.currentUserType === "username") {
-        return this.fieldModel ? this.fieldModel.username : "";
-      } else if (this.currentUserType === "deptName") {
-        return this.fieldModel ? this.fieldModel.deptName : "";
-      } else if (this.currentUserType === "companyName") {
-        return this.fieldModel ? this.fieldModel.companyName : "";
-      } else {
-        return JSON.stringify(this.fieldModel);
+        return (_e = (_d = (_b2 = this.fieldModel) == null ? void 0 : _b2.username) != null ? _d : (_c2 = this.fieldModel) == null ? void 0 : _c2.userName) != null ? _e : "";
       }
+      if (this.currentUserType === "deptName") {
+        return (_g = (_f = this.fieldModel) == null ? void 0 : _f.deptName) != null ? _g : "";
+      }
+      if (this.currentUserType === "companyName") {
+        return (_i = (_h = this.fieldModel) == null ? void 0 : _h.companyName) != null ? _i : "";
+      }
+      return this.fieldModel ? JSON.stringify(this.fieldModel) : "";
     },
     widgetStyle() {
       return {
@@ -79458,22 +79467,90 @@ const _sfc_main$f = {
     currentUserType() {
       var _a2;
       return ((_a2 = this.field.options) == null ? void 0 : _a2.type) || "username";
+    },
+    isStringValueType() {
+      var _a2;
+      return ((_a2 = this.field.options) == null ? void 0 : _a2.valueType) === "string";
     }
   },
   methods: {
+    extractStringValue(data2) {
+      var _a2, _b2, _c2, _d;
+      if (data2 == null) {
+        return "";
+      }
+      if (typeof data2 === "string") {
+        return data2;
+      }
+      if (this.currentUserType === "username") {
+        return (_b2 = (_a2 = data2.username) != null ? _a2 : data2.userName) != null ? _b2 : "";
+      }
+      if (this.currentUserType === "deptName") {
+        return (_c2 = data2.deptName) != null ? _c2 : "";
+      }
+      if (this.currentUserType === "companyName") {
+        return (_d = data2.companyName) != null ? _d : "";
+      }
+      return "";
+    },
+    normalizeFieldValue(data2) {
+      if (this.isStringValueType) {
+        return this.extractStringValue(data2);
+      }
+      if (data2 && typeof data2 === "object") {
+        return data2;
+      }
+      return data2;
+    },
+    applyFieldValue(data2, emitChange = true) {
+      var _a2;
+      const oldValue = (_a2 = this.oldFieldValue) != null ? _a2 : this.fieldModel;
+      this.fieldModel = this.normalizeFieldValue(data2);
+      this.syncUpdateFormModel(this.fieldModel);
+      if (emitChange) {
+        this.emitFieldDataChange(this.fieldModel, oldValue);
+      }
+    },
     hasExistingValue() {
       var _a2;
       const v = (_a2 = this.fieldModel) != null ? _a2 : this.oldFieldValue;
-      return v !== void 0 && v !== null && v !== "";
+      if (v === void 0 || v === null) {
+        return false;
+      }
+      if (this.isStringValueType) {
+        return v !== "";
+      }
+      if (typeof v === "object") {
+        return Object.keys(v).length > 0;
+      }
+      return v !== "";
     },
     async getCurrentUser() {
       const { data: data2 } = await service$1({
         method: "get",
         url: "unified-system/employee/loginInfo?accessType=0"
       });
-      this.fieldModel = data2;
-      this.syncUpdateFormModel(this.fieldModel);
-      this.emitFieldDataChange(this.fieldModel, this.oldFieldValue);
+      this.rawUserData = data2;
+      this.applyFieldValue(data2);
+    },
+    refreshFieldValueFromOptions() {
+      var _a2;
+      const source2 = (_a2 = this.rawUserData) != null ? _a2 : this.fieldModel;
+      if (source2 == null) {
+        if (!this.designState) {
+          this.getCurrentUser();
+        }
+        return;
+      }
+      if (this.isStringValueType && typeof source2 === "object") {
+        this.applyFieldValue(source2);
+        return;
+      }
+      if (!this.isStringValueType && typeof source2 === "string") {
+        this.getCurrentUser();
+        return;
+      }
+      this.applyFieldValue(source2);
     }
   },
   watch: {
@@ -79486,13 +79563,11 @@ const _sfc_main$f = {
     "field.options.onValidate"() {
       this.buildFieldRules();
     },
-    "field.options.type": {
-      handler(newVal, oldVal) {
-        if (oldVal === void 0)
-          return;
-        this.getCurrentUser();
-      },
-      immediate: false
+    "field.options.type"() {
+      this.refreshFieldValueFromOptions();
+    },
+    "field.options.valueType"() {
+      this.refreshFieldValueFromOptions();
     }
   },
   created() {
@@ -79501,10 +79576,17 @@ const _sfc_main$f = {
     this.initEventHandler();
     this.buildFieldRules();
     this.handleOnCreated();
+    if (this.fieldModel && typeof this.fieldModel === "object") {
+      this.rawUserData = this.fieldModel;
+    }
   },
   mounted() {
-    if (this.hasExistingValue())
+    if (this.hasExistingValue()) {
+      if (this.isStringValueType && typeof this.fieldModel === "object") {
+        this.applyFieldValue(this.fieldModel, false);
+      }
       return;
+    }
     this.getCurrentUser();
   }
 };
@@ -84010,6 +84092,12 @@ const loadExtension = function(app) {
       { label: "\u516C\u53F8\u540D\u79F0", value: "companyName" }
     ]
   }));
+  registerCPEditor(app, "current-user-valueType", "current-user-valueType-editor", createSelectEditor("valueType", "extension.setting.currentUserValueType", {
+    optionItems: [
+      { label: "\u5B57\u7B26\u4E32", value: "string" },
+      { label: "\u5BF9\u8C61", value: "object" }
+    ]
+  }));
   addCustomWidgetSchema(currentUserSecondCompanySchema);
   app.component(CurrentUserSecondCompanyWidget.name, CurrentUserSecondCompanyWidget);
   addCustomWidgetSchema(assetSelectSchema);