@kp-ui/lowcode 1.0.68 → 1.0.69

package/src/components/form-designer/toolbar-panel/index.vue.js

@@ -15,8 +15,12 @@ const _sfc_main = {
   mixins: [i18n],
   components: {
     VFormRender: defineAsyncComponent(() => import("../../../../render.js")),
-    CodeEditor: defineAsyncComponent(() => import("../../code-editor/index.vue.js")),
-    // Clipboard,
+    CodeEditor: defineAsyncComponent(
+      () => import("../../../../packages/tmgc2-share/src/components/TpfCodeEditor/code-editor.vue.js")
+    ),
+    TpfModal: defineAsyncComponent(
+      () => import("../../../../packages/tmgc2-share/src/components/TpfModal/index.vue.js")
+    ),
     SvgIcon
   },
   props: {
@@ -513,9 +517,6 @@ const _hoisted_4 = { class: "right-toolbar-con" };
 const _hoisted_5 = { class: "dialog-footer" };
 const _hoisted_6 = { class: "dialog-footer" };
 const _hoisted_7 = { class: "dialog-footer" };
-const _hoisted_8 = { style: { "border": "1px solid #dcdfe6" } };
-const _hoisted_9 = { class: "dialog-footer" };
-const _hoisted_10 = { class: "dialog-footer" };
 function _sfc_render(_ctx, _cache, $props, $setup, $data, $options) {
   const _component_svg_icon = resolveComponent("svg-icon");
   const _component_a_button = resolveComponent("a-button");
@@ -524,9 +525,11 @@ function _sfc_render(_ctx, _cache, $props, $setup, $data, $options) {
   const _component_a_tree = resolveComponent("a-tree");
   const _component_a_drawer = resolveComponent("a-drawer");
   const _component_VFormRender = resolveComponent("VFormRender");
-  const _component_a_modal = resolveComponent("a-modal");
+  const _component_TpfModal = resolveComponent("TpfModal");
   const _component_a_alert = resolveComponent("a-alert");
   const _component_code_editor = resolveComponent("code-editor");
+  const _component_a_modal = resolveComponent("a-modal");
+  const _component_CodeEditor = resolveComponent("CodeEditor");
   const _component_a_tab_pane = resolveComponent("a-tab-pane");
   const _component_a_tabs = resolveComponent("a-tabs");
   return openBlock(), createElementBlock("div", _hoisted_1, [
@@ -697,7 +700,7 @@ function _sfc_render(_ctx, _cache, $props, $setup, $data, $options) {
         }), 256))
       ])
     ]),
