@fecp/designer 5.2.2 → 5.2.3

package/lib/packages/vue/src/components/dialog/DialogRenderer.vue2.js

@@ -289,14 +289,15 @@ const _sfc_main = {
       });
       return btnArr;
     });
-    function formFooterClick(button) {
+    async function formFooterClick(button) {
       var _a;
       const formData = dialogFormRef.value.getFormData();
-      handleEvent.value(
+      await handleEvent.value(
         formData,
         button,
         (_a = button.eventConfig) == null ? void 0 : _a.find((item) => item.name == "Click")
       );
+      emit("confirm");
     }
     return (_ctx, _cache) => {
       const _component_el_button = index$3.ElButton;
@@ -411,5 +412,5 @@ const _sfc_main = {
     };
   }
 };
-const DialogRenderer = /* @__PURE__ */ _pluginVue_exportHelper.default(_sfc_main, [["__scopeId", "data-v-1e8ea0b4"]]);
+const DialogRenderer = /* @__PURE__ */ _pluginVue_exportHelper.default(_sfc_main, [["__scopeId", "data-v-dd10a495"]]);
 exports.default = DialogRenderer;

package/lib/packages/vue/src/components/dialog/index.js

@@ -45,12 +45,12 @@ function openDialog(displayField, dialogConfig, instance, componentCtx, fieldsLi
         }
       },
       onConfirm: (data) => {
-        resolve(data);
         cleanupDialog();
+        resolve(data);
       },
       onCancel: () => {
-        reject(new Error("用户取消"));
         cleanupDialog();
+        reject(new Error("用户取消"));
       }
     });
     vnode.appContext = instance.appContext;

package/lib/packages/vue/src/components/forms/form/Form.vue.js

@@ -504,9 +504,23 @@ const _sfc_main = /* @__PURE__ */ Object.assign({
             result[fieldName] = value.join("|");
           }
         } else if (fieldName && fieldType === "date" && value) {
+          const dateValueType = field.dateValueType;
           const valueFormat = valueFormatMap[field.dateType] || "YYYYMMDD";
           const formValueFormat = formValueFormatMap[field.dateType] || "YYYY-MM-DD";
-          result[fieldName] = moment.default(value, formValueFormat).format(valueFormat);
+          switch (dateValueType) {
+            case "date":
+              result[fieldName] = moment.default(value, formValueFormat).toDate();
+              break;
+            case "timestamp":
+              result[fieldName] = moment.default(value, formValueFormat).valueOf();
+              break;
+            case "string":
+            default:
+              result[fieldName] = moment.default(value, formValueFormat).format(
+                valueFormat
+              );
+              break;
+          }
         }
       };
       if (fieldsData.value) {
@@ -668,5 +682,5 @@ const _sfc_main = /* @__PURE__ */ Object.assign({
     };
   }
 });
-const _Form = /* @__PURE__ */ _pluginVue_exportHelper.default(_sfc_main, [["__scopeId", "data-v-263c93f9"]]);
+const _Form = /* @__PURE__ */ _pluginVue_exportHelper.default(_sfc_main, [["__scopeId", "data-v-42af7e52"]]);
 exports.default = _Form;

package/lib/packages/vue/src/components/table/TableColumn.vue.js

@@ -257,7 +257,7 @@ const _sfc_main = {
     };
     const optColumnWidth = vue.computed(() => {
       const padding = 20;
-      const btnWidth = 40;
+      const btnWidth = 60;
       if (!props.tableData || props.tableData.length === 0) {
         return props.optBtns.length * btnWidth + padding;
       }
@@ -379,5 +379,5 @@ const _sfc_main = {
     };
   }
 };
-const TableColumn = /* @__PURE__ */ _pluginVue_exportHelper.default(_sfc_main, [["__scopeId", "data-v-df099102"]]);
+const TableColumn = /* @__PURE__ */ _pluginVue_exportHelper.default(_sfc_main, [["__scopeId", "data-v-82ffe38c"]]);
 exports.default = TableColumn;

package/lib/packages/vue/src/utils/eventFlow/actionHandlers.js

@@ -461,22 +461,29 @@ async function handleDialog(node, data, fields, context) {
     console.error("ui-dialog: 未找到匹配的弹层配置，" + (basic == null ? void 0 : basic.dialogId));
     return;
   }
-  index$1.openDialog(
-    basic.displayFieldName,
-    dialog,
-    context.instance,
-    context.ctx,
-    fields,
-    data
-  ).then((result) => {
-    console.log("确定", result);
-  }).catch(() => {
-    console.log("取消");
-  });
-  return {
-    success: true,
-    message: `弹层 ${dialog.name} 已打开`
-  };
+  try {
+    await index$1.openDialog(
+      basic.displayFieldName,
+      dialog,
+      context.instance,
+      context.ctx,
+      fields,
+      data
+    );
+    return {
+      success: true,
+      message: "用户已确认",
+      shouldShowError: false
+    };
+  } catch (error) {
+    return {
+      success: false,
+      message: "用户已取消",
+      confirmed: false,
+      shouldShowError: false
+      // 用户取消不提示错误
+    };
+  }
 }
 const defaultActionHandlers = {
   "page-jump": handlePageJump,

package/package.json

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