@fecp/designer 5.2.1 → 5.2.3

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 (17) hide show
  1. package/es/designer.css +24 -24
  2. package/es/packages/designer/src/packages/form/aside/index.mjs +1 -0
  3. package/es/packages/designer/src/packages/form/property/widgets.vue.mjs +98 -74
  4. package/es/packages/vue/src/components/dialog/DialogRenderer.vue2.mjs +10 -8
  5. package/es/packages/vue/src/components/dialog/index.mjs +2 -2
  6. package/es/packages/vue/src/components/forms/form/Form.vue.mjs +16 -2
  7. package/es/packages/vue/src/components/table/TableColumn.vue.mjs +2 -2
  8. package/es/packages/vue/src/utils/eventFlow/actionHandlers.mjs +23 -16
  9. package/lib/designer.css +24 -24
  10. package/lib/packages/designer/src/packages/form/aside/index.js +1 -0
  11. package/lib/packages/designer/src/packages/form/property/widgets.vue.js +98 -74
  12. package/lib/packages/vue/src/components/dialog/DialogRenderer.vue2.js +10 -8
  13. package/lib/packages/vue/src/components/dialog/index.js +2 -2
  14. package/lib/packages/vue/src/components/forms/form/Form.vue.js +16 -2
  15. package/lib/packages/vue/src/components/table/TableColumn.vue.js +2 -2
  16. package/lib/packages/vue/src/utils/eventFlow/actionHandlers.js +23 -16
  17. package/package.json +1 -1
