yuanjia-form-pro-standard 1.1.6-beta5.9 → 1.1.6-beta6.0

package/designer.es.js

@@ -176280,7 +176280,7 @@ const _sfc_main$4l = {
       });
       return this.doGetFormData(formDataModelEx, needValidation);
     },
-    setFormData(formData, disableChangeEvent = false) {
+    setFormData(formData, disableChangeEvent = false, fullData = {}) {
       let formDataObj = formData;
       if (typeof formData === "string") {
         formDataObj = JSON.parse(formData);
@@ -176290,22 +176290,46 @@ const _sfc_main$4l = {
           this.formDataModel[propName] = deepClone(formDataObj[propName]);
         }
       });
-      const fieldContentMap = {};
-      if (this.formObj && Object.keys(this.formObj).length > 0) {
-        Object.keys(this.formObj).forEach((fieldName) => {
-          const fieldObj = this.formObj[fieldName];
-          if (fieldObj && fieldObj.content !== void 0) {
-            if (fieldObj.value !== void 0 && !Array.isArray(fieldObj.value)) {
-              fieldContentMap[fieldName] = {
-                value: fieldObj.value,
-                content: fieldObj.content
-              };
-            } else if (Array.isArray(fieldObj.value) && Array.isArray(fieldObj.content)) {
-              fieldContentMap[fieldName] = {};
-              fieldObj.value.forEach((val, index2) => {
-                if (fieldContentMap[fieldName][val] === void 0) {
-                  fieldContentMap[fieldName][val] = fieldObj.content[index2] || val;
-                }
+      if (fullData && typeof fullData === "object" && Object.keys(fullData).length > 0) {
+        const allFields = getAllFieldWidgets(this.formJsonObj.widgetList, false);
+        Object.keys(fullData).forEach((fieldName) => {
+          const fullDataItem = fullData[fieldName];
+          if (!fullDataItem || typeof fullDataItem !== "object") {
+            return;
+          }
+          const { value: value2, content: content2 } = fullDataItem;
+          if (value2 === void 0 || value2 === null || content2 === void 0 || content2 === null) {
+            return;
+          }
+          const matchedField = allFields.find((f) => f.name === fieldName);
+          if (!matchedField || !matchedField.field) {
+            return;
+          }
+          const field = matchedField.field;
+          const fieldType = field.type;
+          if (fieldType !== "select" && fieldType !== "DIYselect") {
+            return;
+          }
+          if (!field.options.optionItems) {
+            field.options.optionItems = [];
+          }
+          let exists = false;
+          if (fieldType === "select") {
+            exists = field.options.optionItems.some((item) => item.value === value2);
+            if (!exists) {
+              field.options.optionItems.push({
+                label: content2,
+                value: value2,
+                disabled: false
+              });
+            }
+          } else if (fieldType === "DIYselect") {
+            exists = field.options.optionItems.some((item) => item.Id === value2 || item.id === value2);
+            if (!exists) {
+              field.options.optionItems.push({
+                Id: value2,
+                Name: content2,
+                disabled: false
               });
             }
           }
@@ -176313,7 +176337,7 @@ const _sfc_main$4l = {
       }
       this.setCEOCDisabledFlag(disableChangeEvent);
       this.broadcast("ContainerItem", "setFormData", [this.formDataModel, disableChangeEvent, this.isCaseEdit]);
-      this.broadcast("FieldWidget", "setFormData", [this.formDataModel, disableChangeEvent, this.isCaseEdit, fieldContentMap]);
+      this.broadcast("FieldWidget", "setFormData", [this.formDataModel, disableChangeEvent, this.isCaseEdit]);
     },
     setFormDataEx(formData, disableChangeEvent = false) {
       let formDataObj = formData;
@@ -176864,7 +176888,7 @@ function _sfc_render$4l(_ctx, _cache, $props, $setup, $data, $options) {
     [_directive_loading, $data.formLoading]
   ]);
 }
-var VFormRender = /* @__PURE__ */ _export_sfc(_sfc_main$4l, [["render", _sfc_render$4l], ["__scopeId", "data-v-744f2dc0"]]);
+var VFormRender = /* @__PURE__ */ _export_sfc(_sfc_main$4l, [["render", _sfc_render$4l], ["__scopeId", "data-v-7a7e01ce"]]);
 var ace$2 = { exports: {} };
 (function(module, exports) {
   (function() {
@@ -236229,13 +236253,13 @@ var Draggable = /* @__PURE__ */ getDefaultExportFromCjs(vuedraggable_umd.exports
 if (typeof window !== "undefined") {
   let loadSvg = function() {
     var body = document.body;
-    var svgDom = document.getElementById("__svg__icons__dom__1767697756187__");
+    var svgDom = document.getElementById("__svg__icons__dom__1767756935069__");
     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__1767697756187__";
+      svgDom.id = "__svg__icons__dom__1767756935069__";
       svgDom.setAttribute("xmlns", "http://www.w3.org/2000/svg");
       svgDom.setAttribute("xmlns:link", "http://www.w3.org/1999/xlink");
     }
@@ -237216,8 +237240,7 @@ const _sfc_main$3 = {
       rules: [],
       requestData: [],
       defaultAvatarSrc: "https://static.yuanjia101.com/CRMProjectH5/public/image/avatar.png",
-      isSettingValue: false,
-      queryingIds: new Set()
+      isSettingValue: false
     };
   },
   computed: {
@@ -237258,35 +237281,6 @@ const _sfc_main$3 = {
     this.initEventHandler();
     this.buildFieldRules();
     this.handleOnCreated();
-    this.$nextTick(() => {
-      this.off$("setFormData");
-      this.on$("setFormData", (params) => {
-        const newFormData = params[0];
-        const disableChangeEvent = params[1];
-        const isCaseEdit = params[2];
-        const fieldContentMap = params[3];
-        if (!this.subFormItemFlag) {
-          if (!!this.getObjectFieldFlag() && !this.designState) {
-            const objectModel = this.getObjectModel();
-            this.setValue(objectModel === void 0 ? null : objectModel[this.fieldKeyName], disableChangeEvent);
-          } else {
-            if (this.field.options.disabled === 1) {
-              this.setDisabled(!!newFormData[this.fieldKeyName]);
-            } else if (this.field.options.disabled === 2 && isCaseEdit) {
-              this.setDisabled(!!newFormData[this.fieldKeyName]);
-            } else {
-              this.setDisabled(false);
-            }
-            const fieldValue = newFormData[this.fieldKeyName];
-            if (fieldValue !== null && fieldValue !== void 0 && fieldValue !== "") {
-              this.handleSetFormDataWithContent(fieldValue, fieldContentMap, disableChangeEvent);
-            } else {
-              this.setValue(fieldValue, disableChangeEvent);
-            }
-          }
-        }
-      });
-    });
   },
   mounted() {
     this.handleOnMounted();
@@ -237295,156 +237289,6 @@ const _sfc_main$3 = {
     this.unregisterFromRefList();
   },
   methods: {
-    isValueInOptions(value2) {
-      if (value2 === null || value2 === void 0 || value2 === "") {
-        return true;
-      }
-      const optionItems = this.field.options.optionItems || [];
-      if (this.field.options.multiple && Array.isArray(value2)) {
-        return value2.every((v) => optionItems.some((item) => item.Id === v || item.id === v));
-      }
-      return optionItems.some((item) => item.Id === value2 || item.id === value2);
-    },
-    queryById(idValue) {
-      if (!idValue || idValue === "") {
-        return;
-      }
-      if (this.queryingIds.has(idValue)) {
-        return;
-      }
-      if (this.isValueInOptions(idValue)) {
-        return;
-      }
-      this.queryingIds.add(idValue);
-      let that = this;
-      almLocalStorage.removeItem("formId");
-      let header = {};
-      const token = almLocalStorage.getItem("token");
-      const rToken = almLocalStorage.getItem("rToken");
-      const tokenTime = almLocalStorage.getItem("tokenTime");
-      if (token !== null)
-        header["Authorization"] = "Bearer " + token;
-      if (!tokenTime && rToken) {
-        header["X-Authorization"] = "Bearer " + rToken;
-      }
-      this.loading = true;
-      let url = null;
-      let foundDataSource = false;
-      for (let i5 = 0; i5 < this.formatDataSourceList.length && !foundDataSource; i5++) {
-        const item = this.formatDataSourceList[i5];
-        for (let j5 = 0; j5 < this.widgetList.length && !foundDataSource; j5++) {
-          const items = this.widgetList[j5];
-          if (this.field.options.name == items.options.name) {
-            let dsName = items.options.dsName || null;
-            let dsID = items.options.dsID || null;
-            if (dsID == item.dataSourceId || dsName == item.uniqueName) {
-              url = JSON.parse(JSON.stringify(item));
-              foundDataSource = true;
-              const request_url = commonGETUrlTranslation("formset/formset_construct_manage");
-              const handleSuccess = (result) => {
-                var _a2;
-                let requestData = ((_a2 = result.data.Data) == null ? void 0 : _a2.Items) || result.data.Data || [];
-                if (!Array.isArray(requestData)) {
-                  requestData = [requestData];
-                }
-                if (requestData.length > 0) {
-                  requestData.forEach((dtem) => {
-                    dtem.label = dtem[url.labelKey] || dtem.Name;
-                    dtem.value = dtem[url.valueKey] || dtem.Id;
-                  });
-                  const existingIds = (that.field.options.optionItems || []).map((item2) => item2.Id || item2.id);
-                  requestData.forEach((newItem) => {
-                    const itemId = newItem.Id || newItem.id;
-                    if (!existingIds.includes(itemId)) {
-                      if (!that.field.options.optionItems) {
-                        that.field.options.optionItems = [];
-                      }
-                      that.field.options.optionItems.push(newItem);
-                    }
-                  });
-                }
-                that.queryingIds.delete(idValue);
-                that.loading = false;
-              };
-              const handleError = (error2) => {
-                console.error("\u67E5\u8BE2\u9009\u9879\u5931\u8D25:", error2);
-                that.queryingIds.delete(idValue);
-                that.loading = false;
-              };
-              if (url.requestMethod == "post") {
-                axios$1[url.requestMethod](request_url, {
-                  keywords: idValue
-                }, {
-                  headers: header
-                }).then(handleSuccess).catch(handleError);
-              } else {
-                const idParam = `keywords=${idValue}`;
-                const baseUrl = url.requestURL || "";
-                const queryUrl = baseUrl.includes("?") ? `${baseUrl}&${idParam}` : `${baseUrl}?${idParam}`;
-                axios$1[url.requestMethod](queryUrl, {
-                  headers: header
-                }).then(handleSuccess).catch(handleError);
-              }
-            }
-          }
-        }
-      }
-      if (!foundDataSource) {
-        this.queryingIds.delete(idValue);
-        this.loading = false;
-      }
-    },
-    handleSetFormDataWithContent(fieldValue, fieldContentMap, disableChangeEvent = false) {
-      if (!fieldContentMap) {
-        this.setValue(fieldValue, disableChangeEvent);
-        return;
-      }
-      const fieldName = this.field.options.name;
-      const contentInfo = fieldContentMap[fieldName];
-      if (!contentInfo) {
-        this.setValue(fieldValue, disableChangeEvent);
-        return;
-      }
-      if (this.field.options.multiple && Array.isArray(fieldValue)) {
-        const missingValues = fieldValue.filter((v) => v !== null && v !== void 0 && v !== "" && !this.isValueInOptions(v));
-        if (missingValues.length > 0 && typeof contentInfo === "object" && !Array.isArray(contentInfo)) {
-          missingValues.forEach((value2) => {
-            const content2 = contentInfo[value2];
-            if (content2 && !this.isValueInOptions(value2)) {
-              this.addOptionFromContent(value2, content2);
-            }
-          });
-        }
-      } else if (!this.isValueInOptions(fieldValue)) {
-        const content2 = typeof contentInfo === "object" && !Array.isArray(contentInfo) ? contentInfo[fieldValue] : contentInfo.content || contentInfo;
-        if (content2) {
-          this.addOptionFromContent(fieldValue, content2);
-        }
-      }
-      this.setValue(fieldValue, disableChangeEvent);
-    },
-    addOptionFromContent(value2, content2) {
-      if (!value2 || value2 === "") {
-        return;
-      }
-      const existingIds = (this.field.options.optionItems || []).map((item) => item.Id || item.id);
-      if (existingIds.includes(value2)) {
-        return;
-      }
-      const newOption = {
-        Id: value2,
-        id: value2,
-        Name: content2 || String(value2),
-        name: content2 || String(value2),
-        label: content2 || String(value2),
-        value: value2,
-        Avatar: this.defaultAvatarSrc
-      };
-      if (!this.field.options.optionItems) {
-        this.field.options.optionItems = [];
-      }
-      this.field.options.optionItems.push(newOption);
-    },
     setValue(newValue, disableChangeEvent = false) {
       if (!!this.field.formItemFlag) {
         this.isSettingValue = true;
@@ -237457,13 +237301,6 @@ const _sfc_main$3 = {
         }
         this.oldFieldValue = newValue;
         this.clearValidate();
-        const valuesToCheck = this.field.options.multiple && Array.isArray(newValue) ? newValue : newValue !== null && newValue !== void 0 ? [newValue] : [];
-        const missingValues = valuesToCheck.filter((v) => v !== null && v !== void 0 && v !== "" && !this.isValueInOptions(v));
-        if (missingValues.length > 0) {
-          missingValues.forEach((id2) => {
-            this.queryById(id2);
-          });
-        }
         this.isSettingValue = false;
       }
     },
@@ -237618,7 +237455,7 @@ function _sfc_render$3(_ctx, _cache, $props, $setup, $data, $options) {
     __: [2]
   }, 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(_sfc_main$3, [["render", _sfc_render$3], ["__scopeId", "data-v-2408940e"]]);
+var SelectWidget = /* @__PURE__ */ _export_sfc(_sfc_main$3, [["render", _sfc_render$3], ["__scopeId", "data-v-2ffe261c"]]);
 var DIYtableWidget_vue_vue_type_style_index_0_scoped_true_lang = "";
 const _sfc_main$2 = {
   name: "DIYtable-widget",