@kp-ui/lowcode 1.0.42 → 1.0.43

package/_virtual/virtual_svg-icons-register.js

@@ -1,13 +1,13 @@
 if (typeof window !== "undefined") {
   let loadSvg = function() {
     var body = document.body;
-    var svgDom = document.getElementById("__svg__icons__dom__1747383489070__");
+    var svgDom = document.getElementById("__svg__icons__dom__1747706782590__");
     if (!svgDom) {
       svgDom = document.createElementNS("http://www.w3.org/2000/svg", "svg");
       svgDom.style.position = "absolute";
       svgDom.style.width = "0";
       svgDom.style.height = "0";
-      svgDom.id = "__svg__icons__dom__1747383489070__";
+      svgDom.id = "__svg__icons__dom__1747706782590__";
       svgDom.setAttribute("xmlns", "http://www.w3.org/2000/svg");
       svgDom.setAttribute("xmlns:link", "http://www.w3.org/1999/xlink");
     }

package/designer.js

@@ -4,10 +4,9 @@ import SettingPanel from "./src/components/form-designer/setting-panel/index.vue
 import VFormWidget from "./src/components/form-designer/form-widget/index.vue.js";
 import { createDesigner } from "./src/components/form-designer/designer.js";
 import { traverseAllWidgets, getAllContainerWidgets, getAllFieldWidgets, deepClone, addWindowResizeHandler } from "./src/utils/util.js";
-import { VARIANT_FORM_VERSION } from "./src/utils/config.js";
 import i18n, { changeLocale } from "./src/utils/i18n.js";
 import { isEmpty } from "lodash-es";
-import { resolveComponent, createBlock, openBlock, withCtx, createCommentVNode, createVNode, createSlots, renderList, renderSlot, createElementVNode } from "vue";
+import { resolveComponent, createBlock, openBlock, withCtx, createVNode, createSlots, renderList, renderSlot, createElementVNode } from "vue";
 /* empty css                                       */
 import _export_sfc from "./_virtual/_plugin-vue_export-helper.js";
 const _sfc_main = {
@@ -81,7 +80,6 @@ const _sfc_main = {
     return {
       leftWidth: 270,
       rightWidth: 300,
-      vFormVersion: VARIANT_FORM_VERSION,
       curLangName: "",
       curLocale: "",
       isLoading: false,
@@ -192,8 +190,11 @@ const _sfc_main = {
         return;
       }
     },
+    changeLanguage(langName) {
+      changeLocale(langName);
+    },
     initLocale() {
-      this.curLocale = localStorage.getItem("v_form_locale");
+      this.curLocale = localStorage.getItem("lowcode_local");
       if (!!this.vsCodeFlag) {
         this.curLocale = this.curLocale || "en-US";
       } else {
@@ -209,13 +210,6 @@ const _sfc_main = {
       this.fieldList = await this.fieldListApi();
       console.log("this.fieldList: ", this.fieldList);
     },
-    handleLanguageChanged(command) {
-      this.changeLanguage(command);
-      this.curLangName = this.i18nt("application." + command);
-    },
-    changeLanguage(langName) {
-      changeLocale(langName);
-    },
     setFormJson(formJson) {
       console.log("formJson: ", formJson);
       let modifiedFlag = false;
@@ -346,21 +340,18 @@ const _sfc_main = {
     //TODO: 增加更多方法！！
   }
 };
-const _hoisted_4 = { class: "container-scroll-bar" };
+const _hoisted_1 = { class: "container-scroll-bar" };
 function _sfc_render(_ctx, _cache, $props, $setup, $data, $options) {
-  resolveComponent("a-select-option");
-  resolveComponent("a-select");
-  const _component_a_layout_header = resolveComponent("a-layout-header");
-  const _component_widget_panel = resolveComponent("widget-panel");
+  const _component_WidgetPanel = resolveComponent("WidgetPanel");
   const _component_a_layout_sider = resolveComponent("a-layout-sider");
   const _component_toolbar_panel = resolveComponent("toolbar-panel");
-  const _component_v_form_widget = resolveComponent("v-form-widget");
+  const _component_a_layout_header = resolveComponent("a-layout-header");
+  const _component_VFormWidget = resolveComponent("VFormWidget");
   const _component_a_layout_content = resolveComponent("a-layout-content");
   const _component_setting_panel = resolveComponent("setting-panel");
   const _component_a_layout = resolveComponent("a-layout");
   return openBlock(), createBlock(_component_a_layout, { class: "main-container full-height" }, {
     default: withCtx(() => [
-      createCommentVNode("", true),
       createVNode(_component_a_layout, null, {
         default: withCtx(() => [
           createVNode(_component_a_layout_sider, {
@@ -368,7 +359,7 @@ function _sfc_render(_ctx, _cache, $props, $setup, $data, $options) {
             class: "side-panel"
           }, {
             default: withCtx(() => [
-              createVNode(_component_widget_panel, { designer: $data.designer }, null, 8, ["designer"])
+              createVNode(_component_WidgetPanel, { designer: $data.designer }, null, 8, ["designer"])
             ]),
             _: 1
           }, 8, ["width"]),
@@ -400,8 +391,8 @@ function _sfc_render(_ctx, _cache, $props, $setup, $data, $options) {
               }),
               createVNode(_component_a_layout_content, { class: "form-widget-main" }, {
                 default: withCtx(() => [
-                  createElementVNode("div", _hoisted_4, [
-                    createVNode(_component_v_form_widget, {
+                  createElementVNode("div", _hoisted_1, [
+                    createVNode(_component_VFormWidget, {
                       designer: $data.designer,
                       "form-config": $data.designer.formConfig,
                       "global-dsv": $props.globalDsv,
@@ -433,7 +424,7 @@ function _sfc_render(_ctx, _cache, $props, $setup, $data, $options) {
     _: 3
   });
 }
-const index = /* @__PURE__ */ _export_sfc(_sfc_main, [["render", _sfc_render], ["__scopeId", "data-v-e87dd64c"]]);
+const index = /* @__PURE__ */ _export_sfc(_sfc_main, [["render", _sfc_render], ["__scopeId", "data-v-03be64be"]]);
 export {
   index as default
 };

package/index.js

@@ -16,7 +16,9 @@ import { default as default10 } from "./src/components/form-render/container-ite
 import { default as default11 } from "./src/components/form-designer/form-widget/field-widget/static-content-wrapper.vue.js";
 import { default as default12 } from "./src/components/form-designer/form-widget/field-widget/form-item-wrapper.vue.js";
 import { default as default13 } from "./src/components/form-designer/form-widget/field-widget/fieldMixin.js";
-import { default as default14 } from "./src/utils/emitter.js";
+import { default as default14 } from "./src/components/form-render/dynamic-dialog.vue.js";
+import { default as default15 } from "./src/components/form-render/SubmitButtonRender.vue.js";
+import { default as default16 } from "./src/utils/emitter.js";
 const registerLowcodeCore = (params) => {
   const { app, http, factoryRender } = params;
   app.config.globalProperties.$http = http;
@@ -33,9 +35,11 @@ const registerLowcodeCore = (params) => {
 export {
   default9 as ContainerItemWrapper,
   default5 as ContainerWrapper,
+  default14 as DynamicDialog,
   default6 as FieldComponents,
   default12 as FormItemWrapper,
   default11 as StaticContentWrapper,
+  default15 as SubmitButtonRender,
   default2 as VFormDesigner,
   default3 as VFormRender,
   addAdvancedFieldSchema,
@@ -45,7 +49,7 @@ export {
   basicFieldsEnums,
   default10 as containerItemMixin,
   default4 as containerMixin,
-  default14 as emitter,
+  default16 as emitter,
   default13 as fieldMixin,
   default8 as refMixin,
   default7 as refMixinDesign,

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@kp-ui/lowcode",
-  "version": "1.0.42",
+  "version": "1.0.43",
   "publishConfig": {
     "access": "public"
   },

package/render.js

@@ -92,6 +92,10 @@ const _sfc_main = {
   },
   data() {
     return {
+      isClosing: false,
+      //是否正在关闭
+      isSubmitting: false,
+      //是否正在提交中
       formJsonObj: this.formJson,
       formDataModel: {
         //
@@ -118,6 +122,12 @@ const _sfc_main = {
     formConfig() {
       return this.formJsonObj.formConfig;
     },
+    cancelBtnLabel() {
+      return this.formConfig.cancelButtonLabel || this.i18nt("designer.hint.cancel");
+    },
+    okBtnLabel() {
+      return this.formConfig.okButtonLabel || this.i18nt("designer.hint.confirm");
+    },
     widgetList() {
       return this.formJsonObj.widgetList;
     },
@@ -159,8 +169,44 @@ const _sfc_main = {
     setLoading(flag) {
       this.isLoading = flag;
     },
-    setGlobalMethod() {
-      console.log(this);
+    handleCancelClick() {
+      if (this.isClosing) return;
+      if (!this.handleBeforeClose()) return;
+      try {
+        this.isClosing = true;
+        if (!!this.formConfig.onCancelButtonClick) {
+          const customFn = new Function(this.formConfig.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;
+      }
+    },
+    async handleOkClick() {
+      if (this.isSubmitting) return;
+      try {
+        this.isSubmitting = true;
+        if (!!this.formConfig.onOkButtonClick) {
+          const customFn = new Function(this.formConfig.onOkButtonClick);
+          const clickResult = await customFn.call(this);
+          if (clickResult === false) {
+            return;
+          }
+        }
+        this.dialogVisible = false;
+        setTimeout(this.deleteWrapperNode, 150);
+      } catch (error) {
+        console.log("error: ", error);
+      } finally {
+        this.isClosing = false;
+      }
     },
     async onFormDetail() {
       var _a;
@@ -195,7 +241,7 @@ const _sfc_main = {
       this.addFieldValidateEventHandler();
       this.registerFormToRefList();
       this.handleOnCreated();
-      if (!!this.disabledMode) {
+      if (this.disabledMode) {
         this.$nextTick(() => {
           this.disableForm();
         });
@@ -211,7 +257,7 @@ const _sfc_main = {
       return widget.type + "-widget";
     },
     initLocale() {
-      const curLocale = localStorage.getItem("v_form_locale") || "zh-CN";
+      const curLocale = localStorage.getItem("lowcode_local") || "zh-CN";
       this.changeLanguage(curLocale);
     },
     insertCustomStyleAndScriptNode() {
@@ -388,6 +434,12 @@ const _sfc_main = {
         customFunc.call(this);
       }
     },
+    handleOnSubmit() {
+      if (!!this.formConfig && !!this.formConfig.handleOnSubmit) {
+        const customFunc = new Function(this.formConfig.handleOnSubmit);
+        customFunc.call(this);
+      }
+    },
     handleOnMounted() {
       if (!!this.formConfig && !!this.formConfig.onFormMounted) {
         const customFunc = new Function(this.formConfig.onFormMounted);
@@ -501,7 +553,7 @@ const _sfc_main = {
       changeLocale(langName);
     },
     getLanguageName() {
-      return localStorage.getItem("v_form_locale") || "zh-CN";
+      return localStorage.getItem("lowcode_local") || "zh-CN";
     },
     getNativeForm() {
       return this.$refs["renderForm"];
@@ -1004,7 +1056,7 @@ function _sfc_render(_ctx, _cache, $props, $setup, $data, $options) {
     _: 3
   }, 8, ["component-size"]);
 }
-const index = /* @__PURE__ */ _export_sfc(_sfc_main, [["render", _sfc_render], ["__scopeId", "data-v-368508d7"]]);
+const index = /* @__PURE__ */ _export_sfc(_sfc_main, [["render", _sfc_render], ["__scopeId", "data-v-dffc3fa7"]]);
 export {
   index as default
 };

package/src/components/form-designer/designer.js

@@ -1,6 +1,5 @@
 import { deepClone, getDefaultFormConfig, generateId, overwriteObj } from "../../utils/util.js";
 import { containers, basicFields, advancedFields, customFields } from "./widget-panel/widgetsConfig.js";
-import { VARIANT_FORM_VERSION } from "../../utils/config.js";
 import eventBus from "../../utils/event-bus.js";
 function createDesigner(vueInstance) {
   const defaultFormConfig = deepClone(getDefaultFormConfig());
@@ -25,11 +24,6 @@ function createDesigner(vueInstance) {
     initDesigner(resetFormJson) {
       this.widgetList = [];
       this.formConfig = deepClone(defaultFormConfig);
-      console.info(
-        `%cVer${VARIANT_FORM_VERSION} %chttps://www.yuque.com/visualdev/vform3`,
-        "color:#999;font-size: 12px",
-        "color:#333"
-      );
       if (!resetFormJson) {
         this.initHistoryData();
       }
@@ -369,7 +363,9 @@ function createDesigner(vueInstance) {
       }
       if (!!colArray[mergedColIdx].widgetList && colArray[mergedColIdx].widgetList.length > 0) {
         if (!colArray[remainedColIdx].widgetList || colArray[remainedColIdx].widgetList.length === 0) {
-          colArray[remainedColIdx].widgetList = deepClone(colArray[mergedColIdx].widgetList);
+          colArray[remainedColIdx].widgetList = deepClone(
+            colArray[mergedColIdx].widgetList
+          );
         }
       }
       const newColspan = colArray[mergedColIdx].options.colspan * 1 + colArray[remainedColIdx].options.colspan * 1;
@@ -513,7 +509,9 @@ function createDesigner(vueInstance) {
       }
       if (unmatchedFlag) {
         this.vueInstance.$message.info(
-          this.vueInstance.i18nt("designer.hint.colspanNotConsistentForDeleteEntireColumn")
+          this.vueInstance.i18nt(
+            "designer.hint.colspanNotConsistentForDeleteEntireColumn"
+          )
         );
         return;
       }
@@ -651,7 +649,9 @@ function createDesigner(vueInstance) {
     moveUpWidget(parentList, indexOfParentList) {
       if (!!parentList) {
         if (indexOfParentList === 0) {
-          this.vueInstance.$message(this.vueInstance.i18nt("designer.hint.moveUpFirstChildHint"));
+          this.vueInstance.$message(
+            this.vueInstance.i18nt("designer.hint.moveUpFirstChildHint")
+          );
           return;
         }
         const tempWidget = parentList[indexOfParentList];
@@ -662,7 +662,9 @@ function createDesigner(vueInstance) {
     moveDownWidget(parentList, indexOfParentList) {
       if (!!parentList) {
         if (indexOfParentList === parentList.length - 1) {
-          this.vueInstance.$message(this.vueInstance.i18nt("designer.hint.moveDownLastChildHint"));
+          this.vueInstance.$message(
+            this.vueInstance.i18nt("designer.hint.moveDownLastChildHint")
+          );
           return;
         }
         const tempWidget = parentList[indexOfParentList];
@@ -812,7 +814,10 @@ function createDesigner(vueInstance) {
       };
       this.saveFormContentToStorage();
       if (this.historyData.index < this.historyData.steps.length - 1) {
-        this.historyData.steps = this.historyData.steps.slice(0, this.historyData.index + 1);
+        this.historyData.steps = this.historyData.steps.slice(
+          0,
+          this.historyData.index + 1
+        );
       }
     },
     saveCurrentHistoryStep() {

package/src/components/form-designer/form-widget/field-widget/button-list-widget.vue.js

@@ -2,7 +2,8 @@ import StaticContentWrapper from "./static-content-wrapper.vue.js";
 import emitter from "../../../../utils/emitter.js";
 import i18n from "../../../../utils/i18n.js";
 import fieldMixin from "./fieldMixin.js";
-import { resolveComponent, createBlock, openBlock, withCtx, createElementVNode, normalizeStyle, normalizeClass, createVNode, createElementBlock, Fragment, renderList, createTextVNode, toDisplayString } from "vue";
+import SvgIcon from "../../../svg-icon/index.vue.js";
+import { resolveComponent, createBlock, openBlock, withCtx, createElementVNode, normalizeStyle, normalizeClass, createVNode, createElementBlock, Fragment, renderList, createCommentVNode, createTextVNode, toDisplayString } from "vue";
 /* empty css                        */
 import _export_sfc from "../../../../../_virtual/_plugin-vue_export-helper.js";
 const _sfc_main = {
@@ -40,6 +41,7 @@ const _sfc_main = {
     return {};
   },
   components: {
+    SvgIcon,
     StaticContentWrapper
   },
   computed: {
@@ -92,6 +94,7 @@ const _sfc_main = {
   }
 };
 function _sfc_render(_ctx, _cache, $props, $setup, $data, $options) {
+  const _component_SvgIcon = resolveComponent("SvgIcon");
   const _component_a_button = resolveComponent("a-button");
   const _component_a_space = resolveComponent("a-space");
   const _component_static_content_wrapper = resolveComponent("static-content-wrapper");
@@ -118,14 +121,19 @@ function _sfc_render(_ctx, _cache, $props, $setup, $data, $options) {
               return openBlock(), createBlock(_component_a_button, {
                 key: item.key,
                 type: item.type,
+                danger: item.danger,
                 disabled: $options.handleDisabled(item),
                 onClick: ($event) => $options.hanldeClick(item)
               }, {
                 default: withCtx(() => [
-                  createTextVNode(toDisplayString(item.label), 1)
+                  item.icon ? (openBlock(), createBlock(_component_SvgIcon, {
+                    key: 0,
+                    "icon-class": item.icon
+                  }, null, 8, ["icon-class"])) : createCommentVNode("", true),
+                  createTextVNode(" " + toDisplayString(item.label), 1)
                 ]),
                 _: 2
-              }, 1032, ["type", "disabled", "onClick"]);
+              }, 1032, ["type", "danger", "disabled", "onClick"]);
             }), 128))
           ]),
           _: 1
@@ -135,7 +143,7 @@ function _sfc_render(_ctx, _cache, $props, $setup, $data, $options) {
     _: 1
   }, 8, ["designer", "field", "design-state", "parent-widget", "parent-list", "index-of-parent-list", "sub-form-row-index", "sub-form-col-index", "sub-form-row-id"]);
 }
-const buttonListWidget = /* @__PURE__ */ _export_sfc(_sfc_main, [["render", _sfc_render], ["__scopeId", "data-v-3d32de5f"]]);
+const buttonListWidget = /* @__PURE__ */ _export_sfc(_sfc_main, [["render", _sfc_render], ["__scopeId", "data-v-7e133232"]]);
 export {
   buttonListWidget as default
 };