package/lib/packages/designer/src/packages/form/property/widgets.vue.js CHANGED
@@ -275,7 +275,7 @@ const _sfc_main = {
275
275
  return vue.openBlock(), vue.createBlock(_component_el_collapse, {
276
276
  class: "setting",
277
277
  modelValue: vue.unref(activeName),
278
- "onUpdate:modelValue": _cache[52] || (_cache[52] = ($event) => vue.isRef(activeName) ? activeName.value = $event : null)
278
+ "onUpdate:modelValue": _cache[53] || (_cache[53] = ($event) => vue.isRef(activeName) ? activeName.value = $event : null)
279
279
  }, {
280
280
  default: vue.withCtx(() => [
281
281
  vue.createVNode(_component_el_collapse_item, {
@@ -394,19 +394,19 @@ const _sfc_main = {
394
394
  }, {
395
395
  default: vue.withCtx(() => [
396
396
  vue.createVNode(_component_el_radio_button, { value: "default" }, {
397
- default: vue.withCtx(() => _cache[53] || (_cache[53] = [
397
+ default: vue.withCtx(() => _cache[54] || (_cache[54] = [
398
398
  vue.createTextVNode("默认")
399
399
  ])),
400
400
  _: 1
401
401
  }),
402
402
  vue.createVNode(_component_el_radio_button, { value: "label" }, {
403
- default: vue.withCtx(() => _cache[54] || (_cache[54] = [
403
+ default: vue.withCtx(() => _cache[55] || (_cache[55] = [
404
404
  vue.createTextVNode("标签")
405
405
  ])),
406
406
  _: 1
407
407
  }),
408
408
  vue.createVNode(_component_el_radio_button, { value: "input" }, {
409
- default: vue.withCtx(() => _cache[55] || (_cache[55] = [
409
+ default: vue.withCtx(() => _cache[56] || (_cache[56] = [
410
410
  vue.createTextVNode("输入框")
411
411
  ])),
412
412
  _: 1
@@ -485,7 +485,7 @@ const _sfc_main = {
485
485
  ], 64)) : vue.createCommentVNode("", true),
486
486
  vue.unref(currentItem).fieldType === "text" ? (vue.openBlock(), vue.createElementBlock(vue.Fragment, { key: 3 }, [
487
487
  vue.createVNode(_component_el_form_item, null, {
488
- label: vue.withCtx(() => _cache[56] || (_cache[56] = [
488
+ label: vue.withCtx(() => _cache[57] || (_cache[57] = [
489
489
  vue.createElementVNode("span", null, "尾部按钮", -1)
490
490
  ])),
491
491
  default: vue.withCtx(() => [
@@ -496,19 +496,19 @@ const _sfc_main = {
496
496
  }, {
497
497
  default: vue.withCtx(() => [
498
498
  vue.createVNode(_component_el_radio_button, { value: "none" }, {
499
- default: vue.withCtx(() => _cache[57] || (_cache[57] = [
499
+ default: vue.withCtx(() => _cache[58] || (_cache[58] = [
500
500
  vue.createTextVNode("无")
501
501
  ])),
502
502
  _: 1
503
503
  }),
504
504
  vue.createVNode(_component_el_radio_button, { value: "dialog" }, {
505
- default: vue.withCtx(() => _cache[58] || (_cache[58] = [
505
+ default: vue.withCtx(() => _cache[59] || (_cache[59] = [
506
506
  vue.createTextVNode("弹层选择")
507
507
  ])),
508
508
  _: 1
509
509
  }),
510
510
  vue.createVNode(_component_el_radio_button, { value: "custom" }, {
511
- default: vue.withCtx(() => _cache[59] || (_cache[59] = [
511
+ default: vue.withCtx(() => _cache[60] || (_cache[60] = [
512
512
  vue.createTextVNode("自定义")
513
513
  ])),
514
514
  _: 1
@@ -521,14 +521,14 @@ const _sfc_main = {
521
521
  }),
522
522
  vue.unref(currentItem).suffixButton == "dialog" ? (vue.openBlock(), vue.createElementBlock("div", _hoisted_1, [
523
523
  vue.createElementVNode("div", _hoisted_2, [
524
- _cache[60] || (_cache[60] = vue.createElementVNode("span", { class: "field-label" }, "按钮名称", -1)),
524
+ _cache[61] || (_cache[61] = vue.createElementVNode("span", { class: "field-label" }, "按钮名称", -1)),
525
525
  vue.createVNode(_component_el_input, {
526
526
  modelValue: vue.unref(currentItem).suffixDialogName,
527
527
  "onUpdate:modelValue": _cache[17] || (_cache[17] = ($event) => vue.unref(currentItem).suffixDialogName = $event)
528
528
  }, null, 8, ["modelValue"])
529
529
  ]),
530
530
  vue.createElementVNode("div", _hoisted_3, [
531
- _cache[63] || (_cache[63] = vue.createElementVNode("span", { class: "field-label" }, "弹层来源", -1)),
531
+ _cache[64] || (_cache[64] = vue.createElementVNode("span", { class: "field-label" }, "弹层来源", -1)),
532
532
  vue.createVNode(_component_el_radio_group, {
533
533
  modelValue: vue.unref(currentItem).dialogSource,
534
534
  "onUpdate:modelValue": _cache[18] || (_cache[18] = ($event) => vue.unref(currentItem).dialogSource = $event),
@@ -536,13 +536,13 @@ const _sfc_main = {
536
536
  }, {
537
537
  default: vue.withCtx(() => [
538
538
  vue.createVNode(_component_el_radio_button, { value: "global" }, {
539
- default: vue.withCtx(() => _cache[61] || (_cache[61] = [
539
+ default: vue.withCtx(() => _cache[62] || (_cache[62] = [
540
540
  vue.createTextVNode("全局")
541
541
  ])),
542
542
  _: 1
543
543
  }),
544
544
  vue.createVNode(_component_el_radio_button, { value: "custom" }, {
545
- default: vue.withCtx(() => _cache[62] || (_cache[62] = [
545
+ default: vue.withCtx(() => _cache[63] || (_cache[63] = [
546
546
  vue.createTextVNode("自定义")
547
547
  ])),
548
548
  _: 1
@@ -552,7 +552,7 @@ const _sfc_main = {
552
552
  }, 8, ["modelValue"])
553
553
  ]),
554
554
  vue.createElementVNode("div", _hoisted_4, [
555
- _cache[64] || (_cache[64] = vue.createElementVNode("span", { class: "field-label" }, "选择弹层", -1)),
555
+ _cache[65] || (_cache[65] = vue.createElementVNode("span", { class: "field-label" }, "选择弹层", -1)),
556
556
  vue.createVNode(_component_el_select, {
557
557
  modelValue: vue.unref(currentItem).suffixDialogId,
558
558
  "onUpdate:modelValue": _cache[19] || (_cache[19] = ($event) => vue.unref(currentItem).suffixDialogId = $event),
@@ -577,7 +577,7 @@ const _sfc_main = {
577
577
  ]),
578
578
  vue.unref(currentItem).dialogSource == "global" && vue.unref(currentItem).suffixDialogId ? (vue.openBlock(), vue.createElementBlock(vue.Fragment, { key: 0 }, [
579
579
  vue.createElementVNode("div", _hoisted_5, [
580
- _cache[68] || (_cache[68] = vue.createElementVNode("span", { class: "field-label" }, "选择模式", -1)),
580
+ _cache[69] || (_cache[69] = vue.createElementVNode("span", { class: "field-label" }, "选择模式", -1)),
581
581
  vue.createVNode(_component_el_radio_group, {
582
582
  modelValue: vue.unref(currentItem).selectionMode,
583
583
  "onUpdate:modelValue": _cache[20] || (_cache[20] = ($event) => vue.unref(currentItem).selectionMode = $event),
@@ -585,19 +585,19 @@ const _sfc_main = {
585
585
  }, {
586
586
  default: vue.withCtx(() => [
587
587
  vue.createVNode(_component_el_radio_button, { value: "none" }, {
588
- default: vue.withCtx(() => _cache[65] || (_cache[65] = [
588
+ default: vue.withCtx(() => _cache[66] || (_cache[66] = [
589
589
  vue.createTextVNode("无")
590
590
  ])),
591
591
  _: 1
592
592
  }),
593
593
  vue.createVNode(_component_el_radio_button, { value: "single" }, {
594
- default: vue.withCtx(() => _cache[66] || (_cache[66] = [
594
+ default: vue.withCtx(() => _cache[67] || (_cache[67] = [
595
595
  vue.createTextVNode("单选")
596
596
  ])),
597
597
  _: 1
598
598
  }),
599
599
  vue.createVNode(_component_el_radio_button, { value: "multiple" }, {
600
- default: vue.withCtx(() => _cache[67] || (_cache[67] = [
600
+ default: vue.withCtx(() => _cache[68] || (_cache[68] = [
601
601
  vue.createTextVNode("多选")
602
602
  ])),
603
603
  _: 1
@@ -608,7 +608,7 @@ const _sfc_main = {
608
608
  ]),
609
609
  vue.unref(currentItem).selectionMode != "none" ? (vue.openBlock(), vue.createElementBlock(vue.Fragment, { key: 0 }, [
610
610
  vue.createElementVNode("div", _hoisted_6, [
611
- _cache[69] || (_cache[69] = vue.createElementVNode("span", { class: "field-label" }, "选取后反显格式", -1)),
611
+ _cache[70] || (_cache[70] = vue.createElementVNode("span", { class: "field-label" }, "选取后反显格式", -1)),
612
612
  vue.createVNode(vue.unref(FormulaEditorInput.default), {
613
613
  title: "反显格式配置",
614
614
  formulaConf: vue.unref(currentItem).displayFormat,
@@ -619,7 +619,7 @@ const _sfc_main = {
619
619
  }, null, 8, ["formulaConf", "modelValue", "fieldList"])
620
620
  ]),
621
621
  vue.createElementVNode("div", _hoisted_7, [
622
- _cache[70] || (_cache[70] = vue.createElementVNode("span", {
622
+ _cache[71] || (_cache[71] = vue.createElementVNode("span", {
623
623
  class: "field-label",
624
624
  style: { "width": "100%", "text-align": "left" }
625
625
  }, "选取后表单赋值", -1)),
@@ -635,7 +635,7 @@ const _sfc_main = {
635
635
  ])
636
636
  ], 64)) : vue.createCommentVNode("", true),
637
637
  vue.createElementVNode("div", _hoisted_8, [
638
- _cache[71] || (_cache[71] = vue.createElementVNode("span", { class: "field-label" }, "回调事件配置", -1)),
638
+ _cache[72] || (_cache[72] = vue.createElementVNode("span", { class: "field-label" }, "回调事件配置", -1)),
639
639
  vue.createVNode(OnlyFLowConfigButton.default, {
640
640
  config: vue.unref(currentItem).callbackEventConfig,
641
641
  onConfirm: handleOnlyFlowConfirm
@@ -644,14 +644,14 @@ const _sfc_main = {
644
644
  ], 64)) : vue.createCommentVNode("", true)
645
645
  ])) : vue.unref(currentItem).suffixButton == "custom" ? (vue.openBlock(), vue.createElementBlock("div", _hoisted_9, [
646
646
  vue.createElementVNode("div", _hoisted_10, [
647
- _cache[72] || (_cache[72] = vue.createElementVNode("span", { class: "field-label" }, "按钮名称", -1)),
647
+ _cache[73] || (_cache[73] = vue.createElementVNode("span", { class: "field-label" }, "按钮名称", -1)),
648
648
  vue.createVNode(_component_el_input, {
649
649
  modelValue: vue.unref(currentItem).suffixButtonName,
650
650
  "onUpdate:modelValue": _cache[24] || (_cache[24] = ($event) => vue.unref(currentItem).suffixButtonName = $event)
651
651
  }, null, 8, ["modelValue"])
652
652
  ]),
653
653
  vue.createElementVNode("div", _hoisted_11, [
654
- _cache[73] || (_cache[73] = vue.createElementVNode("span", { class: "field-label" }, "按钮事件", -1)),
654
+ _cache[74] || (_cache[74] = vue.createElementVNode("span", { class: "field-label" }, "按钮事件", -1)),
655
655
  vue.createVNode(EventConfigButton.default, {
656
656
  config: vue.unref(currentItem).suffixButtonConfig,
657
657
  onConfirm: handleSuffixButtonConfirm
@@ -737,7 +737,7 @@ const _sfc_main = {
737
737
  "controls-position": "right",
738
738
  placeholder: "最小值"
739
739
  }, null, 8, ["modelValue"]),
740
- _cache[74] || (_cache[74] = vue.createElementVNode("span", { style: { "color": "#909399", "font-size": "14px" } }, "-", -1)),
740
+ _cache[75] || (_cache[75] = vue.createElementVNode("span", { style: { "color": "#909399", "font-size": "14px" } }, "-", -1)),
741
741
  vue.createVNode(_component_el_input_number, {
742
742
  style: { "width": "100%" },
743
743
  modelValue: vue.unref(currentItem).maxValue,
@@ -789,7 +789,7 @@ const _sfc_main = {
789
789
  }),
790
790
  vue.createElementVNode("div", _hoisted_13, [
791
791
  vue.createElementVNode("div", _hoisted_14, [
792
- _cache[75] || (_cache[75] = vue.createElementVNode("span", { class: "field-label" }, "显示字段", -1)),
792
+ _cache[76] || (_cache[76] = vue.createElementVNode("span", { class: "field-label" }, "显示字段", -1)),
793
793
  vue.createVNode(_component_el_input, {
794
794
  modelValue: vue.unref(currentItem).optionConfig.displayField,
795
795
  "onUpdate:modelValue": _cache[34] || (_cache[34] = ($event) => vue.unref(currentItem).optionConfig.displayField = $event),
@@ -797,7 +797,7 @@ const _sfc_main = {
797
797
  }, null, 8, ["modelValue"])
798
798
  ]),
799
799
  vue.createElementVNode("div", _hoisted_15, [
800
- _cache[76] || (_cache[76] = vue.createElementVNode("span", { class: "field-label" }, "值字段", -1)),
800
+ _cache[77] || (_cache[77] = vue.createElementVNode("span", { class: "field-label" }, "值字段", -1)),
801
801
  vue.createVNode(_component_el_input, {
802
802
  modelValue: vue.unref(currentItem).optionConfig.valueField,
803
803
  "onUpdate:modelValue": _cache[35] || (_cache[35] = ($event) => vue.unref(currentItem).optionConfig.valueField = $event),
@@ -805,7 +805,7 @@ const _sfc_main = {
805
805
  }, null, 8, ["modelValue"])
806
806
  ]),
807
807
  vue.createElementVNode("div", _hoisted_16, [
808
- _cache[77] || (_cache[77] = vue.createElementVNode("span", { class: "field-label" }, "主键字段", -1)),
808
+ _cache[78] || (_cache[78] = vue.createElementVNode("span", { class: "field-label" }, "主键字段", -1)),
809
809
  vue.createVNode(_component_el_input, {
810
810
  modelValue: vue.unref(currentItem).optionConfig.idField,
811
811
  "onUpdate:modelValue": _cache[36] || (_cache[36] = ($event) => vue.unref(currentItem).optionConfig.idField = $event),
@@ -813,7 +813,7 @@ const _sfc_main = {
813
813
  }, null, 8, ["modelValue"])
814
814
  ]),
815
815
  vue.createElementVNode("div", _hoisted_17, [
816
- _cache[78] || (_cache[78] = vue.createElementVNode("span", { class: "field-label" }, "父主键字段", -1)),
816
+ _cache[79] || (_cache[79] = vue.createElementVNode("span", { class: "field-label" }, "父主键字段", -1)),
817
817
  vue.createVNode(_component_el_input, {
818
818
  modelValue: vue.unref(currentItem).optionConfig.pidField,
819
819
  "onUpdate:modelValue": _cache[37] || (_cache[37] = ($event) => vue.unref(currentItem).optionConfig.pidField = $event),
@@ -882,48 +882,72 @@ const _sfc_main = {
882
882
  ]),
883
883
  _: 1
884
884
  })) : vue.createCommentVNode("", true),
885
- vue.unref(currentItem).fieldType === "date" ? (vue.openBlock(), vue.createBlock(_component_el_form_item, {
886
- key: 10,
887
- label: "类型"
888
- }, {
889
- default: vue.withCtx(() => [
890
- vue.createVNode(_component_el_select, {
891
- modelValue: vue.unref(currentItem).dateType,
892
- "onUpdate:modelValue": _cache[43] || (_cache[43] = ($event) => vue.unref(currentItem).dateType = $event)
893
- }, {
894
- default: vue.withCtx(() => [
895
- vue.createVNode(_component_el_option, {
896
- label: "年-月-日",
897
- value: "date"
898
- }),
899
- vue.createVNode(_component_el_option, {
900
- label: "年-周",
901
- value: "week"
902
- }),
903
- vue.createVNode(_component_el_option, {
904
- label: "年-月",
905
- value: "month"
906
- }),
907
- vue.createVNode(_component_el_option, {
908
- label: "年",
909
- value: "year"
910
- }),
911
- vue.createVNode(_component_el_option, {
912
- label: "年-月-日 时:分:秒",
913
- value: "datetime"
914
- })
915
- ]),
916
- _: 1
917
- }, 8, ["modelValue"])
918
- ]),
919
- _: 1
920
- })) : vue.createCommentVNode("", true),
885
+ vue.unref(currentItem).fieldType === "date" ? (vue.openBlock(), vue.createElementBlock(vue.Fragment, { key: 10 }, [
886
+ vue.createVNode(_component_el_form_item, { label: "显示格式" }, {
887
+ default: vue.withCtx(() => [
888
+ vue.createVNode(_component_el_select, {
889
+ modelValue: vue.unref(currentItem).dateType,
890
+ "onUpdate:modelValue": _cache[43] || (_cache[43] = ($event) => vue.unref(currentItem).dateType = $event)
891
+ }, {
892
+ default: vue.withCtx(() => [
893
+ vue.createVNode(_component_el_option, {
894
+ label: "年-月-日",
895
+ value: "date"
896
+ }),
897
+ vue.createVNode(_component_el_option, {
898
+ label: "年-周",
899
+ value: "week"
900
+ }),
901
+ vue.createVNode(_component_el_option, {
902
+ label: "年-月",
903
+ value: "month"
904
+ }),
905
+ vue.createVNode(_component_el_option, {
906
+ label: "年",
907
+ value: "year"
908
+ }),
909
+ vue.createVNode(_component_el_option, {
910
+ label: "年-月-日 时:分:秒",
911
+ value: "datetime"
912
+ })
913
+ ]),
914
+ _: 1
915
+ }, 8, ["modelValue"])
916
+ ]),
917
+ _: 1
918
+ }),
919
+ vue.createVNode(_component_el_form_item, { label: "数据格式" }, {
920
+ default: vue.withCtx(() => [
921
+ vue.createVNode(_component_el_select, {
922
+ modelValue: vue.unref(currentItem).dateValueType,
923
+ "onUpdate:modelValue": _cache[44] || (_cache[44] = ($event) => vue.unref(currentItem).dateValueType = $event)
924
+ }, {
925
+ default: vue.withCtx(() => [
926
+ vue.createVNode(_component_el_option, {
927
+ label: "字符型",
928
+ value: "string"
929
+ }),
930
+ vue.createVNode(_component_el_option, {
931
+ label: "日期型",
932
+ value: "date"
933
+ }),
934
+ vue.createVNode(_component_el_option, {
935
+ label: "时间戳",
936
+ value: "timestamp"
937
+ })
938
+ ]),
939
+ _: 1
940
+ }, 8, ["modelValue"])
941
+ ]),
942
+ _: 1
943
+ })
944
+ ], 64)) : vue.createCommentVNode("", true),
921
945
  vue.unref(isSysSelect) ? (vue.openBlock(), vue.createElementBlock(vue.Fragment, { key: 11 }, [
922
946
  vue.createVNode(_component_el_form_item, { label: "弹层标题" }, {
923
947
  default: vue.withCtx(() => [
924
948
  vue.createVNode(_component_el_input, {
925
949
  modelValue: vue.unref(currentItem).dialogConfig.dialogTitle,
926
- "onUpdate:modelValue": _cache[44] || (_cache[44] = ($event) => vue.unref(currentItem).dialogConfig.dialogTitle = $event)
950
+ "onUpdate:modelValue": _cache[45] || (_cache[45] = ($event) => vue.unref(currentItem).dialogConfig.dialogTitle = $event)
927
951
  }, null, 8, ["modelValue"])
928
952
  ]),
929
953
  _: 1
@@ -932,7 +956,7 @@ const _sfc_main = {
932
956
  default: vue.withCtx(() => [
933
957
  vue.createVNode(_component_ParamsConfig, {
934
958
  modelValue: vue.unref(currentItem).dialogConfig.dialogParams,
935
- "onUpdate:modelValue": _cache[45] || (_cache[45] = ($event) => vue.unref(currentItem).dialogConfig.dialogParams = $event)
959
+ "onUpdate:modelValue": _cache[46] || (_cache[46] = ($event) => vue.unref(currentItem).dialogConfig.dialogParams = $event)
936
960
  }, null, 8, ["modelValue"])
937
961
  ]),
938
962
  _: 1
@@ -944,17 +968,17 @@ const _sfc_main = {
944
968
  default: vue.withCtx(() => [
945
969
  vue.createVNode(_component_el_radio_group, {
946
970
  modelValue: vue.unref(currentItem).dialogConfig.selectionMode,
947
- "onUpdate:modelValue": _cache[46] || (_cache[46] = ($event) => vue.unref(currentItem).dialogConfig.selectionMode = $event)
971
+ "onUpdate:modelValue": _cache[47] || (_cache[47] = ($event) => vue.unref(currentItem).dialogConfig.selectionMode = $event)
948
972
  }, {
949
973
  default: vue.withCtx(() => [
950
974
  vue.createVNode(_component_el_radio_button, { value: "single" }, {
951
- default: vue.withCtx(() => _cache[79] || (_cache[79] = [
975
+ default: vue.withCtx(() => _cache[80] || (_cache[80] = [
952
976
  vue.createTextVNode("单选")
953
977
  ])),
954
978
  _: 1
955
979
  }),
956
980
  vue.createVNode(_component_el_radio_button, { value: "multiple" }, {
957
- default: vue.withCtx(() => _cache[80] || (_cache[80] = [
981
+ default: vue.withCtx(() => _cache[81] || (_cache[81] = [
958
982
  vue.createTextVNode("多选")
959
983
  ])),
960
984
  _: 1
@@ -983,12 +1007,12 @@ const _sfc_main = {
983
1007
  vue.createElementVNode("div", _hoisted_18, [
984
1008
  vue.createVNode(_component_el_switch, {
985
1009
  modelValue: vue.unref(currentItem).required,
986
- "onUpdate:modelValue": _cache[47] || (_cache[47] = ($event) => vue.unref(currentItem).required = $event)
1010
+ "onUpdate:modelValue": _cache[48] || (_cache[48] = ($event) => vue.unref(currentItem).required = $event)
987
1011
  }, null, 8, ["modelValue"]),
988
1012
  vue.unref(currentItem).required ? (vue.openBlock(), vue.createBlock(_component_el_input, {
989
1013
  key: 0,
990
1014
  modelValue: vue.unref(currentItem).requiredMessage,
991
- "onUpdate:modelValue": _cache[48] || (_cache[48] = ($event) => vue.unref(currentItem).requiredMessage = $event),
1015
+ "onUpdate:modelValue": _cache[49] || (_cache[49] = ($event) => vue.unref(currentItem).requiredMessage = $event),
992
1016
  placeholder: "请输入提示信息",
993
1017
  style: { "flex": "1" }
994
1018
  }, null, 8, ["modelValue"])) : vue.createCommentVNode("", true)
@@ -1003,7 +1027,7 @@ const _sfc_main = {
1003
1027
  default: vue.withCtx(() => [
1004
1028
  vue.createVNode(_component_el_select, {
1005
1029
  modelValue: vue.unref(currentItem).validationType,
1006
- "onUpdate:modelValue": _cache[49] || (_cache[49] = ($event) => vue.unref(currentItem).validationType = $event),
1030
+ "onUpdate:modelValue": _cache[50] || (_cache[50] = ($event) => vue.unref(currentItem).validationType = $event),
1007
1031
  placeholder: "选择校验规则",
1008
1032
  onChange: handleValidationChange,
1009
1033
  style: { "margin-bottom": "12px" }
@@ -1069,13 +1093,13 @@ const _sfc_main = {
1069
1093
  vue.unref(currentItem).validationType === "custom" ? (vue.openBlock(), vue.createElementBlock("div", _hoisted_20, [
1070
1094
  vue.createVNode(DataSourceSelect.default, {
1071
1095
  modelValue: vue.unref(currentItem).validationDataSource,
1072
- "onUpdate:modelValue": _cache[50] || (_cache[50] = ($event) => vue.unref(currentItem).validationDataSource = $event)
1096
+ "onUpdate:modelValue": _cache[51] || (_cache[51] = ($event) => vue.unref(currentItem).validationDataSource = $event)
1073
1097
  }, null, 8, ["modelValue"])
1074
1098
  ])) : vue.createCommentVNode("", true),
1075
1099
  vue.unref(currentItem).validationType !== "none" ? (vue.openBlock(), vue.createBlock(_component_el_input, {
1076
1100
  key: 2,
1077
1101
  modelValue: vue.unref(currentItem).validationMessage,
1078
- "onUpdate:modelValue": _cache[51] || (_cache[51] = ($event) => vue.unref(currentItem).validationMessage = $event),
1102
+ "onUpdate:modelValue": _cache[52] || (_cache[52] = ($event) => vue.unref(currentItem).validationMessage = $event),
1079
1103
  placeholder: getValidationPlaceholder(),
1080
1104
  style: { "margin-bottom": "12px" }
1081
1105
  }, null, 8, ["modelValue", "placeholder"])) : vue.createCommentVNode("", true)
@@ -1094,5 +1118,5 @@ const _sfc_main = {
1094
1118
  };
1095
1119
  }
1096
1120
  };
1097
- const widgets = /* @__PURE__ */ _pluginVue_exportHelper.default(_sfc_main, [["__scopeId", "data-v-3318d394"]]);
1121
+ const widgets = /* @__PURE__ */ _pluginVue_exportHelper.default(_sfc_main, [["__scopeId", "data-v-e7b8302c"]]);
1098
1122
  exports.default = widgets;
package/lib/packages/vue/src/components/dialog/DialogRenderer.vue2.js CHANGED
@@ -289,21 +289,22 @@ const _sfc_main = {
289
289
  });
290
290
  return btnArr;
291
291
  });
292
- function formFooterClick(button) {
292
+ async function formFooterClick(button) {
293
293
  var _a;
294
294
  const formData = dialogFormRef.value.getFormData();
295
- handleEvent.value(
295
+ await handleEvent.value(
296
296
  formData,
297
297
  button,
298
298
  (_a = button.eventConfig) == null ? void 0 : _a.find((item) => item.name == "Click")
299
299
  );
300
+ emit("confirm");
300
301
  }
301
302
  return (_ctx, _cache) => {
302
303
  const _component_el_button = index$3.ElButton;
303
304
  const _component_el_dialog = index.ElDialog;
304
305
  return vue.openBlock(), vue.createBlock(_component_el_dialog, {
305
306
  modelValue: dialogVisible.value,
306
- "onUpdate:modelValue": _cache[0] || (_cache[0] = ($event) => dialogVisible.value = $event),
307
+ "onUpdate:modelValue": _cache[1] || (_cache[1] = ($event) => dialogVisible.value = $event),
307
308
  width: dialogWidth.value,
308
309
  draggable: true,
309
310
  "close-on-click-modal": false,
@@ -322,7 +323,7 @@ const _sfc_main = {
322
323
  var _a, _b, _c;
323
324
  return [
324
325
  vue.createVNode(_component_el_button, { onClick: handleCancel }, {
325
- default: vue.withCtx(() => _cache[1] || (_cache[1] = [
326
+ default: vue.withCtx(() => _cache[2] || (_cache[2] = [
326
327
  vue.createTextVNode("取消")
327
328
  ])),
328
329
  _: 1
@@ -333,7 +334,7 @@ const _sfc_main = {
333
334
  type: "primary",
334
335
  onClick: handleConfirm
335
336
  }, {
336
- default: vue.withCtx(() => _cache[2] || (_cache[2] = [
337
+ default: vue.withCtx(() => _cache[3] || (_cache[3] = [
337
338
  vue.createTextVNode("确定")
338
339
  ])),
339
340
  _: 1
@@ -389,12 +390,13 @@ const _sfc_main = {
389
390
  key: 1,
390
391
  templateKey: __props.dialogConfig.subFormKey,
391
392
  isDialog: "",
392
- initSearchData: initDialogParams.value,
393
+ modelValue: initDialogParams.value,
394
+ "onUpdate:modelValue": _cache[0] || (_cache[0] = ($event) => initDialogParams.value = $event),
393
395
  onLoaded: subFormLoaded,
394
396
  initFormMode: __props.dialogConfig.subFormMode,
395
397
  ref_key: "dialogFormRef",
396
398
  ref: dialogFormRef
397
- }, null, 8, ["templateKey", "initSearchData", "initFormMode"])) : ((_d = __props.dialogConfig) == null ? void 0 : _d.contentSource) === "component" ? (vue.openBlock(), vue.createElementBlock(vue.Fragment, { key: 2 }, [
399
+ }, null, 8, ["templateKey", "modelValue", "initFormMode"])) : ((_d = __props.dialogConfig) == null ? void 0 : _d.contentSource) === "component" ? (vue.openBlock(), vue.createElementBlock(vue.Fragment, { key: 2 }, [
398
400
  loadComponent(__props.dialogConfig.componentPath) ? (vue.openBlock(), vue.createBlock(vue.resolveDynamicComponent(loadComponent(__props.dialogConfig.componentPath)), {
399
401
  key: 0,
400
402
  "dialog-params": __props.dialogConfig.dialogParams,
@@ -410,5 +412,5 @@ const _sfc_main = {
410
412
  };
411
413
  }
412
414
  };
413
- const DialogRenderer = /* @__PURE__ */ _pluginVue_exportHelper.default(_sfc_main, [["__scopeId", "data-v-a05d18cf"]]);
415
+ const DialogRenderer = /* @__PURE__ */ _pluginVue_exportHelper.default(_sfc_main, [["__scopeId", "data-v-dd10a495"]]);
414
416
  exports.default = DialogRenderer;
package/lib/packages/vue/src/components/dialog/index.js CHANGED
@@ -45,12 +45,12 @@ function openDialog(displayField, dialogConfig, instance, componentCtx, fieldsLi
45
45
  }
46
46
  },
47
47
  onConfirm: (data) => {
48
- resolve(data);
49
48
  cleanupDialog();
49
+ resolve(data);
50
50
  },
51
51
  onCancel: () => {
52
- reject(new Error("用户取消"));
53
52
  cleanupDialog();
53
+ reject(new Error("用户取消"));
54
54
  }
55
55
  });
56
56
  vnode.appContext = instance.appContext;
package/lib/packages/vue/src/components/forms/form/Form.vue.js CHANGED
@@ -504,9 +504,23 @@ const _sfc_main = /* @__PURE__ */ Object.assign({
504
504
  result[fieldName] = value.join("|");
505
505
  }
506
506
  } else if (fieldName && fieldType === "date" && value) {
507
+ const dateValueType = field.dateValueType;
507
508
  const valueFormat = valueFormatMap[field.dateType] || "YYYYMMDD";
508
509
  const formValueFormat = formValueFormatMap[field.dateType] || "YYYY-MM-DD";
509
- result[fieldName] = moment.default(value, formValueFormat).format(valueFormat);
510
+ switch (dateValueType) {
511
+ case "date":
512
+ result[fieldName] = moment.default(value, formValueFormat).toDate();
513
+ break;
514
+ case "timestamp":
515
+ result[fieldName] = moment.default(value, formValueFormat).valueOf();
516
+ break;
517
+ case "string":
518
+ default:
519
+ result[fieldName] = moment.default(value, formValueFormat).format(
520
+ valueFormat
521
+ );
522
+ break;
523
+ }
510
524
  }
511
525
  };
512
526
  if (fieldsData.value) {
@@ -668,5 +682,5 @@ const _sfc_main = /* @__PURE__ */ Object.assign({
668
682
  };
669
683
  }
670
684
  });
671
- const _Form = /* @__PURE__ */ _pluginVue_exportHelper.default(_sfc_main, [["__scopeId", "data-v-263c93f9"]]);
685
+ const _Form = /* @__PURE__ */ _pluginVue_exportHelper.default(_sfc_main, [["__scopeId", "data-v-42af7e52"]]);
672
686
  exports.default = _Form;
package/lib/packages/vue/src/components/table/TableColumn.vue.js CHANGED
@@ -257,7 +257,7 @@ const _sfc_main = {
257
257
  };
258
258
  const optColumnWidth = vue.computed(() => {
259
259
  const padding = 20;
260
- const btnWidth = 40;
260
+ const btnWidth = 60;
261
261
  if (!props.tableData || props.tableData.length === 0) {
262
262
  return props.optBtns.length * btnWidth + padding;
263
263
  }
@@ -379,5 +379,5 @@ const _sfc_main = {
379
379
  };
380
380
  }
381
381
  };
382
- const TableColumn = /* @__PURE__ */ _pluginVue_exportHelper.default(_sfc_main, [["__scopeId", "data-v-df099102"]]);
382
+ const TableColumn = /* @__PURE__ */ _pluginVue_exportHelper.default(_sfc_main, [["__scopeId", "data-v-82ffe38c"]]);
383
383
  exports.default = TableColumn;
package/lib/packages/vue/src/utils/eventFlow/actionHandlers.js CHANGED
@@ -461,22 +461,29 @@ async function handleDialog(node, data, fields, context) {
461
461
  console.error("ui-dialog: 未找到匹配的弹层配置，" + (basic == null ? void 0 : basic.dialogId));
462
462
  return;
463
463
  }
464
- index$1.openDialog(
465
- basic.displayFieldName,
466
- dialog,
467
- context.instance,
468
- context.ctx,
469
- fields,
470
- data
471
- ).then((result) => {
472
- console.log("确定", result);
473
- }).catch(() => {
474
- console.log("取消");
475
- });
476
- return {
477
- success: true,
478
- message: `弹层 ${dialog.name} 已打开`
479
- };
464
+ try {
465
+ await index$1.openDialog(
466
+ basic.displayFieldName,
467
+ dialog,
468
+ context.instance,
469
+ context.ctx,
470
+ fields,
471
+ data
472
+ );
473
+ return {
474
+ success: true,
475
+ message: "用户已确认",
476
+ shouldShowError: false
477
+ };
478
+ } catch (error) {
479
+ return {
480
+ success: false,
481
+ message: "用户已取消",
482
+ confirmed: false,
483
+ shouldShowError: false
484
+ // 用户取消不提示错误
485
+ };
486
+ }
480
487
  }
481
488
  const defaultActionHandlers = {
482
489
  "page-jump": handlePageJump,
package/package.json CHANGED
@@ -1,6 +1,6 @@
1
1
  {
2
2
  "name": "@fecp/designer",
3
- "version": "5.2.1",
3
+ "version": "5.2.3",
4
4
  "main": "lib/packages/designer/index.js",
5
5
  "module": "es/packages/designer/index.mjs",
6
6
  "files": [