@kp-ui/lowcode 1.0.33 → 1.0.35

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__1746607584219__");
+    var svgDom = document.getElementById("__svg__icons__dom__1746769978374__");
     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__1746607584219__";
+      svgDom.id = "__svg__icons__dom__1746769978374__";
       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.33",
+    "version": "1.0.35",
     "publishConfig": {
         "access": "public"
     },
@@ -9,7 +9,7 @@
     "types": "main.d.ts",
     "dependencies": {
         "@element-plus/icons-vue": "^0.2.4",
-        "@kp-ui/tool": "^1.0.10",
+        "@kp-ui/tool": "1.0.20",
         "animate.css": "^4.1.1",
         "ant-design-vue": "3.2.20",
         "axios": "^1.3.5",

package/render.js

@@ -213,7 +213,10 @@ const _sfc_main = {
     },
     insertCustomStyleAndScriptNode() {
       if (!!this.formConfig && !!this.formConfig.cssCode) {
-        insertCustomCssToHead(this.formConfig.cssCode, !!this.previewState ? "" : this.formId);
+        insertCustomCssToHead(
+          this.formConfig.cssCode,
+          !!this.previewState ? "" : this.formId
+        );
       }
       if (!!this.formConfig && !!this.formConfig.functions) {
         insertGlobalFunctionsToHtml(
@@ -321,18 +324,27 @@ const _sfc_main = {
     },
     addFieldChangeEventHandler() {
       this.off$("fieldChange");
-      this.on$("fieldChange", (fieldName, newValue, oldValue, subFormName, subFormRowIndex) => {
-        this.handleFieldDataChange(fieldName, newValue, oldValue, subFormName, subFormRowIndex);
-        this.$emit(
-          "formChange",
-          fieldName,
-          newValue,
-          oldValue,
-          this.formDataModel,
-          subFormName,
-          subFormRowIndex
-        );
-      });
+      this.on$(
+        "fieldChange",
+        (fieldName, newValue, oldValue, subFormName, subFormRowIndex) => {
+          this.handleFieldDataChange(
+            fieldName,
+            newValue,
+            oldValue,
+            subFormName,
+            subFormRowIndex
+          );
+          this.$emit(
+            "formChange",
+            fieldName,
+            newValue,
+            oldValue,
+            this.formDataModel,
+            subFormName,
+            subFormRowIndex
+          );
+        }
+      );
     },
     addFieldValidateEventHandler() {
       this.off$("fieldValidation");
@@ -388,7 +400,11 @@ const _sfc_main = {
       }
     },
     findWidgetOfSubFormAndSetDisabled(widgetName, disabledFlag) {
-      const widgetSchema = getFieldWidgetByName(this.formJsonObj.widgetList, widgetName, true);
+      const widgetSchema = getFieldWidgetByName(
+        this.formJsonObj.widgetList,
+        widgetName,
+        true
+      );
       if (!!widgetSchema && !!widgetSchema.options && widgetSchema.options.hasOwnProperty("disabled")) {
         widgetSchema.options.disabled = disabledFlag;
       }
@@ -408,7 +424,11 @@ const _sfc_main = {
       }
     },
     findWidgetOfSubFormAndSetHidden(widgetName, hiddenFlag) {
-      const widgetSchema = getFieldWidgetByName(this.formJsonObj.widgetList, widgetName, true);
+      const widgetSchema = getFieldWidgetByName(
+        this.formJsonObj.widgetList,
+        widgetName,
+        true
+      );
       if (!!widgetSchema && !!widgetSchema.options && widgetSchema.options.hasOwnProperty("hidden")) {
         widgetSchema.options.hidden = hiddenFlag;
       }
@@ -456,7 +476,13 @@ const _sfc_main = {
             overwriteObj(localDsv, this.globalDsv || {});
             let dsResult = null;
             try {
-              dsResult = await runDataSourceRequest(curDS, localDsv, this, false, this.$message);
+              dsResult = await runDataSourceRequest(
+                curDS,
+                localDsv,
+                this,
+                false,
+                this.$message
+              );
               this.dsResultCache[dsName] = dsResult;
               this.broadcast("FieldWidget", "loadOptionItemsFromDataSet", dsName);
             } catch (err) {
@@ -903,7 +929,7 @@ const _sfc_main = {
     //--------------------- 以上为组件支持外部调用的API方法 end ------------------//
   }
 };
-const _hoisted_1 = { style: { "min-height": "200px" } };
+const _hoisted_1 = { style: { "min-height": "260px" } };
 function _sfc_render(_ctx, _cache, $props, $setup, $data, $options) {
   const _component_a_form = resolveComponent("a-form");
   const _component_a_spin = resolveComponent("a-spin");
@@ -975,7 +1001,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-20edc56d"]]);
+const index = /* @__PURE__ */ _export_sfc(_sfc_main, [["render", _sfc_render], ["__scopeId", "data-v-fe3f93b2"]]);
 export {
   index as default
 };

package/src/api/useFilesystemApi/filesystem/index.js

@@ -1,4 +1,4 @@
-import { getHttp } from "../../../utils/request/http.js";
+import { getHttp } from "@kp-ui/tool";
 import { saveAs } from "file-saver";
 const useFilesystemApi = () => {
   const http = getHttp();

package/src/components/CustomRender/components/AttachmentRender.vue.js

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

package/src/components/CustomRender/components/AttachmentRender.vue2.js

@@ -1,5 +1,5 @@
-import { defineComponent, ref, watch, computed, onMounted, resolveComponent, createElementBlock, createCommentVNode, openBlock, createElementVNode, createVNode, withCtx, Fragment, renderList, createBlock, unref, toDisplayString } from "vue";
-import { Image, Button } from "ant-design-vue";
+import { defineComponent, ref, watchEffect, onMounted, resolveComponent, createElementBlock, createCommentVNode, openBlock, createElementVNode, createVNode, Fragment, renderList, unref, toDisplayString, withCtx } from "vue";
+import { Button } from "ant-design-vue";
 import { DownloadOutlined, EyeOutlined } from "@ant-design/icons-vue";
 import { useFilePreview } from "../../../hooks/useFilePreview.js";
 import FileIcon from "../../svg-icon/FileIcon.js";
@@ -8,8 +8,8 @@ const _hoisted_1 = {
   class: "attachment-render"
 };
 const _hoisted_2 = { class: "file-list" };
-const _hoisted_3 = { class: "image-preview" };
-const _hoisted_4 = { class: "file-name" };
+const _hoisted_3 = { class: "file-name" };
+const _hoisted_4 = ["src"];
 const _sfc_main = /* @__PURE__ */ defineComponent({
   __name: "AttachmentRender",
   props: {
@@ -17,68 +17,35 @@ const _sfc_main = /* @__PURE__ */ defineComponent({
   },
   setup(__props) {
     const props = __props;
-    const { getPreviewData, handlePreview, handleDownload } = useFilePreview();
+    const {
+      previewVisible,
+      previewTitle,
+      previewImage,
+      handleCancel,
+      handlePreview,
+      handleDownload
+    } = useFilePreview();
     const attachmentList = ref([]);
-    ref(false);
-    watch(
-      () => props.data,
-      async (newData) => {
-        let data = newData || [];
-        if (typeof data === "string") {
-          try {
-            data = JSON.parse(data);
-          } catch (error) {
-            console.error("Failed to parse props.data:", error);
-            attachmentList.value = [];
-            return;
-          }
-        }
-        if (!Array.isArray(data) || data.length === 0) {
-          attachmentList.value = [];
-          return;
-        }
-        attachmentList.value = await getPreviewData(data);
-      },
-      { immediate: true }
-    );
-    const isImageFile = (file) => {
-      const imageExtensions = [".jpg", ".jpeg", ".png", ".gif", ".bmp", ".webp"];
-      return imageExtensions.some((ext) => file.fileType.toLowerCase().endsWith(ext));
-    };
-    const fileList = computed(() => {
-      return attachmentList.value.filter((file) => !isImageFile(file));
-    });
-    const imageList = computed(() => {
-      return attachmentList.value.filter((file) => isImageFile(file));
+    watchEffect(() => {
+      if (typeof props.data === "string") {
+        attachmentList.value = JSON.parse(props.data);
+      } else {
+        attachmentList.value = props.data;
+      }
     });
     onMounted(() => {
-      console.log(121212121);
     });
     return (_ctx, _cache) => {
-      const _component_a_image_preview_group = resolveComponent("a-image-preview-group");
+      const _component_a_modal = resolveComponent("a-modal");
       return attachmentList.value.length ? (openBlock(), createElementBlock("div", _hoisted_1, [
         createElementVNode("div", _hoisted_2, [
-          createElementVNode("div", _hoisted_3, [
-            createVNode(_component_a_image_preview_group, null, {
-              default: withCtx(() => [
-                (openBlock(true), createElementBlock(Fragment, null, renderList(imageList.value, (file) => {
-                  return openBlock(), createBlock(unref(Image), {
-                    key: file.fileCode,
-                    src: file.previewUrl,
-                    class: "preview-image"
-                  }, null, 8, ["src"]);
-                }), 128))
-              ]),
-              _: 1
-            })
-          ]),
-          (openBlock(true), createElementBlock(Fragment, null, renderList(fileList.value, (file, index) => {
+          (openBlock(true), createElementBlock(Fragment, null, renderList(attachmentList.value, (file, index) => {
             return openBlock(), createElementBlock("div", {
               key: index,
               class: "file-item"
             }, [
               createVNode(unref(FileIcon), { file }, null, 8, ["file"]),
-              createElementVNode("span", _hoisted_4, toDisplayString(file.fileName), 1),
+              createElementVNode("span", _hoisted_3, toDisplayString(file.fileName), 1),
               createVNode(unref(Button), {
                 type: "link",
                 onClick: () => unref(handleDownload)(file)
@@ -99,7 +66,23 @@ const _sfc_main = /* @__PURE__ */ defineComponent({
               }, 1032, ["onClick"])
             ]);
           }), 128))
-        ])
+        ]),
+        createVNode(_component_a_modal, {
+          visible: unref(previewVisible),
+          class: "tpf-modal",
+          title: unref(previewTitle),
+          footer: null,
+          onCancel: unref(handleCancel),
+          width: "960px"
+        }, {
+          default: withCtx(() => [
+            createElementVNode("img", {
+              style: { "width": "100%" },
+              src: unref(previewImage)
+            }, null, 8, _hoisted_4)
+          ]),
+          _: 1
+        }, 8, ["visible", "title", "onCancel"])
       ])) : createCommentVNode("", true);
     };
   }

package/src/components/form-designer/form-widget/field-widget/fieldMixin.js

@@ -142,7 +142,11 @@ const fieldMixin = {
       if (this.field.type !== "picture-upload" && this.field.type !== "file-upload" || this.designState === true) {
         return;
       }
-      if (!!this.fieldModel) {
+      console.log("fieldModel", this.fieldModel);
+      if (this.fieldModel) {
+        if (typeof this.fieldModel === "string") {
+          this.fieldModel = JSON.parse(this.fieldModel);
+        }
         if (Array.isArray(this.fieldModel)) {
           this.fileList = deepClone(this.fieldModel);
         } else {
@@ -558,6 +562,9 @@ const fieldMixin = {
       return this.$refs["fieldEditor"];
     },
     showFileList(list) {
+      if (typeof list === "string") {
+        list = JSON.parse(list);
+      }
       if (!isArray(list)) return [];
       const res = list.map((item, uid) => ({
         ...item,

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-a39df179"]]);
+const fileUploadWidget = /* @__PURE__ */ _export_sfc(_sfc_main, [["render", _sfc_render], ["__scopeId", "data-v-7804efd1"]]);
 export {
   fileUploadWidget as default
 };

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

@@ -6,6 +6,7 @@ import fieldMixin from "./fieldMixin.js";
 import SvgIcon from "../../../svg-icon/index.vue.js";
 import { useFilesystemApi } from "../../../../api/useFilesystemApi/filesystem/index.js";
 import { PaperClipOutlined } from "@ant-design/icons-vue";
+import { getUserInfo } from "@kp-ui/tool";
 const filesystemApi = useFilesystemApi();
 const _sfc_main = {
   name: "file-upload-widget",
@@ -97,19 +98,11 @@ const _sfc_main = {
     this.unregisterFromRefList();
   },
   methods: {
-    initFieldModel() {
-      const {
-        fieldModel
-      } = this.field;
-      if (fieldModel) {
-        console.log(fieldModel);
-      }
-    },
     iconRender({
-      file: file2
+      file
     }) {
       try {
-        const fieldTypes = file2.fileName.slice(file2.fileName.lastIndexOf("."));
+        const fieldTypes = file.fileName.slice(file.fileName.lastIndexOf("."));
         if ([".xls", ".xlsx"].includes(fieldTypes.toLowerCase())) {
           return createVNode(SvgIcon, {
             "icon-class": "excel"
@@ -129,9 +122,6 @@ const _sfc_main = {
       }
       return createVNode(PaperClipOutlined, null, null);
     },
-    //   onPreview(file) {
-    //     filesystemApi.downloadFileObject({ fileCode: file.fileCode });
-    //   },
     handleCancel() {
       this.previewVisible = false;
     },
@@ -140,39 +130,39 @@ const _sfc_main = {
         return this.fileList[fileCode];
       } else {
         const fileUrlObj = await filesystemApi.getPreviewFileUrl({
-          fileCode: file.fileCode
+          fileCode
         });
-        fileUrlObj.data.value;
+        const url = fileUrlObj.data.value;
+        this.fileList[fileCode] = url;
+        return url;
       }
     },
-    async handlePreview(file2) {
-      var _a, _b;
-      if ([".png", ".jpg", ".jpeg", ".gif"].includes(file2.fileType)) {
-        const url = await this.getFileUrl(file2.fileCode);
+    async handlePreview(file) {
+      if ([".png", ".jpg", ".jpeg", ".gif"].includes(file.fileType)) {
+        const url = await this.getFileUrl(file.fileCode);
         this.previewImage = url;
         this.previewVisible = true;
-        this.previewTitle = file2.fileName;
+        this.previewTitle = file.fileName;
       } else {
-        const localUserInfo = getUserInfo();
-        const employeeId = (_a = localUserInfo == null ? void 0 : localUserInfo.loginInfo) == null ? void 0 : _a.employeeId;
         const {
           tokenId,
-          tenantId
-        } = (_b = localUserInfo == null ? void 0 : localUserInfo.loginInfo) == null ? void 0 : _b.userToken;
+          tenantId,
+          employeeId
+        } = getUserInfo();
         const doMain = getDoMain();
         const obj = {
           tenantId,
           tokenId,
           employeeId,
-          fileCode: file2.fileCode
+          fileCode: file.fileCode
         };
         window.open(`${doMain}/view-file/preview?${queryString.stringify(obj)}`);
       }
     },
-    handleOnBeforeUpload(file2) {
+    handleOnBeforeUpload(file) {
       if (!!this.field.options.onBeforeUpload) {
         const bfFunc = new Function("file", this.field.options.onBeforeUpload);
-        const result = bfFunc.call(this, file2);
+        const result = bfFunc.call(this, file);
         if (typeof result === "boolean") {
           return result;
         } else {
@@ -181,8 +171,8 @@ const _sfc_main = {
       }
       return true;
     },
-    removeFile(file2) {
-      const findInx = this.fileList.findIndex((item) => item.uid === file2.uid);
+    removeFile(file) {
+      const findInx = this.fileList.findIndex((item) => item.uid === file.uid);
       this.fileList.splice(findInx, 1);
       this.handleChangeEvent(this.fileList);
     },

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

@@ -1,9 +1,8 @@
 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 { getHttp, getLocat, replaceVars } from "@kp-ui/tool";
 import CodeModalEditor from "../code-editor/code-modal-editor.vue.js";
-import { getLocat, replaceVars } from "@kp-ui/tool";
 const _sfc_main = {
   name: "http-editor",
   inheritAttrs: false,

package/src/hooks/useFilePreview.js

@@ -7,6 +7,9 @@ const getDoMain = () => {
 };
 function useFilePreview() {
   const fileUrlCache = ref(/* @__PURE__ */ new Map());
+  const previewVisible = ref(false);
+  const previewTitle = ref("");
+  const previewImage = ref("");
   const filesystemApi = useFilesystemApi();
   const getPreviewFileUrl = async (fileCode) => {
     if (fileUrlCache.value.has(fileCode)) {
@@ -26,11 +29,8 @@ function useFilePreview() {
     return Promise.all(res);
   };
   const handlePreview = async (file) => {
-    var _a, _b;
     if (![".png", ".jpg", ".jpeg", ".gif"].includes(file.fileType || "")) {
-      const localUserInfo = getUserInfo();
-      const employeeId = (_a = localUserInfo == null ? void 0 : localUserInfo.loginInfo) == null ? void 0 : _a.employeeId;
-      const { tokenId, tenantId } = (_b = localUserInfo == null ? void 0 : localUserInfo.loginInfo) == null ? void 0 : _b.userToken;
+      const { tokenId, tenantId, employeeId } = getUserInfo();
       const doMain = getDoMain();
       const obj = {
         tenantId,
@@ -38,8 +38,11 @@ function useFilePreview() {
         employeeId,
         fileCode: file.fileCode
       };
-      console.log({ doMain });
       window.open(`${doMain}/view-file/preview?${queryString.stringify(obj)}`);
+    } else {
+      previewTitle.value = file.fileName;
+      previewImage.value = await getPreviewFileUrl(file.fileCode);
+      previewVisible.value = true;
     }
   };
   const handleDownload = async (file) => {
@@ -49,8 +52,15 @@ function useFilePreview() {
       console.error("下载文件失败:", error);
     }
   };
+  const handleCancel = () => {
+    previewVisible.value = false;
+  };
   return {
+    previewVisible,
+    previewTitle,
     fileUrlCache,
+    previewImage,
+    handleCancel,
     handleDownload,
     handlePreview,
     getPreviewData,

package/src/utils/request/fmtHttpParams.js

@@ -1,5 +1,18 @@
-import { getLocat, replaceVars } from "@kp-ui/tool";
-import { getHttp } from "./http.js";
+import { getHttp, getLocat } from "@kp-ui/tool";
+const replaceVars = (sendParams, paramsMap) => {
+  Object.entries(sendParams).forEach(([key, value]) => {
+    if (key) {
+      Object.keys(value).forEach((field) => {
+        if (paramsMap[field] !== void 0) {
+          sendParams[key][field] = paramsMap[field];
+        } else {
+          sendParams[key][field] = null;
+        }
+      });
+    }
+  });
+  return sendParams;
+};
 async function fmtHttpParams(req, params = {}) {
   const request = getHttp();
   const { data, vfCtx, ...args } = params;
@@ -7,13 +20,16 @@ async function fmtHttpParams(req, params = {}) {
   if (!http.url) return;
   const paramsMap = { ...getLocat(), ...data, ...vfCtx, ...args };
   const method = http.method || "get";
-  const sendParams = JSON.stringify({
-    ...http,
-    method,
+  let sendParams = {
     params: http.method === "get" ? { ...http.params, ...data } : { ...http.params },
     data: http.method === "post" ? { ...http.data, ...data } : { ...http.data }
-  });
-  let p = JSON.parse(replaceVars(sendParams, paramsMap));
+  };
+  sendParams = replaceVars(sendParams, paramsMap);
+  let p = {
+    ...http,
+    method,
+    ...sendParams
+  };
   if (dataReqHandlerCode) {
     const dataReqHandlerCodeFn = new Function("data", dataReqHandlerCode);
     p = dataReqHandlerCodeFn.call(this, p);