@fecp/designer 5.2.1 → 5.2.3

package/es/packages/vue/src/components/dialog/index.mjs

@@ -43,12 +43,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/es/packages/vue/src/components/forms/form/Form.vue.mjs

@@ -502,9 +502,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] = hooks(value, formValueFormat).format(valueFormat);
+          switch (dateValueType) {
+            case "date":
+              result[fieldName] = hooks(value, formValueFormat).toDate();
+              break;
+            case "timestamp":
+              result[fieldName] = hooks(value, formValueFormat).valueOf();
+              break;
+            case "string":
+            default:
+              result[fieldName] = hooks(value, formValueFormat).format(
+                valueFormat
+              );
+              break;
+          }
         }
       };
       if (fieldsData.value) {
@@ -666,7 +680,7 @@ const _sfc_main = /* @__PURE__ */ Object.assign({
     };
   }
 });
-const _Form = /* @__PURE__ */ _export_sfc(_sfc_main, [["__scopeId", "data-v-263c93f9"]]);
+const _Form = /* @__PURE__ */ _export_sfc(_sfc_main, [["__scopeId", "data-v-42af7e52"]]);
 export {
   _Form as default
 };

package/es/packages/vue/src/components/table/TableColumn.vue.mjs

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

package/es/packages/vue/src/utils/eventFlow/actionHandlers.mjs

@@ -459,22 +459,29 @@ async function handleDialog(node, data, fields, context) {
     console.error("ui-dialog: 未找到匹配的弹层配置，" + (basic == null ? void 0 : basic.dialogId));
     return;
   }
-  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 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/lib/designer.css

@@ -3115,17 +3115,17 @@ to {
   width: 100%;
 }
 
-.collapse-header[data-v-3318d394] {
+.collapse-header[data-v-e7b8302c] {
   display: flex;
   align-items: center;
   justify-content: space-between;
   width: 100%;
   padding-right: 20px;
 }
-.setting[data-v-3318d394] .el-collapse-item__content {
+.setting[data-v-e7b8302c] .el-collapse-item__content {
   position: relative;
 }
-.field-type-select[data-v-3318d394] {
+.field-type-select[data-v-e7b8302c] {
   position: absolute;
   top: 11px;
   right: 16px;
@@ -3136,38 +3136,38 @@ to {
   transition: all 0.3s;
   border-radius: 4px;
 }
-.field-type-select[data-v-3318d394] .el-select__wrapper {
+.field-type-select[data-v-e7b8302c] .el-select__wrapper {
   background: transparent;
   box-shadow: none;
 }
-.field-type-select[data-v-3318d394] .el-select__selected-item {
+.field-type-select[data-v-e7b8302c] .el-select__selected-item {
   text-align: center;
 }
-.width-input[data-v-3318d394] {
+.width-input[data-v-e7b8302c] {
   width: 100%;
 }
-.data-source-fields[data-v-3318d394] {
+.data-source-fields[data-v-e7b8302c] {
   display: flex;
   flex-direction: column;
   gap: 8px;
   margin-bottom: 18px;
 }
-.data-source-fields .field-item[data-v-3318d394] {
+.data-source-fields .field-item[data-v-e7b8302c] {
   display: flex;
   align-items: center;
   gap: 8px;
 }
-.data-source-fields .field-item .field-label[data-v-3318d394] {
+.data-source-fields .field-item .field-label[data-v-e7b8302c] {
   width: 80px;
   font-size: 13px;
   color: #606266;
   text-align: right;
   flex-shrink: 0;
 }
-.data-source-fields .field-item .field-label[data-v-3318d394]::after {
+.data-source-fields .field-item .field-label[data-v-e7b8302c]::after {
   content: "：";
 }
-.data-source-fields .field-item .el-input[data-v-3318d394] {
+.data-source-fields .field-item .el-input[data-v-e7b8302c] {
   flex: 1;
 }.root-property[data-v-e88c3a83] {
   width: 300px;
@@ -5305,18 +5305,18 @@ body,
 }
 .approval-history-content.flowChart[data-v-7be2a6d2] {
   background-color: #f9fafc;
-}.dialog-header-content[data-v-a05d18cf] {
+}.dialog-header-content[data-v-dd10a495] {
   font-size: 16px;
   font-weight: 600;
   color: #303133;
 }
-.dialog-content-wrapper[data-v-a05d18cf] {
+.dialog-content-wrapper[data-v-dd10a495] {
   min-height: 500px;
   flex-grow: 1;
   display: flex;
   flex-direction: column;
 }
-.empty-content[data-v-a05d18cf] {
+.empty-content[data-v-dd10a495] {
   display: flex;
   align-items: center;
   justify-content: center;
@@ -5324,13 +5324,13 @@ body,
   color: #909399;
   font-size: 14px;
 }
-.component-error[data-v-a05d18cf] {
+.component-error[data-v-dd10a495] {
   padding: 40px 20px;
   text-align: center;
   color: #f56c6c;
   font-size: 14px;
 }
-.fec-dialog-table[data-v-a05d18cf] .table-pagination {
+.fec-dialog-table[data-v-dd10a495] .table-pagination {
   padding: 8px 0 0 0;
 }.text-field-wrapper[data-v-b0c0d80f] {
   width: 100%;
@@ -5501,29 +5501,29 @@ body,
   width: 80px;
   font-size: var(--el-font-size-extra-small);
 }
-.fec-form[data-v-263c93f9] {
+.fec-form[data-v-42af7e52] {
   height: 100%;
 }
-[data-v-263c93f9] .vgl-item > .el-form-item {
+[data-v-42af7e52] .vgl-item > .el-form-item {
   width: 100%;
   padding: 12px 8px 0 8px;
   height: calc(100% - 15px);
   display: flex;
 }
-[data-v-263c93f9] .vgl-item > .el-form-item.el-form-item--label-top {
+[data-v-42af7e52] .vgl-item > .el-form-item.el-form-item--label-top {
   flex-direction: column;
 }
-[data-v-263c93f9] .vgl-item > .el-form-item .el-form-item__label {
+[data-v-42af7e52] .vgl-item > .el-form-item .el-form-item__label {
   line-height: 20px;
   display: flex;
   align-items: center;
 }
-[data-v-263c93f9] .vgl-item > .el-container {
+[data-v-42af7e52] .vgl-item > .el-container {
   height: auto !important;
-}.cell-content .cell-text[data-v-df099102] {
+}.cell-content .cell-text[data-v-82ffe38c] {
   display: inline-block;
 }
-.cell-content .copy-icon[data-v-df099102] {
+.cell-content .copy-icon[data-v-82ffe38c] {
   cursor: pointer;
   color: #909399;
   font-size: 14px;
@@ -5531,7 +5531,7 @@ body,
   top: 4px;
   margin-left: 4px;
 }
-.cell-content .copy-icon[data-v-df099102]:hover {
+.cell-content .copy-icon[data-v-82ffe38c]:hover {
   color: #409eff;
 }.fec-table-filter[data-v-366e01c3] {
   display: flex;

package/lib/packages/designer/src/packages/form/aside/index.js

@@ -10,6 +10,7 @@ const defaultProperty = {
   decimalPlaces: 2,
   optionStyle: "default",
   dateType: "date",
+  dateValueType: "string",
   suffixButton: "none",
   suffixDialogName: "选择",
   dialogSource: "global",