-    createVNode(_component_a_modal, {
+    createVNode(_component_TpfModal, {
       title: _ctx.i18nt("designer.toolbar.preview"),
       visible: $data.showPreviewDialogFlag,
       "onUpdate:visible": _cache[8] || (_cache[8] = ($event) => $data.showPreviewDialogFlag = $event),
@@ -711,59 +714,57 @@ function _sfc_render(_ctx, _cache, $props, $setup, $data, $options) {
       width: "75%",
       fullscreen: $options.layoutType === "H5" || $options.layoutType === "Pad"
     }, {
-      footer: withCtx(() => [
-        createElementVNode("div", _hoisted_5, [
-          createVNode(_component_a_button, { onClick: $options.showData }, {
-            default: withCtx(() => _cache[24] || (_cache[24] = [
-              createTextVNode("数据回显")
-            ])),
-            _: 1
-          }, 8, ["onClick"]),
-          createVNode(_component_a_button, {
-            type: "primary",
-            onClick: $options.getFormData
-          }, {
-            default: withCtx(() => [
-              createTextVNode(toDisplayString(_ctx.i18nt("designer.hint.getFormData")), 1)
-            ]),
-            _: 1
-          }, 8, ["onClick"]),
-          createVNode(_component_a_button, {
-            type: "primary",
-            onClick: $options.resetForm
-          }, {
-            default: withCtx(() => [
-              createTextVNode(toDisplayString(_ctx.i18nt("designer.hint.resetForm")), 1)
-            ]),
-            _: 1
-          }, 8, ["onClick"]),
-          createVNode(_component_a_button, {
-            type: "primary",
-            onClick: $options.setFormDisabled
-          }, {
-            default: withCtx(() => [
-              createTextVNode(toDisplayString(_ctx.i18nt("designer.hint.disableForm")), 1)
-            ]),
-            _: 1
-          }, 8, ["onClick"]),
-          createVNode(_component_a_button, {
-            type: "primary",
-            onClick: $options.setFormEnabled
-          }, {
-            default: withCtx(() => [
-              createTextVNode(toDisplayString(_ctx.i18nt("designer.hint.enableForm")), 1)
-            ]),
-            _: 1
-          }, 8, ["onClick"]),
-          createVNode(_component_a_button, {
-            onClick: _cache[7] || (_cache[7] = ($event) => $data.showPreviewDialogFlag = false)
-          }, {
-            default: withCtx(() => [
-              createTextVNode(toDisplayString(_ctx.i18nt("designer.hint.closePreview")), 1)
-            ]),
-            _: 1
-          })
-        ])
+      footerRight: withCtx(() => [
+        createVNode(_component_a_button, { onClick: $options.showData }, {
+          default: withCtx(() => _cache[24] || (_cache[24] = [
+            createTextVNode("数据回显")
+          ])),
+          _: 1
+        }, 8, ["onClick"]),
+        createVNode(_component_a_button, {
+          type: "primary",
+          onClick: $options.getFormData
+        }, {
+          default: withCtx(() => [
+            createTextVNode(toDisplayString(_ctx.i18nt("designer.hint.getFormData")), 1)
+          ]),
+          _: 1
+        }, 8, ["onClick"]),
+        createVNode(_component_a_button, {
+          type: "primary",
+          onClick: $options.resetForm
+        }, {
+          default: withCtx(() => [
+            createTextVNode(toDisplayString(_ctx.i18nt("designer.hint.resetForm")), 1)
+          ]),
+          _: 1
+        }, 8, ["onClick"]),
+        createVNode(_component_a_button, {
+          type: "primary",
+          onClick: $options.setFormDisabled
+        }, {
+          default: withCtx(() => [
+            createTextVNode(toDisplayString(_ctx.i18nt("designer.hint.disableForm")), 1)
+          ]),
+          _: 1
+        }, 8, ["onClick"]),
+        createVNode(_component_a_button, {
+          type: "primary",
+          onClick: $options.setFormEnabled
+        }, {
+          default: withCtx(() => [
+            createTextVNode(toDisplayString(_ctx.i18nt("designer.hint.enableForm")), 1)
+          ]),
+          _: 1
+        }, 8, ["onClick"]),
+        createVNode(_component_a_button, {
+          onClick: _cache[7] || (_cache[7] = ($event) => $data.showPreviewDialogFlag = false)
+        }, {
+          default: withCtx(() => [
+            createTextVNode(toDisplayString(_ctx.i18nt("designer.hint.closePreview")), 1)
+          ]),
+          _: 1
+        })
       ]),
       default: withCtx(() => [
         createElementVNode("div", null, [
@@ -804,7 +805,7 @@ function _sfc_render(_ctx, _cache, $props, $setup, $data, $options) {
       "destroy-on-close": true
     }, {
       footer: withCtx(() => [
-        createElementVNode("div", _hoisted_6, [
+        createElementVNode("div", _hoisted_5, [
           createVNode(_component_a_button, {
             type: "primary",
             onClick: $options.doJsonImport
@@ -854,7 +855,7 @@ function _sfc_render(_ctx, _cache, $props, $setup, $data, $options) {
       "destroy-on-close": true
     }, {
       footer: withCtx(() => [
-        createElementVNode("div", _hoisted_7, [
+        createElementVNode("div", _hoisted_6, [
           createVNode(_component_a_button, {
             type: "primary",
             class: "copy-json-btn",
@@ -892,56 +893,46 @@ function _sfc_render(_ctx, _cache, $props, $setup, $data, $options) {
       ]),
       _: 1
     }, 8, ["title", "visible"]),
-    createVNode(_component_a_modal, {
+    createVNode(_component_TpfModal, {
       title: _ctx.i18nt("designer.hint.exportFormData"),
       visible: $data.showFormDataDialogFlag,
       "onUpdate:visible": _cache[17] || (_cache[17] = ($event) => $data.showFormDataDialogFlag = $event),
-      "show-close": true,
-      class: "nested-drag-dialog dialog-title-light-bg",
-      center: "",
-      "close-on-click-modal": false,
-      "close-on-press-escape": false,
-      "destroy-on-close": true,
-      "append-to-body": true
+      width: "1200px"
     }, {
-      footer: withCtx(() => [
-        createElementVNode("div", _hoisted_9, [
-          createVNode(_component_a_button, {
-            type: "primary",
-            class: "copy-form-data-json-btn",
-            "data-clipboard-text": $data.formDataRawJson,
-            onClick: $options.copyFormDataJson
-          }, {
-            default: withCtx(() => [
-              createTextVNode(toDisplayString(_ctx.i18nt("designer.hint.copyFormData")), 1)
-            ]),
-            _: 1
-          }, 8, ["data-clipboard-text", "onClick"]),
-          createVNode(_component_a_button, { onClick: $options.saveFormData }, {
-            default: withCtx(() => [
-              createTextVNode(toDisplayString(_ctx.i18nt("designer.hint.saveFormData")), 1)
-            ]),
-            _: 1
-          }, 8, ["onClick"]),
-          createVNode(_component_a_button, {
-            onClick: _cache[16] || (_cache[16] = ($event) => $data.showFormDataDialogFlag = false)
-          }, {
-            default: withCtx(() => [
-              createTextVNode(toDisplayString(_ctx.i18nt("designer.hint.closePreview")), 1)
-            ]),
-            _: 1
-          })
-        ])
+      footerRight: withCtx(() => [
+        createVNode(_component_a_button, {
+          type: "primary",
+          class: "copy-form-data-json-btn",
+          "data-clipboard-text": $data.formDataRawJson,
+          onClick: $options.copyFormDataJson
+        }, {
+          default: withCtx(() => [
+            createTextVNode(toDisplayString(_ctx.i18nt("designer.hint.copyFormData")), 1)
+          ]),
+          _: 1
+        }, 8, ["data-clipboard-text", "onClick"]),
+        createVNode(_component_a_button, { onClick: $options.saveFormData }, {
+          default: withCtx(() => [
+            createTextVNode(toDisplayString(_ctx.i18nt("designer.hint.saveFormData")), 1)
+          ]),
+          _: 1
+        }, 8, ["onClick"]),
+        createVNode(_component_a_button, {
+          onClick: _cache[16] || (_cache[16] = ($event) => $data.showFormDataDialogFlag = false)
+        }, {
+          default: withCtx(() => [
+            createTextVNode(toDisplayString(_ctx.i18nt("designer.hint.closePreview")), 1)
+          ]),
+          _: 1
+        })
       ]),
       default: withCtx(() => [
-        createElementVNode("div", _hoisted_8, [
-          createVNode(_component_code_editor, {
-            mode: "json",
-            readonly: true,
-            modelValue: $data.formDataJson,
-            "onUpdate:modelValue": _cache[15] || (_cache[15] = ($event) => $data.formDataJson = $event)
-          }, null, 8, ["modelValue"])
-        ])
+        createVNode(_component_CodeEditor, {
+          mode: "json",
+          readonly: true,
+          modelValue: $data.formDataJson,
+          "onUpdate:modelValue": _cache[15] || (_cache[15] = ($event) => $data.formDataJson = $event)
+        }, null, 8, ["modelValue"])
       ]),
       _: 1
     }, 8, ["title", "visible"]),
@@ -960,7 +951,7 @@ function _sfc_render(_ctx, _cache, $props, $setup, $data, $options) {
       "destroy-on-close": true
     }, {
       footer: withCtx(() => [
-        createElementVNode("div", _hoisted_10, [
+        createElementVNode("div", _hoisted_7, [
           createVNode(_component_a_button, {
             type: "primary",
             class: "copy-vue2-sfc-btn",
@@ -1051,7 +1042,7 @@ function _sfc_render(_ctx, _cache, $props, $setup, $data, $options) {
     }, 8, ["title", "visible"])) : createCommentVNode("", true)
   ]);
 }
-const ToolbarPanel = /* @__PURE__ */ _export_sfc(_sfc_main, [["render", _sfc_render], ["__scopeId", "data-v-b7e52af5"]]);
+const ToolbarPanel = /* @__PURE__ */ _export_sfc(_sfc_main, [["render", _sfc_render], ["__scopeId", "data-v-4241259f"]]);
 export {
   ToolbarPanel as default
 };

package/src/components/form-designer/widget-panel/index.vue.js

@@ -164,7 +164,9 @@ const _sfc_main = {
           if (modifiedFlag) {
             this.designer.emitHistoryChange();
           }
-          this.$message.success(this.i18nt("designer.hint.loadFormTemplateSuccess"));
+          this.$message.success(
+            this.i18nt("designer.hint.loadFormTemplateSuccess")
+          );
         }).catch((error) => {
           this.$message.error(
             this.i18nt("designer.hint.loadFormTemplateFailed") + ":" + error
@@ -381,7 +383,7 @@ function _sfc_render(_ctx, _cache, $props, $setup, $data, $options) {
     ])
   ]);
 }
-const WidgetPanel = /* @__PURE__ */ _export_sfc(_sfc_main, [["render", _sfc_render], ["__scopeId", "data-v-ebed247a"]]);
+const WidgetPanel = /* @__PURE__ */ _export_sfc(_sfc_main, [["render", _sfc_render], ["__scopeId", "data-v-75f46b0a"]]);
 export {
   WidgetPanel as default
 };

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

@@ -2,6 +2,7 @@ import i18n from "../../utils/i18n.js";
 import zhCN from "ant-design-vue/es/locale/zh_CN";
 import { defineAsyncComponent, resolveComponent, resolveDirective, createBlock, openBlock, withCtx, createVNode, mergeProps, withDirectives, createElementBlock, createElementVNode } from "vue";
 import _sfc_main$1 from "./SubmitButtonRender.vue.js";
+import { TpfConfigProvider } from "tmgc2-share";
 /* empty css                    */
 import _export_sfc from "../../../_virtual/_plugin-vue_export-helper.js";
 const _sfc_main = {
@@ -47,6 +48,7 @@ const _sfc_main = {
     }
   },
   components: {
+    TpfConfigProvider,
     SubmitButtonRender: _sfc_main$1,
     VFormRender: defineAsyncComponent(() => import("../../../render.js"))
   },
@@ -206,12 +208,9 @@ function _sfc_render(_ctx, _cache, $props, $setup, $data, $options) {
   const _component_VFormRender = resolveComponent("VFormRender");
   const _component_SubmitButtonRender = resolveComponent("SubmitButtonRender");
   const _component_a_modal = resolveComponent("a-modal");
-  const _component_a_config_provider = resolveComponent("a-config-provider");
+  const _component_TpfConfigProvider = resolveComponent("TpfConfigProvider");
   const _directive_loading = resolveDirective("loading");
-  return openBlock(), createBlock(_component_a_config_provider, {
-    locale: $options.elLocale,
-    input: { autocomplete: "off" }
-  }, {
+  return openBlock(), createBlock(_component_TpfConfigProvider, null, {
     default: withCtx(() => [
       createVNode(_component_a_modal, mergeProps({
         class: "tpf-model design-model",
@@ -268,7 +267,7 @@ function _sfc_render(_ctx, _cache, $props, $setup, $data, $options) {
       }, 16, ["transitionName", "maskTransitionName", "title", "bodyStyle", "visible", "width", "mask", "maskClosable", "keyboard", "onCancel"])
     ]),
     _: 1
-  }, 8, ["locale"]);
+  });
 }
 const DynamicDialog = /* @__PURE__ */ _export_sfc(_sfc_main, [["render", _sfc_render]]);
 export {

package/src/components/http-editor/index.vue.js

@@ -43,6 +43,7 @@ function _sfc_render(_ctx, _cache, $props, $setup, $data, $options) {
       visible: $data.showDataSourceDialogFlag,
       "onUpdate:visible": _cache[3] || (_cache[3] = ($event) => $data.showDataSourceDialogFlag = $event),
       width: 520,
+      "z-index": "800",
       "destroy-on-close": true,
       "append-to-body": true,
       "close-on-click-modal": false,
@@ -435,20 +436,20 @@ function _sfc_render(_ctx, _cache, $props, $setup, $data, $options) {
       _: 1
     }, 8, ["title", "visible"]),
     createVNode(_component_CodeModalEditor, {
-      modelValue: $props.optionModel.dataReqHandlerCode,
-      "onUpdate:modelValue": _cache[8] || (_cache[8] = ($event) => $props.optionModel.dataReqHandlerCode = $event),
       ref: "CodeReqModalEditorRef",
-      "event-header": `function(data){`
+      "event-header": "data",
+      modelValue: $props.optionModel.dataReqHandlerCode,
+      "onUpdate:modelValue": _cache[8] || (_cache[8] = ($event) => $props.optionModel.dataReqHandlerCode = $event)
     }, null, 8, ["modelValue"]),
     createVNode(_component_CodeModalEditor, {
       modelValue: $props.optionModel.dataHandlerCode,
       "onUpdate:modelValue": _cache[9] || (_cache[9] = ($event) => $props.optionModel.dataHandlerCode = $event),
       ref: "CodeModalEditorRef",
-      "event-header": `function(data){`
+      "fn-params": "data"
     }, null, 8, ["modelValue"])
   ], 64);
 }
-const HttpEditor = /* @__PURE__ */ _export_sfc(_sfc_main, [["render", _sfc_render], ["__scopeId", "data-v-f0ab404c"]]);
+const HttpEditor = /* @__PURE__ */ _export_sfc(_sfc_main, [["render", _sfc_render], ["__scopeId", "data-v-9bdddc38"]]);
 export {
   HttpEditor as default
 };

package/src/components/http-editor/index.vue2.js

@@ -2,7 +2,7 @@ import i18n from "../../utils/i18n.js";
 import CodeEditor from "../code-editor/index.vue.js";
 import { isArray } from "lodash-es";
 import { getHttp } from "../../utils/request/http.js";
-import CodeModalEditor from "../code-editor/code-modal-editor.vue.js";
+import _sfc_main$1 from "../code-editor/code-modal-editor.vue.js";
 import { getLocat, replaceVars } from "@kp-ui/tool";
 const _sfc_main = {
   name: "http-editor",
@@ -11,7 +11,7 @@ const _sfc_main = {
   inject: ["getGlobalDsv"],
   components: {
     CodeEditor,
-    CodeModalEditor
+    CodeModalEditor: _sfc_main$1
   },
   props: {
     optionModel: Object,

package/src/components/public/ActionButtonListDialog.vue2.js

@@ -1,6 +1,6 @@
 import { defineComponent, ref, computed, watch } from "vue";
 import i18n, { useI18n } from "../../utils/i18n.js";
-import CodeModalEditor from "../code-editor/code-modal-editor.vue.js";
+import _sfc_main$1 from "../code-editor/code-modal-editor.vue.js";
 import { generateId } from "../../utils/util.js";
 const _sfc_main = defineComponent({
   name: "ActionButtonList",
@@ -14,7 +14,7 @@ const _sfc_main = defineComponent({
       required: true
     }
   },
-  components: { CodeModalEditor },
+  components: { CodeModalEditor: _sfc_main$1 },
   mixins: [i18n],
   emits: ["update:data"],
   setup(props, { emit }) {

package/src/mixins/useDataTableMixin.js

@@ -40,9 +40,6 @@ const useDataTableMixin = {
         ...item,
         ...this.handleColumnItem(item)
       }));
-      console.log({
-        centerColumns
-      });
       const rightFixedColumns = [];
       if (optins.showButtonsColumn) {
         const operationButtons = optins.operationButtons ?? [];
@@ -111,6 +108,7 @@ const useDataTableMixin = {
         if (newVal && newVal.length) {
           console.log("DataTable dataSource changed:", newVal);
           this.widget.options.dataSource = newVal;
+          console.log(this.getFormRef());
           (_a = this.getFormRef()) == null ? void 0 : _a.setTableValue(this.widget.options.name, newVal);
         }
       },
@@ -287,8 +285,13 @@ const useDataTableMixin = {
       const res = omit(item, ["customRender"]);
       const customRenderFn = item.customRender;
       item.minWidth = 50;
-      item.maxWidth = 500;
-      item.width = isNaN(Number(item.width)) ? item.width : Number(item.width);
+      item.maxWidth = 1200;
+      if (item.isAutoWidth) {
+        item.width = null;
+        delete item.width;
+      } else {
+        item.width = isNaN(Number(item.width)) ? item.width : Number(item.width);
+      }
       if (!customRenderFn) return item;
       return {
         ...res,