@kp-ui/lowcode 1.0.65 → 1.0.67

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

package/package.json

@@ -1,12 +1,12 @@
 {
   "name": "@kp-ui/lowcode",
-  "version": "1.0.65",
+  "version": "1.0.67",
   "publishConfig": {
     "access": "public"
   },
   "main": "index.js",
   "module": "index.js",
-  "types": "./types/install.d.ts",
+  "types": "main.d.ts",
   "dependencies": {
     "@element-plus/icons-vue": "^0.2.4",
     "@kp-ui/tool": "1.0.24",

package/render.js

@@ -935,9 +935,8 @@ const _sfc_main = {
      */
     showDialog(dialogName, formData = {}, extraData = {}) {
       const topFormRef = this.getTopFormRef();
-      console.log({ topFormRef });
-      const dialogCon = getContainerWidgetByName(topFormRef.widgetList, dialogName);
-      console.log({ dialogCon });
+      const formRef = this.getFormRef();
+      const dialogCon = getContainerWidgetByName(topFormRef.widgetList, dialogName) || getContainerWidgetByName(formRef.widgetList, dialogName);
       if (!dialogName || dialogCon.type !== "vf-dialog") {
         this.$message.error(this.i18nt("render.hint.refNotFound") + dialogName);
         return;
@@ -1081,7 +1080,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-ad27ca1a"]]);
+const index = /* @__PURE__ */ _export_sfc(_sfc_main, [["render", _sfc_render], ["__scopeId", "data-v-4e50e948"]]);
 export {
   index as default
 };

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

@@ -142,16 +142,10 @@ const fieldMixin = {
       if (this.field.type !== "picture-upload" && this.field.type !== "file-upload" || this.designState === true) {
         return;
       }
-      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 {
-          this.fileList.splice(0, 0, deepClone(this.fieldModel));
-        }
       }
     },
     initEventHandler() {
@@ -163,7 +157,12 @@ const fieldMixin = {
       this.on$("field-value-changed", (values) => {
         if (!!this.subFormItemFlag) {
           const subFormData = this.formModel[this.subFormName];
-          this.handleOnChangeForSubForm(values[0], values[1], subFormData, this.subFormRowId);
+          this.handleOnChangeForSubForm(
+            values[0],
+            values[1],
+            subFormData,
+            this.subFormRowId
+          );
         } else {
           this.handleOnChange(values[0], values[1]);
         }
@@ -478,7 +477,12 @@ const fieldMixin = {
         return;
       }
       if (!!this.field.options.onChange) {
-        const changeFn = new Function("value", "oldValue", "ops", this.field.options.onChange);
+        const changeFn = new Function(
+          "value",
+          "oldValue",
+          "ops",
+          this.field.options.onChange
+        );
         changeFn.call(this, val, oldVal, ops[0]);
       }
     },
@@ -598,9 +602,8 @@ const fieldMixin = {
       }
     },
     getValue() {
-      {
-        return this.fieldModel;
-      }
+      console.log("fieldModel", this.fieldModel);
+      return this.fieldModel;
     },
     resetField() {
       const defaultValue = this.field.options.defaultValue;
@@ -608,8 +611,8 @@ const fieldMixin = {
       this.$nextTick(() => {
       });
       if (this.field.type === "picture-upload" || this.field.type === "file-upload") {
-        this.fileList.splice(0, this.fileList.length);
-        this.handleChangeEvent(this.fileList);
+        this.fieldModel.splice(0, this.fieldModel.length);
+        this.handleChangeEvent(this.fieldModel);
       }
     },
     setWidgetOption(optionName, optionValue) {

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

@@ -37,8 +37,8 @@ function _sfc_render(_ctx, _cache, $props, $setup, $data, $options) {
         multiple: $props.field.options.multiple,
         accept: $options.acceptType,
         maxCount: $props.field.options.limit,
-        "file-list": $data.fileList,
-        "onUpdate:fileList": _cache[0] || (_cache[0] = ($event) => $data.fileList = $event),
+        "file-list": $data.fieldModel,
+        "onUpdate:fileList": _cache[0] || (_cache[0] = ($event) => $data.fieldModel = $event),
         listType: $props.field.options.uploadListType,
         customRequest: $options.customRequest,
         iconRender: $options.iconRender,
@@ -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-7804efd1"]]);
+const fileUploadWidget = /* @__PURE__ */ _export_sfc(_sfc_main, [["render", _sfc_render], ["__scopeId", "data-v-bacb1889"]]);
 export {
   fileUploadWidget as default
 };

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

@@ -53,9 +53,7 @@ const _sfc_main = {
       oldFieldValue: null,
       //field组件change之前的值
       fieldModel: [],
-      rules: [],
-      fileList: []
-      //上传文件列表
+      rules: []
     };
   },
   computed: {
@@ -78,7 +76,7 @@ const _sfc_main = {
       return [acceptList.length ? `支持扩展名${acceptList}` : "", maxSize ? `支持文件大小${maxSize}M` : ""].filter(Boolean);
     }
     // uploadBtnHidden() {
-    //   return !this.fileList || this.fileList.length >= this.field.options.limit;
+    //   return !this.fieldModel || this.fieldModel.length >= this.field.options.limit;
     // }
   },
   beforeCreate() {
@@ -126,14 +124,14 @@ const _sfc_main = {
       this.previewVisible = false;
     },
     async getFileUrl(fileCode) {
-      if (this.fileList[fileCode]) {
-        return this.fileList[fileCode];
+      if (this.fieldModel[fileCode]) {
+        return this.fieldModel[fileCode];
       } else {
         const fileUrlObj = await filesystemApi.getPreviewFileUrl({
           fileCode
         });
         const url = fileUrlObj.data.value;
-        this.fileList[fileCode] = url;
+        this.fieldModel[fileCode] = url;
         return url;
       }
     },
@@ -172,9 +170,9 @@ const _sfc_main = {
       return true;
     },
     removeFile(file) {
-      const findInx = this.fileList.findIndex((item) => item.uid === file.uid);
-      this.fileList.splice(findInx, 1);
-      this.handleChangeEvent(this.fileList);
+      const findInx = this.fieldModel.findIndex((item) => item.uid === file.uid);
+      this.fieldModel.splice(findInx, 1);
+      this.handleChangeEvent(this.fieldModel);
     },
     async customRequest(upload) {
       const {
@@ -210,24 +208,24 @@ const _sfc_main = {
           fileCode
         } = res.data.object;
         if (limit > 1) {
-          const findIndex = this.fileList.findIndex((item) => item.name === name);
+          const findIndex = this.fieldModel.findIndex((item) => item.name === name);
           if (findIndex > -1) {
-            this.fileList.splice(findIndex, 1);
+            this.fieldModel.splice(findIndex, 1);
           }
-          if (this.fileList.length < limit) {
-            this.fileList.push({
+          if (this.fieldModel.length < limit) {
+            this.fieldModel.push({
               ...res.data.object,
               name
             });
           }
         } else {
-          this.fileList = [{
+          this.fieldModel = [{
             ...res.data.object,
             name
           }];
         }
       } finally {
-        this.handleChangeEvent(this.fileList);
+        this.handleChangeEvent(this.fieldModel);
         this.loading = false;
       }
     }