@kp-ui/lowcode 1.0.41 → 1.0.43

package/src/components/form-designer/widget-panel/advancedFieldsEnums.js

@@ -4,12 +4,10 @@ import { codeEditor } from "./advanced/code-editor.js";
 import { richEditor } from "./advanced/rich-editor.js";
 import { fileUpload } from "./advanced/file-upload.js";
 import { bpmnEditor } from "./advanced/bpmn-editor.js";
-import { toolbar } from "./advanced/toolbar.js";
 import { diyCompontent } from "./advanced/diy-compontent.js";
 const advancedFieldsEnums = {
   //   slot,
   diyCompontent,
-  toolbar,
   cascader,
   treeSelect,
   richEditor,

package/src/components/form-designer/widget-panel/{advanced/toolbar.js → basicFields/buttonList.js}

@@ -1,20 +1,21 @@
 import { getUuidKey } from "@kp-ui/tool";
-const toolbar = (ops = {}) => {
+const buttonList = (ops = {}) => {
   return {
     key: getUuidKey(),
     id: ops.name,
-    type: "toolbar",
+    type: "button-list",
     icon: "text-field",
     formItemFlag: true,
     options: {
       name: "",
-      label: "",
+      flex: "flex-start",
       buttonList: [],
       customClass: [],
+      buttonPosition: 0,
       ...ops
     }
   };
 };
 export {
-  toolbar
+  buttonList
 };

package/src/components/form-designer/widget-panel/basicFieldsEnums.js

@@ -17,6 +17,7 @@ import { htmlText } from "./basicFields/htmlText.js";
 import { button } from "./basicFields/button.js";
 import { divider } from "./basicFields/divider.js";
 import { dropdown } from "./basicFields/dropdown.js";
+import { buttonList } from "./basicFields/buttonList.js";
 const basicFieldsEnums = {
   input,
   textarea,
@@ -35,6 +36,7 @@ const basicFieldsEnums = {
   staticText,
   htmlText,
   button,
+  buttonList,
   divider,
   dropdown
 };

package/src/components/form-render/SubmitButtonRender.vue.js

@@ -0,0 +1,108 @@
+import { defineComponent, ref, computed, resolveComponent, createBlock, openBlock, withCtx, createCommentVNode, createTextVNode, toDisplayString } from "vue";
+import { useI18n } from "../../utils/i18n.js";
+const _sfc_main = /* @__PURE__ */ defineComponent({
+  __name: "SubmitButtonRender",
+  props: {
+    options: { default: () => ({
+      deleteWrapperNode: () => {
+      },
+      cancelButtonLabel: "",
+      okButtonLabel: "",
+      cancelButtonHidden: false,
+      okButtonHidden: false
+    }) },
+    ctx: {}
+  },
+  emits: ["update:dialogVisible"],
+  setup(__props, { emit: __emit }) {
+    const props = __props;
+    const emit = __emit;
+    const isSubmitting = ref(false);
+    const isClosing = ref(false);
+    const { i18nt } = useI18n();
+    const cancelBtnLabel = computed(
+      () => props.options.cancelButtonLabel || i18nt("designer.hint.cancel")
+    );
+    const okBtnLabel = computed(
+      () => props.options.okButtonLabel || i18nt("designer.hint.confirm")
+    );
+    const executeCustomFunction = async (ctx, functionBody) => {
+      if (!functionBody) return true;
+      try {
+        const customFn = new Function(functionBody);
+        return await customFn.call(ctx);
+      } catch (error) {
+        console.error("执行自定义函数失败:", error);
+        return false;
+      }
+    };
+    const closeDialog = () => {
+      emit("update:dialogVisible", false);
+      setTimeout(props.options.deleteWrapperNode, 150);
+    };
+    const handleCancelClick = async () => {
+      var _a, _b;
+      if (isClosing.value) return;
+      try {
+        isClosing.value = true;
+        if (!((_b = (_a = props.options).handleBeforeClose) == null ? void 0 : _b.call(_a))) return;
+        const result = await executeCustomFunction(
+          props.ctx,
+          props.options.onCancelButtonClick
+        );
+        if (result === false) return;
+        closeDialog();
+      } catch (error) {
+        console.error("取消操作失败:", error);
+      } finally {
+        isClosing.value = false;
+      }
+    };
+    const handleOkClick = async () => {
+      if (isSubmitting.value) return;
+      try {
+        isSubmitting.value = true;
+        const result = await executeCustomFunction(props.ctx, props.options.onOkButtonClick);
+        if (result === false) return;
+        closeDialog();
+      } catch (error) {
+        console.error("提交操作失败:", error);
+      } finally {
+        isSubmitting.value = false;
+      }
+    };
+    return (_ctx, _cache) => {
+      const _component_a_button = resolveComponent("a-button");
+      const _component_a_space = resolveComponent("a-space");
+      return openBlock(), createBlock(_component_a_space, { x: 8 }, {
+        default: withCtx(() => [
+          !_ctx.options.cancelButtonHidden ? (openBlock(), createBlock(_component_a_button, {
+            key: 0,
+            loading: isClosing.value,
+            onClick: handleCancelClick
+          }, {
+            default: withCtx(() => [
+              createTextVNode(toDisplayString(cancelBtnLabel.value), 1)
+            ]),
+            _: 1
+          }, 8, ["loading"])) : createCommentVNode("", true),
+          !_ctx.options.okButtonHidden ? (openBlock(), createBlock(_component_a_button, {
+            key: 1,
+            type: "primary",
+            loading: isSubmitting.value,
+            onClick: handleOkClick
+          }, {
+            default: withCtx(() => [
+              createTextVNode(toDisplayString(okBtnLabel.value), 1)
+            ]),
+            _: 1
+          }, 8, ["loading"])) : createCommentVNode("", true)
+        ]),
+        _: 1
+      });
+    };
+  }
+});
+export {
+  _sfc_main as default
+};

package/src/components/form-render/SubmitButtonRender.vue2.js

@@ -0,0 +1,4 @@
+import _sfc_main from "./SubmitButtonRender.vue.js";
+export {
+  _sfc_main as default
+};

package/src/components/form-render/container-item/data-table-item.vue.js

@@ -15,7 +15,6 @@ const _sfc_main = {
   // 必须固定为ContainerItem，用于接收父级组件的broadcast事件
   mixins: [emitter, i18n, refMixin, containerItemMixin, useDataTableMixin],
   components: {
-    STable,
     ContainerItemWrapper,
     ...comps
   },
@@ -152,7 +151,7 @@ function _sfc_render(_ctx, _cache, $props, $setup, $data, $options) {
     [vShow, !_ctx.handleHidden()]
   ]);
 }
-const dataTableItem = /* @__PURE__ */ _export_sfc(_sfc_main, [["render", _sfc_render], ["__scopeId", "data-v-533ea57f"]]);
+const dataTableItem = /* @__PURE__ */ _export_sfc(_sfc_main, [["render", _sfc_render], ["__scopeId", "data-v-6eb89abf"]]);
 export {
   dataTableItem as default
 };

package/src/components/form-render/dynamic-dialog.vue.js

@@ -1,4 +1,4 @@
-import { defineAsyncComponent, resolveComponent, createBlock, openBlock, withCtx, createVNode, mergeProps, createElementVNode, createCommentVNode, createTextVNode, toDisplayString } from "vue";
+import { defineAsyncComponent, resolveComponent, resolveDirective, createBlock, openBlock, withCtx, createVNode, mergeProps, withDirectives, createElementBlock, createElementVNode, createCommentVNode, createTextVNode, toDisplayString } from "vue";
 import i18n from "../../utils/i18n.js";
 import zhCN from "ant-design-vue/es/locale/zh_CN";
 /* empty css                    */
@@ -50,6 +50,10 @@ const _sfc_main = {
   },
   data() {
     return {
+      isSubmitting: false,
+      // 添加提交状态标记
+      isClosing: false,
+      // 添加关闭状态标记
       isLoading: true,
       dialogVisible: false,
       elLocaleMap: {
@@ -62,11 +66,15 @@ const _sfc_main = {
   },
   computed: {
     elLocale() {
-      const curLocale = localStorage.getItem("v_form_locale") || "zh-CN";
+      const curLocale = localStorage.getItem("lowcode_local") || "zh-CN";
       return this.elLocaleMap[curLocale];
     },
     parentForm() {
-      return { ...this.parentFormRef, parentDom: this, getParentFormRef: this.getParentFormRef };
+      return {
+        ...this.parentFormRef,
+        parentDom: this,
+        getParentFormRef: this.getParentFormRef
+      };
     },
     otherAttrs() {
       if (this.options.cancelButtonHidden && this.options.okButtonHidden) {
@@ -89,24 +97,44 @@ const _sfc_main = {
   methods: {
     async loadFormCode() {
       if (this.options.formCode) {
-        const res = await this.$http.get(`/api/tmgc2-query/dataQuery/detail/FormDefinitionManagement`, {
-          params: { code: this.options.formCode }
-        }).then((res2) => res2.data.object.frontendDefinition || "{}");
-        this.$refs.dFormRef.setFormJson(JSON.parse(res));
+        this.isLoading = true;
+        try {
+          const res = await this.$http.get(`/api/tmgc2-query/dataQuery/detail/FormDefinitionManagement`, {
+            params: { code: this.options.formCode }
+          }).then((res2) => res2.data.object.frontendDefinition || "{}");
+          const formJson = JSON.parse(res);
+          console.log("formJson: ", formJson);
+          this.$refs.dFormRef.setFormJson(formJson);
+        } catch (error) {
+        }
+        this.isLoading = false;
       }
     },
+    setLoading(status) {
+      this.isLoading = status;
+    },
+    setFormJson(formJson) {
+      this.$refs.dFormRef.setFormJson(formJson);
+    },
     setTitle(title) {
       this.options.title = title;
     },
+    beforeOpen() {
+      this.isLoading = true;
+      this.dialogVisible = true;
+    },
     show() {
       this.dialogVisible = true;
       this.$nextTick(() => {
+        var _a;
         if (!!this.options.readMode) {
           this.$refs["dFormRef"].setReadMode(true);
         }
         this.loadFormCode();
-        this.$refs["dFormRef"].setDialogOrDrawerRef(this);
-        this.parentFormRef.setChildFormRef(this.$refs["dFormRef"]);
+        (_a = this.$refs["dFormRef"]) == null ? void 0 : _a.setDialogOrDrawerRef(this);
+        if (this.parentFormRef) {
+          this.parentFormRef.setChildFormRef(this.$refs["dFormRef"]);
+        }
         this.handleOpenedEvent();
       });
     },
@@ -122,7 +150,9 @@ const _sfc_main = {
       setTimeout(this.deleteWrapperNode, 150);
     },
     deleteWrapperNode() {
-      const wrapperNode = document.getElementById("vf-dynamic-dialog-wrapper" + this.wrapperId);
+      const wrapperNode = document.getElementById(
+        "vf-dynamic-dialog-wrapper" + this.wrapperId
+      );
       if (!!wrapperNode) {
         document.body.removeChild(wrapperNode);
       }
@@ -146,19 +176,29 @@ const _sfc_main = {
       }
     },
     handleCancelClick() {
+      if (this.isClosing) return;
       if (!this.handleBeforeClose()) return;
-      if (!!this.options.onCancelButtonClick) {
-        const customFn = new Function(this.options.onCancelButtonClick);
-        const clickResult = customFn.call(this);
-        if (clickResult === false) {
-          return;
+      try {
+        this.isClosing = true;
+        if (!!this.options.onCancelButtonClick) {
+          const customFn = new Function(this.options.onCancelButtonClick);
+          const clickResult = customFn.call(this);
+          if (clickResult === false) {
+            return;
+          }
         }
+        this.dialogVisible = false;
+        setTimeout(this.deleteWrapperNode, 150);
+      } catch (error) {
+        console.log("error: ", error);
+      } finally {
+        this.isClosing = false;
       }
-      this.dialogVisible = false;
-      setTimeout(this.deleteWrapperNode, 150);
     },
     async handleOkClick() {
+      if (this.isSubmitting) return;
       try {
+        this.isSubmitting = true;
         if (!!this.options.onOkButtonClick) {
           const customFn = new Function(this.options.onOkButtonClick);
           const clickResult = await customFn.call(this);
@@ -170,6 +210,8 @@ const _sfc_main = {
         setTimeout(this.deleteWrapperNode, 150);
       } catch (error) {
         console.log("error: ", error);
+      } finally {
+        this.isClosing = false;
       }
     },
     getParentFormRef() {
@@ -182,18 +224,26 @@ const _sfc_main = {
     getWidgetRef(widgetName, showError = false) {
       return this.$refs["dFormRef"].getWidgetRef(widgetName, showError);
     },
+    updateTable() {
+      var _a, _b, _c;
+      if ((_c = (_b = (_a = this.vfCtx) == null ? void 0 : _a.parent) == null ? void 0 : _b.exposed) == null ? void 0 : _c.updateTable) {
+        this.vfCtx.parent.exposed.updateTable();
+      }
+    },
     getExtraData() {
       return this.extraData;
     }
   }
 };
-const _hoisted_1 = /* @__PURE__ */ createElementVNode("div", { class: "footer-left" }, null, -1);
-const _hoisted_2 = { class: "footer-right" };
+const _hoisted_1 = { class: "dialog-content" };
+const _hoisted_2 = /* @__PURE__ */ createElementVNode("div", { class: "footer-left" }, null, -1);
+const _hoisted_3 = { class: "footer-right" };
 function _sfc_render(_ctx, _cache, $props, $setup, $data, $options) {
   const _component_VFormRender = resolveComponent("VFormRender");
   const _component_a_button = resolveComponent("a-button");
   const _component_a_modal = resolveComponent("a-modal");
   const _component_a_config_provider = resolveComponent("a-config-provider");
+  const _directive_loading = resolveDirective("loading");
   return openBlock(), createBlock(_component_a_config_provider, {
     locale: $options.elLocale,
     input: { autocomplete: "off" }
@@ -220,8 +270,8 @@ function _sfc_render(_ctx, _cache, $props, $setup, $data, $options) {
         onCancel: $options.handleCloseEvent
       }, $options.otherAttrs), {
         footer: withCtx(() => [
-          _hoisted_1,
-          createElementVNode("div", _hoisted_2, [
+          _hoisted_2,
+          createElementVNode("div", _hoisted_3, [
             !$props.options.cancelButtonHidden ? (openBlock(), createBlock(_component_a_button, {
               key: 0,
               onClick: $options.handleCancelClick
@@ -244,18 +294,22 @@ function _sfc_render(_ctx, _cache, $props, $setup, $data, $options) {
           ])
         ]),
         default: withCtx(() => [
-          createVNode(_component_VFormRender, {
-            isLoading: $data.isLoading,
-            ref: "dFormRef",
-            "form-json": $props.formJson,
-            "form-data": $props.formData,
-            vfCtx: $props.vfCtx,
-            "option-data": $props.optionData,
-            "global-dsv": $props.globalDsv,
-            "parent-form": $options.parentForm,
-            "disabled-mode": $props.options.disabledMode,
-            "dynamic-creation": true
-          }, null, 8, ["isLoading", "form-json", "form-data", "vfCtx", "option-data", "global-dsv", "parent-form", "disabled-mode"])
+          withDirectives((openBlock(), createElementBlock("div", _hoisted_1, [
+            createVNode(_component_VFormRender, {
+              isLoading: $data.isLoading,
+              ref: "dFormRef",
+              "form-json": $props.formJson,
+              "form-data": $props.formData,
+              vfCtx: $props.vfCtx,
+              "option-data": $props.optionData,
+              "global-dsv": $props.globalDsv,
+              "parent-form": $options.parentForm,
+              "disabled-mode": $props.options.disabledMode,
+              "dynamic-creation": true
+            }, null, 8, ["isLoading", "form-json", "form-data", "vfCtx", "option-data", "global-dsv", "parent-form", "disabled-mode"])
+          ])), [
+            [_directive_loading, $data.isLoading]
+          ])
         ]),
         _: 1
       }, 16, ["transitionName", "maskTransitionName", "title", "bodyStyle", "visible", "width", "mask", "maskClosable", "keyboard", "onCancel"])

package/src/components/public/methoad-item.vue.js

@@ -0,0 +1,132 @@
+import { defineComponent, ref, resolveComponent, createElementBlock, openBlock, Fragment, createVNode, withCtx, createTextVNode, normalizeClass, toDisplayString, unref, createElementVNode } from "vue";
+import { useI18n } from "../../utils/i18n.js";
+import CodeEditor from "../code-editor/index.vue.js";
+import { message } from "ant-design-vue";
+const _hoisted_1 = { class: "dialog-footer" };
+const _sfc_main = /* @__PURE__ */ defineComponent({
+  __name: "methoad-item",
+  props: {
+    value: {},
+    eventName: {},
+    eventParamsMap: {},
+    formConfig: {},
+    getFormEventHandled: {}
+  },
+  emits: ["update:value"],
+  setup(__props, { emit: __emit }) {
+    const { i18nt } = useI18n();
+    const props = __props;
+    const emit = __emit;
+    const ecEditor = ref();
+    const formEventHandlerCode = ref("");
+    const showFormEventDialogFlag = ref(false);
+    const editFormEventHandler = (eventName) => {
+      formEventHandlerCode.value = props.formConfig[eventName];
+      showFormEventDialogFlag.value = true;
+    };
+    const saveFormEventHandler = () => {
+      const codeHints = ecEditor.value.getEditorAnnotations();
+      let syntaxErrorFlag = false;
+      if (!!codeHints && codeHints.length > 0) {
+        codeHints.forEach((chItem) => {
+          if (chItem.type === "error") {
+            syntaxErrorFlag = true;
+          }
+        });
+        if (syntaxErrorFlag) {
+          message.error(i18nt("designer.setting.syntaxCheckWarning"));
+          return;
+        }
+      }
+      emit("update:value", formEventHandlerCode.value);
+      showFormEventDialogFlag.value = false;
+    };
+    return (_ctx, _cache) => {
+      const _component_a_button = resolveComponent("a-button");
+      const _component_a_form_item = resolveComponent("a-form-item");
+      const _component_a_alert = resolveComponent("a-alert");
+      const _component_a_modal = resolveComponent("a-modal");
+      return openBlock(), createElementBlock(Fragment, null, [
+        createVNode(_component_a_form_item, {
+          label: _ctx.eventName,
+          "label-width": "150px"
+        }, {
+          default: withCtx(() => [
+            createVNode(_component_a_button, {
+              type: "info",
+              plain: "",
+              shape: "round",
+              class: normalizeClass([_ctx.getFormEventHandled(_ctx.eventName) ? "button-text-highlight" : ""]),
+              onClick: _cache[0] || (_cache[0] = ($event) => editFormEventHandler(_ctx.eventName))
+            }, {
+              default: withCtx(() => [
+                createTextVNode(toDisplayString(unref(i18nt)("designer.setting.addEventHandler")), 1)
+              ]),
+              _: 1
+            }, 8, ["class"]),
+            createTextVNode(" " + toDisplayString(_ctx.moduleValue), 1)
+          ]),
+          _: 1
+        }, 8, ["label"]),
+        createVNode(_component_a_modal, {
+          title: unref(i18nt)("designer.setting.editFormEventHandler"),
+          visible: showFormEventDialogFlag.value,
+          "onUpdate:visible": _cache[3] || (_cache[3] = ($event) => showFormEventDialogFlag.value = $event),
+          "show-close": true,
+          "custom-class": "drag-dialog small-padding-dialog",
+          "append-to-body": "",
+          "close-on-click-modal": false,
+          "close-on-press-escape": false,
+          "destroy-on-close": true,
+          width: 800
+        }, {
+          footer: withCtx(() => [
+            createElementVNode("div", _hoisted_1, [
+              createVNode(_component_a_button, {
+                onClick: _cache[2] || (_cache[2] = ($event) => showFormEventDialogFlag.value = false)
+              }, {
+                default: withCtx(() => [
+                  createTextVNode(toDisplayString(unref(i18nt)("designer.hint.cancel")), 1)
+                ]),
+                _: 1
+              }),
+              createVNode(_component_a_button, {
+                type: "primary",
+                onClick: saveFormEventHandler
+              }, {
+                default: withCtx(() => [
+                  createTextVNode(toDisplayString(unref(i18nt)("designer.hint.confirm")), 1)
+                ]),
+                _: 1
+              })
+            ])
+          ]),
+          default: withCtx(() => [
+            createVNode(_component_a_alert, {
+              type: "info",
+              closable: false,
+              message: "form." + _ctx.eventParamsMap[_ctx.eventName]
+            }, null, 8, ["message"]),
+            createVNode(CodeEditor, {
+              mode: "javascript",
+              readonly: false,
+              modelValue: formEventHandlerCode.value,
+              "onUpdate:modelValue": _cache[1] || (_cache[1] = ($event) => formEventHandlerCode.value = $event),
+              ref_key: "ecEditor",
+              ref: ecEditor
+            }, null, 8, ["modelValue"]),
+            createVNode(_component_a_alert, {
+              type: "info",
+              closable: false,
+              message: "}"
+            })
+          ]),
+          _: 1
+        }, 8, ["title", "visible"])
+      ], 64);
+    };
+  }
+});
+export {
+  _sfc_main as default
+};

package/src/components/public/methoad-item.vue2.js

@@ -0,0 +1,4 @@
+import _sfc_main from "./methoad-item.vue.js";
+export {
+  _sfc_main as default
+};

package/src/constants/index.js

@@ -0,0 +1,13 @@
+const BUTTON_POSITION = [
+  {
+    label: "当前位置",
+    value: 0
+  },
+  {
+    label: "自定义位置",
+    value: 1
+  }
+];
+export {
+  BUTTON_POSITION
+};

package/src/lang/en-US.js

@@ -177,6 +177,7 @@ const enLocale = {
       endPlaceholder: "End Placeholder",
       widgetColumnWidth: "Width",
       widgetSize: "Size",
+      widgetFlex: "Flex",
       autoFullWidth: "Auto Full Width",
       displayStyle: "Display Style",
       inlineLayout: "inline",

package/src/lang/zh-CN.js

@@ -61,6 +61,7 @@ const zhLocale = {
       treeSelect: "树形选择",
       "diy-compontent": "自定义组件",
       toolbar: "工具栏",
+      "button-list": "按钮组",
       slot: "插槽",
       custom: "Custom Component"
     },
@@ -179,6 +180,7 @@ const zhLocale = {
       endPlaceholder: "截止占位内容",
       widgetColumnWidth: "组件列宽",
       widgetSize: "组件大小",
+      widgetFlex: "对齐方式",
       autoFullWidth: "自动拉伸宽度",
       displayStyle: "显示样式",
       inlineLayout: "行内",
@@ -233,6 +235,7 @@ const zhLocale = {
       fileTypes: "上传文件类型",
       fileTypesHelp: "支持添加其他文件类型",
       headers: "上传请求头",
+      danger: "危险按钮",
       cellWidth: "宽度",
       cellHeight: "高度",
       gridColHeight: "栅格列统一高度(px)",
@@ -305,6 +308,7 @@ const zhLocale = {
       leftPosition: "左边",
       labelAlign: "字段标签对齐",
       buttonList: "按钮组",
+      buttonPosition: "按钮组位置",
       leftAlign: "居左",
       centerAlign: "居中",
       rightAlign: "居右",

package/src/utils/i18n.js

@@ -32,12 +32,12 @@ const langResources = {
   }
 };
 const i18n = createI18n({
-  locale: localStorage.getItem("v_form_locale") || "zh-CN",
+  locale: localStorage.getItem("lowcode_local") || "zh-CN",
   messages: langResources
 });
 const changeLocale = function(langName) {
   i18n.setLang(langName);
-  localStorage.setItem("v_form_locale", langName);
+  localStorage.setItem("lowcode_local", langName);
 };
 const i18n$1 = {
   methods: {

package/src/utils/smart-vue-i18n/index.js

@@ -1,7 +1,7 @@
 import { reactive } from "vue";
 import { get } from "./utils.js";
 const locale = reactive({
-  lang: localStorage.getItem("v_form_locale") || "zh-CN"
+  lang: localStorage.getItem("lowcode_local") || "zh-CN"
 });
 function createI18n(options) {
   return {

package/src/utils/util.js

@@ -305,6 +305,10 @@ function getDefaultFormConfig() {
     labelAlign: "right",
     cssCode: "",
     customClass: [],
+    okButtonLabel: "",
+    okButtonHidden: "",
+    cancelButtonHidden: "",
+    cancelButtonLabel: "",
     functions: "",
     //全局函数
     layoutType: "PC",
@@ -321,6 +325,8 @@ function getDefaultFormConfig() {
     })
     `,
     onFormDataChange: "",
+    onOkButtonClick: "",
+    onCancelButtonClick: "",
     serveList: {
       vformUpdate: {
         http: {