npm - @fecp/designer - Versions diffs - 5.4.8 → 5.4.9 - Mend

@fecp/designer 5.4.8 → 5.4.9

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.

Files changed (21) hide show

package/es/packages/vue/src/components/forms/checkbox/Checkbox.vue.mjs CHANGED Viewed

@@ -2,7 +2,8 @@ import "../../../../../../node_modules/element-plus/es/index.mjs";
 /* empty css                                                                */
 /* empty css                                                                       */
 /* empty css                                                                             */
-import { computed, createBlock, openBlock, mergeProps, toHandlers, withCtx, createElementBlock, Fragment, renderList } from "vue";
+import { inject, computed, createBlock, openBlock, mergeProps, toHandlers, withCtx, createElementBlock, Fragment, renderList } from "vue";
+import { setFormDataByFieldMapping } from "../../../utils/common.mjs";
 import { ElCheckboxGroup, ElCheckbox } from "../../../../../../node_modules/element-plus/es/components/checkbox/index.mjs";
 const _sfc_main = /* @__PURE__ */ Object.assign({
   inheritAttrs: false
@@ -37,6 +38,9 @@ const _sfc_main = /* @__PURE__ */ Object.assign({
   emits: ["update:modelValue", "change"],
   setup(__props, { emit: __emit }) {
     const props = __props;
+    const formData = inject("formData", null);
+    const fieldsData = inject("fieldsData", []);
+    const hiddenFields = inject("hiddenFields", []);
     const emit = __emit;
     const inputValue = computed({
       get: () => {
@@ -54,6 +58,16 @@ const _sfc_main = /* @__PURE__ */ Object.assign({
       var _a;
       return ((_a = props.optionConfig) == null ? void 0 : _a.options) || [];
     });
+    function handlerChange(val) {
+      setFormDataByFieldMapping(
+        val,
+        true,
+        options.value,
+        props.optionConfig.fieldMapping,
+        formData,
+        [...fieldsData.value, ...hiddenFields.value]
+      );
+    }
     return (_ctx, _cache) => {
       const _component_el_checkbox = ElCheckbox;
       const _component_el_checkbox_group = ElCheckboxGroup;
@@ -64,7 +78,8 @@ const _sfc_main = /* @__PURE__ */ Object.assign({
         disabled: __props.disabled,
         style: {
           pointerEvents: __props.readonly ? "none" : "auto"
-        }
+        },
+        onChange: handlerChange
       }), {
         default: withCtx(() => [
           (openBlock(true), createElementBlock(Fragment, null, renderList(options.value, (option) => {

package/es/packages/vue/src/components/forms/radio/Radio.vue.mjs CHANGED Viewed

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

package/es/packages/vue/src/components/forms/select/Select.vue.mjs CHANGED Viewed

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

package/es/packages/vue/src/utils/common.mjs CHANGED Viewed

@@ -31,9 +31,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];
@@ -52,9 +50,27 @@ 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(",");
+      }
+    });
+  }
+};
 export {
   cloneDeep,
   handleSearchData,
   isEqual,
-  removeEmptyValues
+  removeEmptyValues,
+  setFormDataByFieldMapping
 };

package/lib/designer/package.json.js CHANGED Viewed

@@ -1,6 +1,6 @@
 "use strict";
 Object.defineProperties(exports, { __esModule: { value: true }, [Symbol.toStringTag]: { value: "Module" } });
-const version = "5.4.8";
+const version = "5.4.9";
 const packageJson = {
   version
 };

package/lib/designer/src/components/FieldMapping.vue2.js CHANGED Viewed

@@ -187,5 +187,5 @@ const _sfc_main = {
     };
   }
 };
-const FieldMapping = /* @__PURE__ */ _pluginVue_exportHelper.default(_sfc_main, [["__scopeId", "data-v-bd18993e"]]);
+const FieldMapping = /* @__PURE__ */ _pluginVue_exportHelper.default(_sfc_main, [["__scopeId", "data-v-a09f49c9"]]);
 exports.default = FieldMapping;

package/lib/designer/src/components/FieldSetMapping.vue2.js CHANGED Viewed

@@ -407,5 +407,5 @@ const _sfc_main = {
     };
   }
 };
-const FieldSetMapping = /* @__PURE__ */ _pluginVue_exportHelper.default(_sfc_main, [["__scopeId", "data-v-ac24177e"]]);
+const FieldSetMapping = /* @__PURE__ */ _pluginVue_exportHelper.default(_sfc_main, [["__scopeId", "data-v-87a3bc4a"]]);
 exports.default = FieldSetMapping;

package/lib/designer/src/components/OptionConfig.vue.js CHANGED Viewed

@@ -14,6 +14,8 @@ const vue = require("vue");
 const index$3 = require("../../../node_modules/@element-plus/icons-vue/dist/index.js");
 const vueDraggablePlus = require("../../../node_modules/vue-draggable-plus/dist/vue-draggable-plus.js");
 const DataSourceSelect = require("./DataSourceSelect.vue.js");
+const FieldMapping = require("./FieldMapping.vue2.js");
+const common = require("../packages/utils/common.js");
 ;/* empty css                   */
 const _pluginVue_exportHelper = require("../../../_virtual/_plugin-vue_export-helper.js");
 const index = require("../../../node_modules/element-plus/es/components/form/index.js");
@@ -27,6 +29,10 @@ const _hoisted_4 = ["onClick"];
 const _hoisted_5 = { class: "data-source-fields" };
 const _hoisted_6 = { class: "field-item" };
 const _hoisted_7 = { class: "field-item" };
+const _hoisted_8 = {
+  class: "field-item",
+  style: { "flex-direction": "column", "align-items": "start" }
+};
 const _sfc_main = {
   __name: "OptionConfig",
   props: {
@@ -54,21 +60,29 @@ const _sfc_main = {
         dataSourceValue: "",
         displayField: "",
         valueField: "",
-        dictionaryValue: ""
+        dictionaryValue: "",
+        fieldMapping: []
       })
     }
   },
   emits: ["update:modelValue"],
   setup(__props, { emit: __emit }) {
-    var _a, _b, _c, _d, _e, _f;
+    var _a, _b, _c, _d, _e, _f, _g;
     const props = __props;
     const emit = __emit;
+    vue.computed(() => {
+      const displayFields = common.getEditConfigDataFields() || [];
+      const editConfigData = common.getEditConfigData();
+      const hiddenList = (editConfigData == null ? void 0 : editConfigData.hiddenFields) || [];
+      return [...displayFields, ...hiddenList];
+    });
     const optionSource = vue.ref(((_a = props.modelValue) == null ? void 0 : _a.optionSource) || "custom");
     const options = vue.ref(((_b = props.modelValue) == null ? void 0 : _b.options) || []);
     const dataSourceValue = vue.ref(((_c = props.modelValue) == null ? void 0 : _c.dataSourceValue) || "");
     const displayField = vue.ref(((_d = props.modelValue) == null ? void 0 : _d.displayField) || "");
     const valueField = vue.ref(((_e = props.modelValue) == null ? void 0 : _e.valueField) || "");
     const dictionaryValue = vue.ref(((_f = props.modelValue) == null ? void 0 : _f.dictionaryValue) || "");
+    const fieldMapping = vue.ref(((_g = props.modelValue) == null ? void 0 : _g.fieldMapping) || []);
     const isUpdatingFromProps = vue.ref(false);
     vue.watch(
       () => props.modelValue,
@@ -80,6 +94,7 @@ const _sfc_main = {
           displayField.value = newVal.displayField || "";
           valueField.value = newVal.valueField || "";
           dictionaryValue.value = newVal.dictionaryValue || "";
+          fieldMapping.value = newVal.fieldMapping || [];
         }
       },
       { deep: true }
@@ -92,7 +107,8 @@ const _sfc_main = {
         dataSourceValue: dataSourceValue.value,
         displayField: displayField.value,
         valueField: valueField.value,
-        dictionaryValue: dictionaryValue.value
+        dictionaryValue: dictionaryValue.value,
+        fieldMapping: fieldMapping.value
       };
       emit("update:modelValue", data);
       vue.nextTick(() => {
@@ -106,7 +122,8 @@ const _sfc_main = {
         dataSourceValue,
         displayField,
         valueField,
-        dictionaryValue
+        dictionaryValue,
+        fieldMapping
       ],
       updateParent,
       { deep: true, immediate: true }
@@ -162,9 +179,9 @@ const _sfc_main = {
           default: vue.withCtx(() => [
             vue.createElementVNode("div", _hoisted_1, [
               vue.createElementVNode("div", _hoisted_2, [
-                _cache[6] || (_cache[6] = vue.createElementVNode("span", null, null, -1)),
-                _cache[7] || (_cache[7] = vue.createElementVNode("span", { class: "header-label" }, "显示值", -1)),
-                _cache[8] || (_cache[8] = vue.createElementVNode("span", { class: "header-label" }, "真实值", -1)),
+                _cache[7] || (_cache[7] = vue.createElementVNode("span", null, null, -1)),
+                _cache[8] || (_cache[8] = vue.createElementVNode("span", { class: "header-label" }, "显示值", -1)),
+                _cache[9] || (_cache[9] = vue.createElementVNode("span", { class: "header-label" }, "真实值", -1)),
                 vue.createElementVNode("div", {
                   class: "icon-btn add-btn",
                   onClick: handleAddOption
@@ -238,7 +255,7 @@ const _sfc_main = {
           }),
           vue.createElementVNode("div", _hoisted_5, [
             vue.createElementVNode("div", _hoisted_6, [
-              _cache[9] || (_cache[9] = vue.createElementVNode("span", { class: "field-label" }, "显示字段", -1)),
+              _cache[10] || (_cache[10] = vue.createElementVNode("span", { class: "field-label" }, "显示字段", -1)),
               vue.createVNode(_component_el_input, {
                 modelValue: vue.unref(displayField),
                 "onUpdate:modelValue": _cache[3] || (_cache[3] = ($event) => vue.isRef(displayField) ? displayField.value = $event : null),
@@ -246,19 +263,29 @@ const _sfc_main = {
               }, null, 8, ["modelValue"])
             ]),
             vue.createElementVNode("div", _hoisted_7, [
-              _cache[10] || (_cache[10] = vue.createElementVNode("span", { class: "field-label" }, "值字段", -1)),
+              _cache[11] || (_cache[11] = vue.createElementVNode("span", { class: "field-label" }, "值字段", -1)),
               vue.createVNode(_component_el_input, {
                 modelValue: vue.unref(valueField),
                 "onUpdate:modelValue": _cache[4] || (_cache[4] = ($event) => vue.isRef(valueField) ? valueField.value = $event : null),
                 placeholder: "如：optCode"
               }, null, 8, ["modelValue"])
+            ]),
+            vue.createElementVNode("div", _hoisted_8, [
+              _cache[12] || (_cache[12] = vue.createElementVNode("span", {
+                class: "field-label",
+                style: { "width": "auto" }
+              }, "选中数据映射表单字段", -1)),
+              vue.createVNode(FieldMapping.default, {
+                modelValue: vue.unref(fieldMapping),
+                "onUpdate:modelValue": _cache[5] || (_cache[5] = ($event) => vue.isRef(fieldMapping) ? fieldMapping.value = $event : null)
+              }, null, 8, ["modelValue"])
             ])
           ])
         ], 64)) : vue.unref(optionSource) === "dictionary" ? (vue.openBlock(), vue.createBlock(_component_el_form_item, { key: 2 }, {
           default: vue.withCtx(() => [
             vue.createVNode(_component_el_input, {
               modelValue: vue.unref(dictionaryValue),
-              "onUpdate:modelValue": _cache[5] || (_cache[5] = ($event) => vue.isRef(dictionaryValue) ? dictionaryValue.value = $event : null),
+              "onUpdate:modelValue": _cache[6] || (_cache[6] = ($event) => vue.isRef(dictionaryValue) ? dictionaryValue.value = $event : null),
               placeholder: "keyName"
             }, null, 8, ["modelValue"])
           ]),
@@ -268,5 +295,5 @@ const _sfc_main = {
     };
   }
 };
-const OptionConfig = /* @__PURE__ */ _pluginVue_exportHelper.default(_sfc_main, [["__scopeId", "data-v-96075352"]]);
+const OptionConfig = /* @__PURE__ */ _pluginVue_exportHelper.default(_sfc_main, [["__scopeId", "data-v-fd4c229c"]]);
 exports.default = OptionConfig;