@kp-ui/lowcode 1.0.85 → 1.0.86

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("lowcodeDomId");
+    var svgDom = document.getElementById("lowcodeSvgDom");
     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 = "lowcodeDomId";
+      svgDom.id = "lowcodeSvgDom";
       svgDom.setAttribute("xmlns", "http://www.w3.org/2000/svg");
       svgDom.setAttribute("xmlns:link", "http://www.w3.org/1999/xlink");
     }

package/package.json

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

package/src/components/code-editor/code-modal-editor.vue.js

@@ -23,12 +23,12 @@ const _sfc_main = /* @__PURE__ */ defineComponent({
     const emit = __emit;
     const [codeEditorRef, openCodeEditor] = useOpenAntdModal();
     const open = (value) => {
-      console.log({ value });
       currentCode.value = value;
       code.value = value;
       openCodeEditor();
     };
     const hanldeSave = (value) => {
+      console.log({ value });
       emit("save", value);
       code.value = value;
     };

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

@@ -1,7 +1,7 @@
 import _sfc_main from "./index.vue2.js";
 /* empty css           */
 import _export_sfc from "../../../_virtual/_plugin-vue_export-helper.js";
-const CodeEditor = /* @__PURE__ */ _export_sfc(_sfc_main, [["__scopeId", "data-v-d6ceeb37"]]);
+const CodeEditor = /* @__PURE__ */ _export_sfc(_sfc_main, [["__scopeId", "data-v-b8286917"]]);
 export {
   CodeEditor as default
 };

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

@@ -1,4 +1,4 @@
-import { defineComponent, ref, computed, watch, watchEffect, onMounted, createElementBlock, openBlock, createElementVNode } from "vue";
+import { defineComponent, ref, watchEffect, onMounted, resolveDirective, withDirectives, createElementBlock, openBlock, createElementVNode, nextTick } from "vue";
 const _hoisted_1 = { class: "ace-container" };
 const themePath = "ace/theme/sqlserver";
 const modePath = "ace/mode/javascript";
@@ -6,25 +6,17 @@ const _sfc_main = /* @__PURE__ */ defineComponent({
   __name: "index",
   props: {
     value: {},
-    modelValue: {},
     readonly: { type: Boolean },
     mode: {},
     userWorker: { type: Boolean }
   },
-  emits: ["update:modelValue", "update:value"],
+  emits: ["update:value"],
   setup(__props, { expose: __expose, emit: __emit }) {
     const props = __props;
     const emit = __emit;
-    const aceRef = ref(null);
+    const aceRef = ref();
     const aceEditor = ref(null);
-    const stop = ref(false);
-    const codeValue = computed(() => props.value || props.modelValue);
     const isLoading = ref(false);
-    const setValue = (newValue) => {
-      if (aceEditor.value) {
-        aceEditor.value.getSession().setValue(newValue);
-      }
-    };
     const getEditorAnnotations = () => {
       var _a;
       return (_a = aceEditor.value) == null ? void 0 : _a.getSession().getAnnotations();
@@ -69,16 +61,6 @@ const _sfc_main = /* @__PURE__ */ defineComponent({
         }
       });
     };
-    watch(
-      () => props.value,
-      (val) => {
-        if (stop.value) return;
-        if (val) {
-          setValue(val);
-          stop.value = true;
-        }
-      }
-    );
     const initEditor = async () => {
       isLoading.value = true;
       const ace = await import("ace-builds");
@@ -97,10 +79,12 @@ const _sfc_main = /* @__PURE__ */ defineComponent({
         await import("ace-builds/src-min-noconflict/mode-groovy");
       }
       addAutoCompletion(ace);
+      await nextTick();
+      if (!aceRef.value) {
+        return;
+      }
       aceEditor.value = ace.edit(aceRef.value, {
-        maxLines: 20,
-        // 最大行数，超过会自动出现滚动条
-        minLines: 5,
+        minLines: 10,
         // 最小行数，还未到最大行数时，编辑器会自动伸缩大小
         fontSize: 12,
         // 编辑器内字体大小
@@ -108,11 +92,10 @@ const _sfc_main = /* @__PURE__ */ defineComponent({
         // 默认设置的主题
         mode: modePath,
         // 默认设置的语言模式
-        tabSize: 2,
+        tabSize: 4,
         // 制表符设置为2个空格大小
         readOnly: props.readonly,
-        highlightActiveLine: true,
-        value: codeValue.value
+        highlightActiveLine: true
       });
       aceEditor.value.setOptions({
         enableBasicAutocompletion: true,
@@ -128,9 +111,10 @@ const _sfc_main = /* @__PURE__ */ defineComponent({
       } else if (props.mode === "groovy") {
         setGroovyMode();
       }
+      aceEditor.value.setValue(props.value || "");
       aceEditor.value.getSession().on("change", (ev) => {
         var _a, _b;
-        emit("update:modelValue", (_a = aceEditor.value) == null ? void 0 : _a.getValue());
+        console.log((_a = aceEditor.value) == null ? void 0 : _a.getValue());
         emit("update:value", (_b = aceEditor.value) == null ? void 0 : _b.getValue());
       });
       isLoading.value = false;
@@ -144,6 +128,7 @@ const _sfc_main = /* @__PURE__ */ defineComponent({
       });
     });
     onMounted(() => {
+      console.log(121212121333);
       initEditor();
     });
     __expose({
@@ -151,12 +136,15 @@ const _sfc_main = /* @__PURE__ */ defineComponent({
       getEditorAnnotations
     });
     return (_ctx, _cache) => {
-      return openBlock(), createElementBlock("div", _hoisted_1, [
+      const _directive_loading = resolveDirective("loading");
+      return withDirectives((openBlock(), createElementBlock("div", _hoisted_1, [
         createElementVNode("div", {
           class: "ace-editor",
           ref_key: "aceRef",
           ref: aceRef
         }, null, 512)
+      ])), [
+        [_directive_loading, isLoading.value]
       ]);
     };
   }

package/src/components/form-designer/form-widget/field-widget/file-upload-widget.vue.js

@@ -92,7 +92,7 @@ function _sfc_render(_ctx, _cache, $props, $setup, $data, $options) {
     _: 1
   }, 8, ["designer", "field", "rules", "design-state", "parent-widget", "parent-list", "index-of-parent-list", "sub-form-row-index", "sub-form-col-index", "sub-form-row-id"])) : createCommentVNode("", true);
 }
-const fileUploadWidget = /* @__PURE__ */ _export_sfc(_sfc_main, [["render", _sfc_render], ["__scopeId", "data-v-baef62a7"]]);
+const fileUploadWidget = /* @__PURE__ */ _export_sfc(_sfc_main, [["render", _sfc_render], ["__scopeId", "data-v-6de0a3ab"]]);
 export {
   fileUploadWidget as default
 };

package/src/components/form-designer/form-widget/field-widget/file-upload-widget.vue2.js

@@ -137,6 +137,9 @@ const _sfc_main = {
       }
     },
     async handlePreview(file) {
+      if (file.fileCode) {
+        return this.$message.error("文件上传完才能预览！");
+      }
       if ([".png", ".jpg", ".jpeg", ".gif"].includes(file.fileType)) {
         const url = await this.getFileUrl(file.fileCode);
         this.previewImage = url;

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

@@ -1,7 +1,8 @@
-import { defineComponent, ref, resolveComponent, createElementBlock, openBlock, Fragment, createVNode, withCtx, normalizeClass, createTextVNode, toDisplayString, unref } from "vue";
+import { defineComponent, ref, resolveComponent, createElementBlock, openBlock, Fragment, createVNode, withCtx, normalizeClass, createTextVNode, 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";
-import { useOpenAntdModal, TpfCodeEditor } from "tmgc2-share";
+const _hoisted_1 = { class: "dialog-footer" };
 const _sfc_main = /* @__PURE__ */ defineComponent({
   __name: "methoad-item",
   props: {
@@ -16,15 +17,15 @@ const _sfc_main = /* @__PURE__ */ defineComponent({
     const { i18nt } = useI18n();
     const props = __props;
     const emit = __emit;
-    const [codeEditorRef, openTpfCodeEditor] = useOpenAntdModal();
+    const ecEditor = ref();
     const formEventHandlerCode = ref("");
     const showFormEventDialogFlag = ref(false);
     const editFormEventHandler = (eventName) => {
       formEventHandlerCode.value = props.formConfig[eventName];
-      openTpfCodeEditor();
+      showFormEventDialogFlag.value = true;
     };
     const saveFormEventHandler = () => {
-      const codeHints = codeEditorRef.value.ecEditor.getEditorAnnotations();
+      const codeHints = ecEditor.value.getEditorAnnotations();
       let syntaxErrorFlag = false;
       if (!!codeHints && codeHints.length > 0) {
         codeHints.forEach((chItem) => {
@@ -43,6 +44,8 @@ const _sfc_main = /* @__PURE__ */ defineComponent({
     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,
@@ -64,15 +67,61 @@ const _sfc_main = /* @__PURE__ */ defineComponent({
           ]),
           _: 1
         }, 8, ["label"]),
-        createVNode(unref(TpfCodeEditor), {
-          modelValue: formEventHandlerCode.value,
-          "onUpdate:modelValue": _cache[1] || (_cache[1] = ($event) => formEventHandlerCode.value = $event),
-          mode: "javascript",
-          ref_key: "codeEditorRef",
-          ref: codeEditorRef,
-          eventHeader: "form." + _ctx.eventParamsMap[_ctx.eventName],
-          onSetCode: saveFormEventHandler
-        }, null, 8, ["modelValue", "eventHeader"])
+        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);
     };
   }