cloud-web-corejs 1.0.54-dev.625 → 1.0.54-dev.627

package/src/components/xform/utils/util.js

@@ -694,6 +694,8 @@ export const columnFormatMap = {
   text: "text",
   checkbox: "checkbox",
   radio: "radio",
+  dropdown: "dropdown",
+  textarea: "textarea",
 };
 
 export function getFieldWidgetById(widgetList, fieldId, staticWidgetsIncluded) {
@@ -876,7 +878,11 @@ export function buildDefaultFormJson() {
 export function cloneFormConfigWithoutEventHandler(e) {
   var t = deepClone(e);
   return (
-    (t.onFormCreated = ""), (t.onFormBeforeMounted = ""), (t.onFormMounted = ""), (t.onFormDataChange = ""), t
+    (t.onFormCreated = ""),
+    (t.onFormBeforeMounted = ""),
+    (t.onFormMounted = ""),
+    (t.onFormDataChange = ""),
+    t
   );
 }
 

package/src/views/user/user/edit.vue

@@ -632,7 +632,7 @@ export default {
         storageType: "user",
         data: () => {
           this.handleData();
-          return this.user;
+          return this.getReqFormData();
         },
         chooseConfirm: (tempStorageData) => {
           this.user = tempStorageData;
@@ -696,6 +696,22 @@ export default {
         this.showExtendedProperties = true;
       }
     },
+    getReqFormData() {
+      let userCompanyInfoDTOs = this.user.userCompanyInfoDTOs.map((item) => {
+        return {
+          ...item,
+          saleOrgGridOption: null,
+          roleGridOption: null,
+          saleOrgData: null,
+          roleData: null,
+        };
+      });
+      let formData = {
+        ...this.user,
+        userCompanyInfoDTOs,
+      };
+      return formData;
+    },
     saveData() {
       let companyCode = this.companyInfo.companyCode;
       this.handleData();
@@ -718,20 +734,7 @@ export default {
         if (valid) {
           this.$baseConfirm(this.$t1("您确定要保存吗？")).then(() => {
             var url = USER_PREFIX + (this.isEdit ? "/user/update" : "/user/save");
-            let userCompanyInfoDTOs = this.user.userCompanyInfoDTOs.map((item) => {
-              return {
-                ...item,
-                saleOrgGridOption: null,
-                roleGridOption: null,
-                saleOrgData: null,
-                roleData: null,
-              };
-            });
-            let formData = {
-              ...this.user,
-              userCompanyInfoDTOs,
-            };
-
+            let formData = this.getReqFormData();
             this.$http({
               url: url,
               method: `post`,