@fecp/designer 5.4.6 → 5.4.9

package/lib/packages/vue/src/components/forms/radio/Radio.vue.js

@@ -5,6 +5,7 @@ require("../../../../../../node_modules/element-plus/es/index.js");
 ;/* empty css                                                                    */
 ;/* empty css                                                                          */
 const vue = require("vue");
+const common = require("../../../utils/common.js");
 const index = require("../../../../../../node_modules/element-plus/es/components/radio/index.js");
 const _sfc_main = /* @__PURE__ */ Object.assign({
   inheritAttrs: false
@@ -39,6 +40,9 @@ const _sfc_main = /* @__PURE__ */ Object.assign({
   emits: ["update:modelValue", "change"],
   setup(__props, { emit: __emit }) {
     const props = __props;
+    const formData = vue.inject("formData", null);
+    const fieldsData = vue.inject("fieldsData", []);
+    const hiddenFields = vue.inject("hiddenFields", []);
     const emit = __emit;
     const inputValue = vue.computed({
       get: () => props.modelValue,
@@ -51,6 +55,16 @@ const _sfc_main = /* @__PURE__ */ Object.assign({
       var _a;
       return ((_a = props.optionConfig) == null ? void 0 : _a.options) || [];
     });
+    function handlerChange(val) {
+      common.setFormDataByFieldMapping(
+        val,
+        false,
+        options.value,
+        props.optionConfig.fieldMapping,
+        formData,
+        [...fieldsData.value, ...hiddenFields.value]
+      );
+    }
     return (_ctx, _cache) => {
       const _component_el_radio = index.ElRadio;
       const _component_el_radio_group = index.ElRadioGroup;
@@ -61,7 +75,8 @@ const _sfc_main = /* @__PURE__ */ Object.assign({
         disabled: __props.disabled,
         style: {
           pointerEvents: __props.readonly ? "none" : "auto"
-        }
+        },
+        onChange: handlerChange
       }), {
         default: vue.withCtx(() => [
           (vue.openBlock(true), vue.createElementBlock(vue.Fragment, null, vue.renderList(options.value, (option) => {

package/lib/packages/vue/src/components/forms/select/Select.vue.js

@@ -9,6 +9,7 @@ require("../../../../../../node_modules/element-plus/es/index.js");
 ;/* empty css                                                                           */
 ;/* empty css                                                                     */
 const vue = require("vue");
+const common = require("../../../utils/common.js");
 const index = require("../../../../../../node_modules/element-plus/es/components/select/index.js");
 const _sfc_main = /* @__PURE__ */ Object.assign({
   inheritAttrs: false
@@ -55,6 +56,9 @@ const _sfc_main = /* @__PURE__ */ Object.assign({
   emits: ["update:modelValue", "change"],
   setup(__props, { emit: __emit }) {
     const props = __props;
+    const formData = vue.inject("formData", null);
+    const fieldsData = vue.inject("fieldsData", []);
+    const hiddenFields = vue.inject("hiddenFields", []);
     const emit = __emit;
     const inputValue = vue.computed({
       get: () => props.modelValue,
@@ -67,6 +71,16 @@ const _sfc_main = /* @__PURE__ */ Object.assign({
       if (!props.optionConfig) return [];
       return props.optionConfig.options || [];
     });
+    function handlerChange(val) {
+      common.setFormDataByFieldMapping(
+        val,
+        props.multiple,
+        options.value,
+        props.optionConfig.fieldMapping,
+        formData,
+        [...fieldsData.value, ...hiddenFields.value]
+      );
+    }
     return (_ctx, _cache) => {
       const _component_el_option = index.ElOption;
       const _component_el_select = index.ElSelect;
@@ -81,7 +95,8 @@ const _sfc_main = /* @__PURE__ */ Object.assign({
         filterable: __props.filterable,
         style: [{ "width": "100%" }, {
           pointerEvents: __props.readonly ? "none" : "auto"
-        }]
+        }],
+        onChange: handlerChange
       }), {
         default: vue.withCtx(() => [
           (vue.openBlock(true), vue.createElementBlock(vue.Fragment, null, vue.renderList(options.value, (option) => {

package/lib/packages/vue/src/components/forms/textarea/Textarea.vue.js

@@ -78,7 +78,6 @@ const _sfc_main = /* @__PURE__ */ Object.assign({
           "show-word-limit": __props.showWordCount,
           rows: __props.rows,
           autosize: __props.autosize,
-          clearable: "",
           resize: "none",
           onChange: handleChange
         }), null, 16, ["modelValue", "placeholder", "disabled", "readonly", "maxlength", "show-word-limit", "rows", "autosize"])
@@ -86,5 +85,5 @@ const _sfc_main = /* @__PURE__ */ Object.assign({
     };
   }
 });
-const _Textarea = /* @__PURE__ */ _pluginVue_exportHelper.default(_sfc_main, [["__scopeId", "data-v-29a082f2"]]);
+const _Textarea = /* @__PURE__ */ _pluginVue_exportHelper.default(_sfc_main, [["__scopeId", "data-v-34bc3c06"]]);
 exports.default = _Textarea;

package/lib/packages/vue/src/utils/common.js

@@ -33,9 +33,7 @@ const handleSearchData = (filterValues, completeFilterFields) => {
   Object.keys(filterValues).forEach((key) => {
     const value = filterValues[key];
     if (value !== "" && value !== null && value !== void 0) {
-      const fieldConfig = completeFilterFields.find(
-        (field) => field.id == key
-      );
+      const fieldConfig = completeFilterFields.find((field) => field.id == key);
       const fieldName = (fieldConfig == null ? void 0 : fieldConfig.fieldName) || key;
       const maxKey = `${key}_max`;
       const maxValue = filterValues[maxKey];
@@ -54,7 +52,25 @@ const handleSearchData = (filterValues, completeFilterFields) => {
   });
   return filters;
 };
+const setFormDataByFieldMapping = (value, multiple, options, fieldMapping, formData, fields) => {
+  let selectedOptions = [];
+  if (multiple) {
+    selectedOptions = options.filter((opt) => value.includes(opt.value));
+  } else {
+    selectedOptions = options.filter((opt) => opt.value == value);
+  }
+  if (fieldMapping && Array.isArray(fieldMapping)) {
+    fieldMapping.forEach((item) => {
+      const field = fields.find((field2) => field2.id === item.field);
+      if (field) {
+        const values = selectedOptions.map((row) => row[item.value]);
+        formData.value[field.fieldName] = values.join(",");
+      }
+    });
+  }
+};
 exports.cloneDeep = cloneDeep;
 exports.handleSearchData = handleSearchData;
 exports.isEqual = isEqual;
 exports.removeEmptyValues = removeEmptyValues;
+exports.setFormDataByFieldMapping = setFormDataByFieldMapping;

package/lib/packages/vue/src/utils/datasource.js

@@ -19,7 +19,9 @@ class DataSourceManager {
     this.currentDataSourceId = options.currentDataSourceId;
     this.pagination = options.pagination || false;
     this.sortRules = vue.reactive(options.sortRules || []);
-    this.originalSortRules = JSON.parse(JSON.stringify(options.sortRules || []));
+    this.originalSortRules = JSON.parse(
+      JSON.stringify(options.sortRules || [])
+    );
     this.showSuccessMessage = options.showSuccessMessage || false;
     this.loading = false;
     this.error = null;
@@ -255,7 +257,9 @@ class DataSourceManager {
    * 更新排序
    */
   updateSort(field, order) {
-    const existingIndex = this.sortRules.findIndex((rule) => rule.field === field);
+    const existingIndex = this.sortRules.findIndex(
+      (rule) => rule.field === field
+    );
     if (!order) {
       if (existingIndex > -1) {
         this.sortRules.splice(existingIndex, 1);

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@fecp/designer",
-  "version": "5.4.6",
+  "version": "5.4.9",
   "main": "lib/designer/index.js",
   "module": "es/designer/index.mjs",
   "files": [