@web-utils/component 2.7.21 → 2.7.28

package/dist/components/fy-date/index.js

@@ -1,5 +1,5 @@
 import { p as props, e as event } from "../../chunks/event.fc358074.js";
-import { n as normalizeComponent } from "../../chunks/vueComponentNormalizer.bf552d98.js";
+import { n as normalizeComponent } from "../../chunks/vueComponentNormalizer.77ec6792.js";
 var render = function() {
   var _vm = this, _h = _vm.$createElement, _c = _vm._self._c || _h;
   return _c("div", {

package/dist/components/fy-date/style.css

@@ -1,15 +1 @@
-.avue-date__group {
-  display: flex;
-  align-items: center;
-}
-.avue-date__radio .el-radio-button:last-child .el-radio-button__inner {
-  border-radius: 0;
-  border-right: 0;
-}
-.avue-date__date {
-  width: 300px;
-}
-.avue-date__date .el-date-editor {
-  border-top-left-radius: 0;
-  border-bottom-left-radius: 0;
-}
+.avue-date__group{display:flex;align-items:center}.avue-date__radio .el-radio-button:last-child .el-radio-button__inner{border-radius:0;border-right:0}.avue-date__date{width:300px}.avue-date__date .el-date-editor{border-top-left-radius:0;border-bottom-left-radius:0}

package/dist/components/fy-dialog-form/index.js

@@ -1,7 +1,7 @@
 import { c as config } from "../../chunks/config.7dec2bf2.js";
 import { d as deepClone, o as optVal, u as uploadFun, v as filterParams } from "../../chunks/util.89913643.js";
 import { isBlank } from "@web-utils/core";
-import { n as normalizeComponent } from "../../chunks/vueComponentNormalizer.bf552d98.js";
+import { n as normalizeComponent } from "../../chunks/vueComponentNormalizer.77ec6792.js";
 var render = function() {
   var _vm = this, _h = _vm.$createElement, _c = _vm._self._c || _h;
   return _vm.boxVisible ? _c(_vm.dialogType, _vm._b({

package/dist/components/fy-dialog-form/style.css

@@ -0,0 +1 @@
+.dialog-form .element-dialog.el-dialog.el-dialog-resizeable .el-dialog__body,.dialog-form .el-drawer__body{position:static;margin-bottom:53px}

package/dist/components/fy-draggable/index.js

@@ -1,5 +1,5 @@
 import { s as setPx, w as getFixed } from "../../chunks/util.89913643.js";
-import { n as normalizeComponent } from "../../chunks/vueComponentNormalizer.bf552d98.js";
+import { n as normalizeComponent } from "../../chunks/vueComponentNormalizer.77ec6792.js";
 var render = function() {
   var _vm = this, _h = _vm.$createElement, _c = _vm._self._c || _h;
   return _c("div", {

package/dist/components/fy-draggable/style.css

@@ -1,136 +1 @@
-.avue-draggable {
-  padding: 10px;
-  position: absolute;
-  cursor: move;
-  -webkit-tap-highlight-color: transparent;
-  user-select: none;
-}
-.avue-draggable__focus {
-  opacity: 0;
-  position: absolute !important;
-  top: 0;
-  left: 0;
-  z-index: -1024;
-}
-.avue-draggable__mask {
-  width: 100%;
-  height: 100%;
-  border: 0;
-  position: absolute;
-  top: 0;
-  right: 0;
-  bottom: 0;
-  left: 0;
-  z-index: 1;
-}
-.avue-draggable--active {
-  cursor: move;
-  border: 1px dashed #09f;
-  background-color: #73aae580;
-}
-.avue-draggable--move {
-  opacity: .6;
-  background-color: #73aae580;
-}
-.avue-draggable--click {
-  cursor: pointer;
-}
-.avue-draggable__line--left {
-  position: absolute;
-  border-top: 1px dashed #09f;
-  width: 10000px;
-  height: 0;
-  top: 0;
-  transform: translate(-100%);
-}
-.avue-draggable__line--top {
-  position: absolute;
-  border-left: 1px dashed #09f;
-  width: 0;
-  height: 10000px;
-  left: 0;
-  transform: translateY(-100%);
-}
-.avue-draggable__line--label {
-  top: -5px;
-  left: -8px;
-  position: absolute;
-  padding: 5px;
-  transform: translate(-100%, -100%);
-  color: #09f;
-  font-size: 18px;
-  white-space: nowrap;
-  cursor: move;
-}
-.avue-draggable__menu {
-  position: absolute;
-  top: 0px;
-  left: 0px;
-  background-color: #409eff;
-  font-size: 25px;
-  color: #fff;
-  z-index: 9999;
-  cursor: pointer;
-}
-.avue-draggable__range {
-  position: absolute;
-  width: 10px;
-  height: 10px;
-  border-radius: 100%;
-  z-index: 9999;
-  background-color: #09f;
-}
-.avue-draggable__range--left,
-.avue-draggable__range--right {
-  top: 50%;
-  transform: translateY(-50%);
-}
-.avue-draggable__range--left:hover,
-.avue-draggable__range--right:hover {
-  cursor: ew-resize;
-}
-.avue-draggable__range--left {
-  left: -6px;
-}
-.avue-draggable__range--right {
-  right: -6px;
-}
-.avue-draggable__range--top,
-.avue-draggable__range--bottom {
-  left: 50%;
-  transform: translate(-50%);
-}
-.avue-draggable__range--top:hover,
-.avue-draggable__range--bottom:hover {
-  cursor: ns-resize;
-}
-.avue-draggable__range--top {
-  top: -6px;
-}
-.avue-draggable__range--bottom {
-  bottom: -6px;
-}
-.avue-draggable__range--bottom-right:hover,
-.avue-draggable__range--top-left:hover {
-  cursor: nwse-resize;
-}
-.avue-draggable__range--bottom-left:hover,
-.avue-draggable__range--top-right:hover {
-  cursor: nesw-resize;
-}
-.avue-draggable__range--top-right {
-  top: -6px;
-  right: -6px;
-}
-.avue-draggable__range--top-left {
-  top: -6px;
-  left: -6px;
-}
-.avue-draggable__range--bottom-right {
-  bottom: -6px;
-  right: -6px;
-}
-.avue-draggable__range--bottom-left {
-  bottom: -6px;
-  left: -6px;
-}
+.avue-draggable{padding:10px;position:absolute;cursor:move;-webkit-tap-highlight-color:transparent;user-select:none}.avue-draggable__focus{opacity:0;position:absolute!important;top:0;left:0;z-index:-1024}.avue-draggable__mask{width:100%;height:100%;border:0;position:absolute;inset:0;z-index:1}.avue-draggable--active{cursor:move;border:1px dashed #09f;background-color:#73aae580}.avue-draggable--move{opacity:.6;background-color:#73aae580}.avue-draggable--click{cursor:pointer}.avue-draggable__line--left{position:absolute;border-top:1px dashed #09f;width:10000px;height:0;top:0;transform:translate(-100%)}.avue-draggable__line--top{position:absolute;border-left:1px dashed #09f;width:0;height:10000px;left:0;transform:translateY(-100%)}.avue-draggable__line--label{top:-5px;left:-8px;position:absolute;padding:5px;transform:translate(-100%,-100%);color:#09f;font-size:18px;white-space:nowrap;cursor:move}.avue-draggable__menu{position:absolute;top:0;left:0;background-color:#409eff;font-size:25px;color:#fff;z-index:9999;cursor:pointer}.avue-draggable__range{position:absolute;width:10px;height:10px;border-radius:100%;z-index:9999;background-color:#09f}.avue-draggable__range--left,.avue-draggable__range--right{top:50%;transform:translateY(-50%)}.avue-draggable__range--left:hover,.avue-draggable__range--right:hover{cursor:ew-resize}.avue-draggable__range--left{left:-6px}.avue-draggable__range--right{right:-6px}.avue-draggable__range--top,.avue-draggable__range--bottom{left:50%;transform:translate(-50%)}.avue-draggable__range--top:hover,.avue-draggable__range--bottom:hover{cursor:ns-resize}.avue-draggable__range--top{top:-6px}.avue-draggable__range--bottom{bottom:-6px}.avue-draggable__range--bottom-right:hover,.avue-draggable__range--top-left:hover{cursor:nwse-resize}.avue-draggable__range--bottom-left:hover,.avue-draggable__range--top-right:hover{cursor:nesw-resize}.avue-draggable__range--top-right{top:-6px;right:-6px}.avue-draggable__range--top-left{top:-6px;left:-6px}.avue-draggable__range--bottom-right{bottom:-6px;right:-6px}.avue-draggable__range--bottom-left{bottom:-6px;left:-6px}

package/dist/components/fy-dynamic/index.js

@@ -1,6 +1,6 @@
 import { p as props, e as event } from "../../chunks/event.fc358074.js";
 import { o as optVal, d as deepClone } from "../../chunks/util.89913643.js";
-import { n as normalizeComponent } from "../../chunks/vueComponentNormalizer.bf552d98.js";
+import { n as normalizeComponent } from "../../chunks/vueComponentNormalizer.77ec6792.js";
 function _objectDestructuringEmpty(obj) {
   if (obj == null)
     throw new TypeError("Cannot destructure undefined");

package/dist/components/fy-dynamic/style.css

@@ -1,29 +1 @@
-.avue-dynamic__item {
-  margin-bottom: 10px;
-  width: 100%;
-  display: flex;
-  align-items: center;
-}
-.avue-dynamic__header {
-  padding-left: 40px;
-}
-.avue-dynamic__row {
-  position: relative;
-  border-top: 1px dashed #eee;
-  padding-top: 13px;
-}
-.avue-dynamic__row:first-child {
-  border-top: 0;
-}
-.avue-dynamic__menu {
-  position: absolute;
-  right: 0;
-  z-index: 1024;
-}
-.avue-dynamic__input {
-  margin-right: 8px;
-  width: 100%;
-}
-.avue-dynamic__button {
-  margin-bottom: 0 !important;
-}
+.avue-dynamic__item{margin-bottom:10px;width:100%;display:flex;align-items:center}.avue-dynamic__header{padding-left:40px}.avue-dynamic__row{position:relative;border-top:1px dashed #eee;padding-top:13px}.avue-dynamic__row:first-child{border-top:0}.avue-dynamic__menu{position:absolute;right:0;z-index:1024}.avue-dynamic__input{margin-right:8px;width:100%}.avue-dynamic__button{margin-bottom:0!important}

package/dist/components/fy-empty/index.js

@@ -1,5 +1,5 @@
 import { s as setPx } from "../../chunks/util.89913643.js";
-import { n as normalizeComponent } from "../../chunks/vueComponentNormalizer.bf552d98.js";
+import { n as normalizeComponent } from "../../chunks/vueComponentNormalizer.77ec6792.js";
 var render = function() {
   var _vm = this, _h = _vm.$createElement, _c = _vm._self._c || _h;
   return _c("div", {

package/dist/components/fy-empty/style.css

@@ -1,18 +1 @@
-.avue-empty {
-  margin: 0 8px;
-  font-size: 14px;
-  line-height: 22px;
-  text-align: center;
-}
-.avue-empty__image {
-  height: 100px;
-  margin-bottom: 8px;
-}
-.avue-empty__image img {
-  height: 100%;
-  vertical-align: middle;
-  border-style: none;
-}
-.avue-empty__desc {
-  color: #000000a6;
-}
+.avue-empty{margin:0 8px;font-size:14px;line-height:22px;text-align:center}.avue-empty__image{height:100px;margin-bottom:8px}.avue-empty__image img{height:100%;vertical-align:middle;border-style:none}.avue-empty__desc{color:#000000a6}

package/dist/components/fy-form/index.js

@@ -1,11 +1,27 @@
-import { d as detail } from "../../chunks/detail.6619700c.js";
+var __async = (__this, __arguments, generator) => new Promise((resolve, reject) => {
+  var fulfilled = (value) => {
+    try {
+      step(generator.next(value));
+    } catch (e) {
+      reject(e);
+    }
+  }, rejected = (value) => {
+    try {
+      step(generator.throw(value));
+    } catch (e) {
+      reject(e);
+    }
+  }, step = (x) => x.done ? resolve(x.value) : Promise.resolve(x.value).then(fulfilled, rejected);
+  step((generator = generator.apply(__this, __arguments)).next());
+});
+import { d as detail } from "../../chunks/detail.544c52b0.js";
 import { i as init } from "../../chunks/init.e0133910.js";
 import { s as setPx, d as deepClone, u as uploadFun, x as setAsVal, g as getAsVal, v as filterParams, D as DIC_PROPS, o as optVal, y as clearVal } from "../../chunks/util.89913643.js";
 import { b as calcCount, c as calcCascader, g as getComponent, a as getPlaceholder, f as formInitVal } from "../../chunks/dataformat.9cc4428a.js";
 import { s as sendDic } from "../../chunks/dic.9de2fe5a.js";
 import { p as packages } from "../../chunks/packages.419bde01.js";
 import { isBlank } from "@web-utils/core";
-import { n as normalizeComponent } from "../../chunks/vueComponentNormalizer.bf552d98.js";
+import { n as normalizeComponent } from "../../chunks/vueComponentNormalizer.77ec6792.js";
 const mock = (column, dic, defaultForm, run) => {
   if (!run)
     return;
@@ -693,9 +709,11 @@ const __vue2_script = {
       let key;
       return isBlank(column.display) ? this.isAdd ? key = "addDisplay" : this.isEdit ? key = "editDisplay" : this.isView && (key = "viewDisplay") : key = "display", key ? optVal(column[key], !0) : !0;
     },
-    async clearValidate(list) {
-      var _a;
-      (_a = this.$refs.form) == null || _a.clearValidate(list);
+    clearValidate(list) {
+      return __async(this, null, function* () {
+        var _a;
+        (_a = this.$refs.form) == null || _a.clearValidate(list);
+      });
     },
     validateCellForm() {
       return new Promise((resolve) => {

package/dist/components/fy-form/style.css

@@ -1,73 +1 @@
-.avue-form {
-  position: relative;
-  margin: 0 auto;
-  box-sizing: border-box;
-}
-.avue-form__item--top {
-  display: flex;
-  flex-direction: column;
-}
-.avue-form__item--top .el-form-item__label {
-  width: 100% !important;
-  text-align: left !important;
-}
-.avue-form__item--top .el-form-item__content {
-  margin-left: 0 !important;
-}
-.avue-form__item--left .el-form-item__label {
-  text-align: left !important;
-}
-.avue-form__menu {
-  padding: 5px 10px 0;
-  box-sizing: border-box;
-}
-.avue-form__menu--center {
-  text-align: center;
-}
-.avue-form__menu--center .el-button {
-  margin: 0 5px;
-}
-.avue-form__menu--left {
-  text-align: left;
-}
-.avue-form__menu--right {
-  text-align: right;
-}
-.avue-form__tabs {
-  padding: 0 10px;
-  box-sizing: border-box;
-}
-.avue-form__group {
-  align-items: flex-start;
-  flex-wrap: wrap;
-  height: auto;
-}
-.avue-form__group--flex {
-  display: flex;
-}
-.avue-form__group .el-col {
-  position: relative;
-}
-.avue-form__line {
-  display: inline-block;
-  height: 100%;
-}
-.avue-form__row--block {
-  width: 100%;
-  display: block;
-}
-.avue-form__row--cursor {
-  cursor: pointer;
-}
-.avue-form__option {
-  position: absolute;
-  right: 0;
-  top: -10px;
-  z-index: 999;
-}
-.avue-form__option i {
-  color: #666;
-}
-.avue-form__option i + i {
-  margin-left: 10px;
-}
+.avue-form{position:relative;margin:0 auto;box-sizing:border-box}.avue-form__item--top{display:flex;flex-direction:column}.avue-form__item--top .el-form-item__label{width:100%!important;text-align:left!important}.avue-form__item--top .el-form-item__content{margin-left:0!important}.avue-form__item--left .el-form-item__label{text-align:left!important}.avue-form__menu{padding:5px 10px 0;box-sizing:border-box}.avue-form__menu--center{text-align:center}.avue-form__menu--center .el-button{margin:0 5px}.avue-form__menu--left{text-align:left}.avue-form__menu--right{text-align:right}.avue-form__tabs{padding:0 10px;box-sizing:border-box}.avue-form__group{align-items:flex-start;flex-wrap:wrap;height:auto}.avue-form__group--flex{display:flex}.avue-form__group .el-col{position:relative}.avue-form__line{display:inline-block;height:100%}.avue-form__row--block{width:100%;display:block}.avue-form__row--cursor{cursor:pointer}.avue-form__option{position:absolute;right:0;top:-10px;z-index:999}.avue-form__option i{color:#666}.avue-form__option i+i{margin-left:10px}

package/dist/components/fy-form-design/index.js

@@ -1,9 +1,36 @@
+var __defProp = Object.defineProperty;
+var __getOwnPropSymbols = Object.getOwnPropertySymbols;
+var __hasOwnProp = Object.prototype.hasOwnProperty, __propIsEnum = Object.prototype.propertyIsEnumerable;
+var __defNormalProp = (obj2, key2, value) => key2 in obj2 ? __defProp(obj2, key2, { enumerable: !0, configurable: !0, writable: !0, value }) : obj2[key2] = value, __spreadValues = (a, b) => {
+  for (var prop in b || (b = {}))
+    __hasOwnProp.call(b, prop) && __defNormalProp(a, prop, b[prop]);
+  if (__getOwnPropSymbols)
+    for (var prop of __getOwnPropSymbols(b))
+      __propIsEnum.call(b, prop) && __defNormalProp(a, prop, b[prop]);
+  return a;
+};
+var __async = (__this, __arguments, generator) => new Promise((resolve2, reject2) => {
+  var fulfilled = (value) => {
+    try {
+      step(generator.next(value));
+    } catch (e2) {
+      reject2(e2);
+    }
+  }, rejected = (value) => {
+    try {
+      step(generator.throw(value));
+    } catch (e2) {
+      reject2(e2);
+    }
+  }, step = (x) => x.done ? resolve2(x.value) : Promise.resolve(x.value).then(fulfilled, rejected);
+  step((generator = generator.apply(__this, __arguments)).next());
+});
 import { isBlank } from "@web-utils/core";
 import * as monaco from "monaco-editor/esm/vs/editor/editor.api";
 import "monaco-editor/esm/vs/basic-languages/javascript/javascript.contribution";
 import { d as deepClone } from "../../chunks/util.89913643.js";
 import Draggable from "vuedraggable";
-import { n as normalizeComponent } from "../../chunks/vueComponentNormalizer.bf552d98.js";
+import { n as normalizeComponent } from "../../chunks/vueComponentNormalizer.77ec6792.js";
 const fields$1 = [
   {
     title: "布局字段",
@@ -625,13 +652,12 @@ const MonacoEditor = {
   methods: {
     initMonaco() {
       const { value, language, theme, readOnly, options: options2 } = this;
-      Object.assign(options2, this._editorBeforeMount()), this.editor = monaco.editor[this.diffEditor ? "createDiffEditor" : "create"](this.$el, {
+      Object.assign(options2, this._editorBeforeMount()), this.editor = monaco.editor[this.diffEditor ? "createDiffEditor" : "create"](this.$el, __spreadValues({
         value: typeof value == "string" ? value : convert(value),
         language,
         theme,
-        readOnly,
-        ...options2
-      }), this.diffEditor && this._setModel(this.value, this.original), this._editorMounted(this.editor);
+        readOnly
+      }, options2)), this.diffEditor && this._setModel(this.value, this.original), this._editorMounted(this.editor);
     },
     _handleFullScreen() {
       this.isMaximum ? this.minEditor() : this.maxEditor();
@@ -722,10 +748,7 @@ const MonacoEditor = {
           return deepClone(steps[index]);
         }
       }
-      this.historySteps = {
-        ...this.historySteps,
-        ...data
-      };
+      this.historySteps = __spreadValues(__spreadValues({}, this.historySteps), data);
       const { index, steps } = this.historySteps;
       return deepClone(steps[index]);
     },
@@ -1034,14 +1057,14 @@ const __vue2_script$q = {
         return;
       }
       const data2 = deepClone(column.children.column[newIndex]);
-      data2.prop || (data2.prop = `a${Date.now()}${Math.ceil(Math.random() * 99999)}`), data2.subfield = !0, delete data2.icon, this.$set(column.children.column, newIndex, { ...data2 }), this.selectWidget = column.children.column[newIndex], this.$emit("change");
+      data2.prop || (data2.prop = `a${Date.now()}${Math.ceil(Math.random() * 99999)}`), data2.subfield = !0, delete data2.icon, this.$set(column.children.column, newIndex, __spreadValues({}, data2)), this.selectWidget = column.children.column[newIndex], this.$emit("change");
     },
     handleWidgetTableSelect(data2) {
       this.selectWidget = data2;
     },
     handleWidgetTableClone(column, item) {
       const data2 = deepClone(item);
-      data2.prop = `a${Date.now()}${Math.ceil(Math.random() * 99999)}`, this.$set(column.children.column, column.children.column.length, { ...data2 }), this.$nextTick(() => {
+      data2.prop = `a${Date.now()}${Math.ceil(Math.random() * 99999)}`, this.$set(column.children.column, column.children.column.length, __spreadValues({}, data2)), this.$nextTick(() => {
         this.selectWidget = column.children.column[column.children.column.length - 1], this.$emit("change");
       });
     },
@@ -1293,7 +1316,7 @@ const __vue2_script$p = {
     },
     handleWidgetTableClone(column, item) {
       const data2 = deepClone(item);
-      data2.prop = `a${Date.now()}${Math.ceil(Math.random() * 99999)}`, this.$set(column.children.column, column.children.column.length, { ...data2 }), this.$nextTick(() => {
+      data2.prop = `a${Date.now()}${Math.ceil(Math.random() * 99999)}`, this.$set(column.children.column, column.children.column.length, __spreadValues({}, data2)), this.$nextTick(() => {
         this.selectWidget = column.children.column[column.children.column.length - 1], this.$emit("change");
       });
     },
@@ -1310,7 +1333,7 @@ const __vue2_script$p = {
         return;
       }
       const data2 = deepClone(column.children.column[newIndex]);
-      data2.prop || (data2.prop = `a${Date.now()}${Math.ceil(Math.random() * 99999)}`), delete data2.icon, data2.type === "dynamic" ? data2.span = 24 : data2.span = 12, this.$set(column.children.column, newIndex, { ...data2 }), this.selectWidget = column.children.column[newIndex], this.$emit("change");
+      data2.prop || (data2.prop = `a${Date.now()}${Math.ceil(Math.random() * 99999)}`), delete data2.icon, data2.type === "dynamic" ? data2.span = 24 : data2.span = 12, this.$set(column.children.column, newIndex, __spreadValues({}, data2)), this.selectWidget = column.children.column[newIndex], this.$emit("change");
     }
   }
 }, __cssModules$p = {};
@@ -7413,7 +7436,7 @@ const FyFormDesign_vue_vue_type_style_index_0_lang = "", __vue2_script = {
             console.error("非法配置"), options = { column: [] };
           }
         this.transAvueOptionsToFormDesigner(options).then((res) => {
-          this.widgetForm = { ...this.widgetForm, ...res };
+          this.widgetForm = __spreadValues(__spreadValues({}, this.widgetForm), res);
         });
       },
       deep: !0
@@ -7430,22 +7453,24 @@ const FyFormDesign_vue_vue_type_style_index_0_lang = "", __vue2_script = {
   },
   methods: {
     // 组件初始化时加载本地存储中的options(需开启storage),若不存在则读取用户配置的options
-    async handleLoadStorage() {
-      let options = this.options;
-      if (typeof options == "string")
-        try {
-          options = eval(`(${options})`);
-        } catch (e2) {
-          console.error("非法配置"), options = { column: [] };
-        }
-      options.column || (options.column = []), this.widgetForm = this.initHistory({
-        index: 0,
-        maxStep: 20,
-        steps: [await this.transAvueOptionsToFormDesigner({ ...this.widgetForm, ...options })],
-        storage: this.storage
-      }), this.undoRedo && window.addEventListener("keydown", (evt) => {
-        (evt.metaKey && !evt.shiftKey && evt.keyCode === 90 || evt.ctrlKey && !evt.shiftKey && evt.keyCode === 90) && (this.widgetForm = this.handleUndo()), (evt.metaKey && evt.shiftKey && evt.keyCode === 90 || evt.ctrlKey && evt.shiftKey && evt.keyCode === 90 || evt.ctrlKey && evt.keyCode === 89) && (this.widgetForm = this.handleRedo());
-      }, !1);
+    handleLoadStorage() {
+      return __async(this, null, function* () {
+        let options = this.options;
+        if (typeof options == "string")
+          try {
+            options = eval(`(${options})`);
+          } catch (e2) {
+            console.error("非法配置"), options = { column: [] };
+          }
+        options.column || (options.column = []), this.widgetForm = this.initHistory({
+          index: 0,
+          maxStep: 20,
+          steps: [yield this.transAvueOptionsToFormDesigner(__spreadValues(__spreadValues({}, this.widgetForm), options))],
+          storage: this.storage
+        }), this.undoRedo && window.addEventListener("keydown", (evt) => {
+          (evt.metaKey && !evt.shiftKey && evt.keyCode === 90 || evt.ctrlKey && !evt.shiftKey && evt.keyCode === 90) && (this.widgetForm = this.handleUndo()), (evt.metaKey && evt.shiftKey && evt.keyCode === 90 || evt.ctrlKey && evt.shiftKey && evt.keyCode === 90 || evt.ctrlKey && evt.keyCode === 89) && (this.widgetForm = this.handleRedo());
+        }, !1);
+      });
     },
     // 加载icon
     handleLoadCss() {
@@ -7487,20 +7512,18 @@ const FyFormDesign_vue_vue_type_style_index_0_lang = "", __vue2_script = {
     // 生成JSON - 弹窗 - 确定
     handleGenerate() {
       this.transformToAvueOptions(this.widgetForm).then((data2) => {
-        this.configOption.generateType && this.configOption.generateType === "string" ? this.$emit("submit", convert(data2, {
-          minify: !0,
-          ...this.configOption
-        })) : this.$emit("submit", data2);
+        this.configOption.generateType && this.configOption.generateType === "string" ? this.$emit("submit", convert(data2, __spreadValues({
+          minify: !0
+        }, this.configOption))) : this.$emit("submit", data2);
       });
     },
     // 生成JSON - 弹窗 - 拷贝
     handleCopy() {
       this.transformToAvueOptions(this.widgetForm).then((data2) => {
         this.$Clipboard({
-          text: convert(data2, {
-            minify: !0,
-            ...this.configOption
-          })
+          text: convert(data2, __spreadValues({
+            minify: !0
+          }, this.configOption))
         }).then(() => {
           this.$message.success("复制成功");
         }).catch(() => {
@@ -7709,17 +7732,18 @@ const FyFormDesign_vue_vue_type_style_index_0_lang = "", __vue2_script = {
         }
       });
     },
-    async getData(type = "json", option = {}) {
-      if (type === "string")
-        return convert(await this.transformToAvueOptions(this.widgetForm), {
-          minify: !0,
-          ...option
-        });
-      if (type === "app") {
-        const option2 = await this.transformToAvueOptions(this.widgetForm);
-        return this.parseJson(option2), option2;
-      } else
-        return await this.transformToAvueOptions(this.widgetForm);
+    getData() {
+      return __async(this, arguments, function* (type = "json", option = {}) {
+        if (type === "string")
+          return convert(yield this.transformToAvueOptions(this.widgetForm), __spreadValues({
+            minify: !0
+          }, option));
+        if (type === "app") {
+          const option2 = yield this.transformToAvueOptions(this.widgetForm);
+          return this.parseJson(option2), option2;
+        } else
+          return yield this.transformToAvueOptions(this.widgetForm);
+      });
     },
     parseJson(jsonObj) {
       for (const key2 in jsonObj) {