@tmagic/editor 1.7.0-beta.2 → 1.7.0-beta.4

package/dist/tmagic-editor.umd.cjs

@@ -5136,7 +5136,8 @@
       prop: {},
       disabled: { type: Boolean, default: false },
       size: {},
-      lastValues: {}
+      lastValues: {},
+      isCompare: { type: Boolean }
     },
     emits: ["change"],
     setup(__props, { emit: __emit }) {
@@ -5174,7 +5175,8 @@
       prop: {},
       disabled: { type: Boolean },
       size: {},
-      lastValues: {}
+      lastValues: {},
+      isCompare: { type: Boolean }
     },
     emits: ["change"],
     setup(__props, { emit: __emit }) {
@@ -5261,7 +5263,8 @@
       prop: {},
       disabled: { type: Boolean },
       size: {},
-      lastValues: {}
+      lastValues: {},
+      isCompare: { type: Boolean }
     },
     emits: ["change"],
     setup(__props, { emit: __emit }) {
@@ -8071,7 +8074,8 @@
       prop: {},
       disabled: { type: Boolean, default: false },
       size: {},
-      lastValues: {}
+      lastValues: {},
+      isCompare: { type: Boolean }
     },
     emits: ["change"],
     setup(__props, { emit: __emit }) {
@@ -8117,40 +8121,29 @@
             }));
           }
           return [];
-        },
-        onChange: (formState, codeId, { setModel, model }) => {
-          paramsConfig.value = getParamItemsConfig(codeId);
-          if (paramsConfig.value.length) {
-            setModel("params", formPlugin.createValues(formState, paramsConfig.value, {}, model.params));
-          } else {
-            setModel("params", {});
-          }
-          return codeId;
         }
       };
-      const onCodeIdChangeHandler = (value, eventData) => {
-        props.model.params = value.params;
-        emit("change", props.model, {
-          changeRecords: eventData.changeRecords?.map((item) => ({
-            prop: `${props.prop.replace(props.name, "")}${item.propPath}`,
-            value: item.value
-          })) || [
-            {
-              propPath: props.prop,
-              value: value[props.name]
-            }
-          ]
+      const onCodeIdChangeHandler = (value) => {
+        paramsConfig.value = getParamItemsConfig(value);
+        const changeRecords = [
+          {
+            propPath: props.prop,
+            value
+          }
+        ];
+        changeRecords.push({
+          propPath: props.prop.replace(`${props.name}`, "params"),
+          value: paramsConfig.value.length ? formPlugin.createValues(mForm, paramsConfig.value, {}, props.model.params) : {}
+        });
+        emit("change", value, {
+          changeRecords
         });
       };
       const onParamsChangeHandler = (value, eventData) => {
-        props.model.params = value.params;
-        emit("change", props.model, {
-          ...eventData,
-          changeRecords: (eventData.changeRecords || []).map((item) => ({
-            prop: `${props.prop.replace(props.name, "")}${item.propPath}`,
-            value: item.value
-          }))
+        eventData.changeRecords?.forEach((record) => {
+          record.propPath = `${props.prop.replace(`${props.name}`, "")}${record.propPath}`;
         });
+        emit("change", props.model[props.name], eventData);
       };
       const editCode = (id) => {
         eventBus?.emit("edit-code", id);
@@ -8159,13 +8152,15 @@
         return vue.openBlock(), vue.createElementBlock("div", _hoisted_1$Z, [
           vue.createElementVNode("div", _hoisted_2$n, [
             vue.createCommentVNode(" 代码块下拉框 "),
-            vue.createVNode(vue.unref(formPlugin.MContainer), {
+            vue.createVNode(vue.unref(formPlugin.MSelect), {
               class: "select",
               config: selectConfig,
+              name: __props.name,
               model: __props.model,
               size: __props.size,
+              prop: __props.prop,
               onChange: onCodeIdChangeHandler
-            }, null, 8, ["model", "size"]),
+            }, null, 8, ["name", "model", "size", "prop"]),
             vue.createCommentVNode(" 查看/编辑按钮 "),
             __props.model[__props.name] && hasCodeBlockSidePanel.value ? (vue.openBlock(), vue.createBlock(vue.unref(designPlugin.TMagicButton), {
               key: 0,
@@ -8188,9 +8183,10 @@
             key: __props.model[__props.name],
             model: __props.model,
             size: __props.size,
+            disabled: __props.disabled,
             "params-config": paramsConfig.value,
             onChange: onParamsChangeHandler
-          }, null, 8, ["model", "size", "params-config"])) : vue.createCommentVNode("v-if", true)
+          }, null, 8, ["model", "size", "disabled", "params-config"])) : vue.createCommentVNode("v-if", true)
         ]);
       };
     }
@@ -8210,7 +8206,8 @@
       prop: {},
       disabled: { type: Boolean },
       size: {},
-      lastValues: {}
+      lastValues: {},
+      isCompare: { type: Boolean }
     },
     emits: ["change"],
     setup(__props, { emit: __emit }) {
@@ -8250,8 +8247,7 @@
       };
       return (_ctx, _cache) => {
         return vue.openBlock(), vue.createBlock(vue.unref(designPlugin.TMagicSelect), {
-          modelValue: __props.model[__props.name],
-          "onUpdate:modelValue": _cache[0] || (_cache[0] = ($event) => __props.model[__props.name] = $event),
+          "model-value": __props.model[__props.name],
           clearable: "",
           filterable: "",
           size: __props.size,
@@ -8290,7 +8286,7 @@
           ]),
           _: 1
           /* STABLE */
-        }, 8, ["modelValue", "size", "disabled"]);
+        }, 8, ["model-value", "size", "disabled"]);
       };
     }
   });
@@ -9008,7 +9004,8 @@
       prop: {},
       disabled: { type: Boolean, default: false },
       size: {},
-      lastValues: {}
+      lastValues: {},
+      isCompare: { type: Boolean }
     }, {
       "width": { default: 670 },
       "widthModifiers": {},
@@ -9550,7 +9547,8 @@
       prop: {},
       disabled: { type: Boolean, default: false },
       size: {},
-      lastValues: {}
+      lastValues: {},
+      isCompare: { type: Boolean }
     },
     emits: ["change"],
     setup(__props, { emit: __emit }) {
@@ -9689,7 +9687,6 @@
 
   const _hoisted_1$U = { style: { "display": "flex", "flex-direction": "column", "line-height": "1.2em" } };
   const _hoisted_2$l = { style: { "font-size": "10px", "color": "rgba(0, 0, 0, 0.6)" } };
-  const _hoisted_3$8 = { class: "el-input__inner t-input__inner" };
   const _sfc_main$1f = /* @__PURE__ */ vue.defineComponent({
     ...{
       name: "MFieldsDataSourceInput"
@@ -9704,12 +9701,14 @@
       prop: {},
       disabled: { type: Boolean, default: false },
       size: {},
-      lastValues: {}
+      lastValues: {},
+      isCompare: { type: Boolean }
     },
     emits: ["change"],
     setup(__props, { emit: __emit }) {
       const props = __props;
       const emit = __emit;
+      const adapterType = designPlugin.getDesignConfig("adapterType");
       const { dataSourceService, propsService } = useServices();
       const autocompleteRef = vue.useTemplateRef("autocomplete");
       const isFocused = vue.ref(false);
@@ -9924,62 +9923,83 @@
           "div",
           {
             key: 2,
-            class: vue.normalizeClass(`tmagic-data-source-input-text el-input t-input t-size-${__props.size?.[0]} el-input--${__props.size}`),
+            class: vue.normalizeClass({
+              "tmagic-data-source-input-text": true,
+              "el-input": vue.unref(adapterType) === "element-plus",
+              [`el-input--${__props.size}`]: vue.unref(adapterType) === "element-plus",
+              "t-input": vue.unref(adapterType) === "tdesign-vue-next",
+              [`t-size-${__props.size?.[0]}`]: vue.unref(adapterType) === "tdesign-vue-next"
+            }),
             onMouseup: mouseupHandler
           },
           [
             vue.createElementVNode(
               "div",
               {
-                class: vue.normalizeClass(`tmagic-data-source-input-text-wrapper el-input__wrapper ${isFocused.value ? " is-focus" : ""}`)
+                class: vue.normalizeClass({
+                  "tmagic-data-source-input-text-wrapper": true,
+                  "el-input__wrapper": vue.unref(adapterType) === "element-plus",
+                  "is-focus": isFocused.value
+                })
               },
               [
-                vue.createElementVNode("div", _hoisted_3$8, [
-                  (vue.openBlock(true), vue.createElementBlock(
-                    vue.Fragment,
-                    null,
-                    vue.renderList(displayState.value, (item, index) => {
-                      return vue.openBlock(), vue.createElementBlock(
-                        vue.Fragment,
-                        null,
-                        [
-                          item.type === "text" ? (vue.openBlock(), vue.createElementBlock(
-                            "span",
-                            {
+                vue.createElementVNode(
+                  "div",
+                  {
+                    class: vue.normalizeClass({
+                      "el-input__inner": vue.unref(adapterType) === "element-plus",
+                      input__inner: vue.unref(adapterType) === "tdesign-vue-next"
+                    })
+                  },
+                  [
+                    (vue.openBlock(true), vue.createElementBlock(
+                      vue.Fragment,
+                      null,
+                      vue.renderList(displayState.value, (item, index) => {
+                        return vue.openBlock(), vue.createElementBlock(
+                          vue.Fragment,
+                          null,
+                          [
+                            item.type === "text" ? (vue.openBlock(), vue.createElementBlock(
+                              "span",
+                              {
+                                key: index,
+                                style: { "margin-right": "2px" }
+                              },
+                              vue.toDisplayString(item.value),
+                              1
+                              /* TEXT */
+                            )) : vue.createCommentVNode("v-if", true),
+                            item.type === "var" ? (vue.openBlock(), vue.createBlock(vue.unref(designPlugin.TMagicTag), {
                               key: index,
-                              style: { "margin-right": "2px" }
-                            },
-                            vue.toDisplayString(item.value),
-                            1
-                            /* TEXT */
-                          )) : vue.createCommentVNode("v-if", true),
-                          item.type === "var" ? (vue.openBlock(), vue.createBlock(vue.unref(designPlugin.TMagicTag), {
-                            key: index,
-                            size: __props.size
-                          }, {
-                            default: vue.withCtx(() => [
-                              vue.createTextVNode(
-                                vue.toDisplayString(item.value),
-                                1
-                                /* TEXT */
-                              )
-                            ]),
-                            _: 2
-                            /* DYNAMIC */
-                          }, 1032, ["size"])) : vue.createCommentVNode("v-if", true)
-                        ],
-                        64
-                        /* STABLE_FRAGMENT */
-                      );
-                    }),
-                    256
-                    /* UNKEYED_FRAGMENT */
-                  )),
-                  vue.createVNode(_sfc_main$1r, {
-                    class: "tmagic-data-source-input-icon",
-                    icon: vue.unref(iconsVue.Coin)
-                  }, null, 8, ["icon"])
-                ])
+                              size: __props.size
+                            }, {
+                              default: vue.withCtx(() => [
+                                vue.createTextVNode(
+                                  vue.toDisplayString(item.value),
+                                  1
+                                  /* TEXT */
+                                )
+                              ]),
+                              _: 2
+                              /* DYNAMIC */
+                            }, 1032, ["size"])) : vue.createCommentVNode("v-if", true)
+                          ],
+                          64
+                          /* STABLE_FRAGMENT */
+                        );
+                      }),
+                      256
+                      /* UNKEYED_FRAGMENT */
+                    )),
+                    vue.createVNode(_sfc_main$1r, {
+                      class: "tmagic-data-source-input-icon",
+                      icon: vue.unref(iconsVue.Coin)
+                    }, null, 8, ["icon"])
+                  ],
+                  2
+                  /* CLASS */
+                )
               ],
               2
               /* CLASS */
@@ -10349,7 +10369,8 @@
       prop: {},
       disabled: { type: Boolean, default: false },
       size: {},
-      lastValues: {}
+      lastValues: {},
+      isCompare: { type: Boolean }
     },
     emits: ["change"],
     setup(__props, { emit: __emit }) {
@@ -10507,7 +10528,8 @@
       prop: {},
       disabled: { type: Boolean, default: false },
       size: {},
-      lastValues: {}
+      lastValues: {},
+      isCompare: { type: Boolean }
     },
     emits: ["change"],
     setup(__props, { emit: __emit }) {
@@ -10536,14 +10558,6 @@
         }));
       };
       const paramsConfig = vue.ref(getParamItemsConfig(props.model[props.name || "dataSourceMethod"]));
-      const setParamsConfig = (dataSourceMethod, formState = {}, setModel) => {
-        paramsConfig.value = dataSourceMethod ? getParamItemsConfig(dataSourceMethod) : [];
-        if (paramsConfig.value.length) {
-          setModel("params", formPlugin.createValues(formState, paramsConfig.value, {}, props.model.params));
-        } else {
-          setModel("params", {});
-        }
-      };
       const methodsOptions = vue.computed(
         () => dataSources.value?.filter((ds) => ds.methods?.length || dataSourceService.getFormMethod(ds.type).length)?.map((ds) => ({
           label: ds.title || ds.id,
@@ -10559,17 +10573,29 @@
       );
       const cascaderConfig = vue.computed(() => ({
         type: "cascader",
-        name: props.name,
-        options: methodsOptions.value,
-        disable: props.disabled,
-        onChange: (formState, dataSourceMethod, { setModel }) => {
-          setParamsConfig(dataSourceMethod, formState, setModel);
-          return dataSourceMethod;
-        }
+        options: methodsOptions.value
       }));
       const onChangeHandler = (value) => {
-        props.model.params = value.params;
-        emit("change", props.model);
+        paramsConfig.value = getParamItemsConfig(value);
+        const changeRecords = [
+          {
+            propPath: props.prop,
+            value
+          }
+        ];
+        changeRecords.push({
+          propPath: props.prop.replace(`${props.name}`, "params"),
+          value: paramsConfig.value.length ? formPlugin.createValues(mForm, paramsConfig.value, {}, props.model.params) : {}
+        });
+        emit("change", value, {
+          changeRecords
+        });
+      };
+      const onParamsChangeHandler = (value, eventData) => {
+        eventData.changeRecords?.forEach((record) => {
+          record.propPath = `${props.prop.replace(`${props.name}`, "")}${record.propPath}`;
+        });
+        emit("change", props.model[props.name], eventData);
       };
       const editCodeHandler = () => {
         const [id] = props.model[props.name];
@@ -10580,13 +10606,16 @@
       return (_ctx, _cache) => {
         return vue.openBlock(), vue.createElementBlock("div", _hoisted_1$R, [
           vue.createElementVNode("div", _hoisted_2$i, [
-            vue.createVNode(vue.unref(formPlugin.MContainer), {
+            vue.createVNode(vue.unref(formPlugin.MCascader), {
               class: "select",
               config: cascaderConfig.value,
               model: __props.model,
+              name: __props.name,
               size: __props.size,
+              disabled: __props.disabled,
+              prop: __props.prop,
               onChange: onChangeHandler
-            }, null, 8, ["config", "model", "size"]),
+            }, null, 8, ["config", "model", "name", "size", "disabled", "prop"]),
             __props.model[__props.name] && isCustomMethod.value && hasDataSourceSidePanel.value ? (vue.openBlock(), vue.createBlock(vue.unref(designPlugin.TMagicTooltip), {
               key: 0,
               content: notEditable.value ? "查看" : "编辑"
@@ -10611,13 +10640,13 @@
             }, 8, ["content"])) : vue.createCommentVNode("v-if", true)
           ]),
           paramsConfig.value.length ? (vue.openBlock(), vue.createBlock(_sfc_main$1m, {
-            key: 0,
             name: "params",
+            key: __props.model[__props.name],
             model: __props.model,
             size: __props.size,
             disabled: __props.disabled,
             "params-config": paramsConfig.value,
-            onChange: onChangeHandler
+            onChange: onParamsChangeHandler
           }, null, 8, ["model", "size", "disabled", "params-config"])) : vue.createCommentVNode("v-if", true)
         ]);
       };
@@ -10640,7 +10669,8 @@
       prop: {},
       disabled: { type: Boolean, default: false },
       size: {},
-      lastValues: {}
+      lastValues: {},
+      isCompare: { type: Boolean }
     }, {
       "width": { default: 670 },
       "widthModifiers": {},
@@ -10897,7 +10927,8 @@
       prop: {},
       disabled: { type: Boolean, default: false },
       size: {},
-      lastValues: {}
+      lastValues: {},
+      isCompare: { type: Boolean }
     },
     emits: ["change"],
     setup(__props, { emit: __emit }) {
@@ -10992,7 +11023,8 @@
       prop: {},
       disabled: { type: Boolean, default: false },
       size: {},
-      lastValues: {}
+      lastValues: {},
+      isCompare: { type: Boolean }
     },
     emits: ["change"],
     setup(__props, { emit: __emit }) {
@@ -11129,7 +11161,8 @@
       prop: {},
       disabled: { type: Boolean },
       size: {},
-      lastValues: {}
+      lastValues: {},
+      isCompare: { type: Boolean }
     },
     emits: ["change"],
     setup(__props, { emit: __emit }) {
@@ -11243,7 +11276,6 @@
           display: (mForm, { model }) => model.actionType === core.ActionType.COMP,
           onChange: (MForm, v, { setModel }) => {
             setModel("method", "");
-            return v;
           }
         };
         return { ...defaultTargetCompConfig, ...props.config.targetCompConfig };
@@ -11501,7 +11533,8 @@
       prop: {},
       disabled: { type: Boolean, default: false },
       size: {},
-      lastValues: {}
+      lastValues: {},
+      isCompare: { type: Boolean }
     },
     emits: ["change"],
     setup(__props, { emit: __emit }) {
@@ -11656,19 +11689,18 @@
       prop: {},
       disabled: { type: Boolean, default: false },
       size: {},
-      lastValues: {}
+      lastValues: {},
+      isCompare: { type: Boolean }
     },
     emits: ["change"],
     setup(__props, { emit: __emit }) {
       const { editorService } = useServices();
       const emit = __emit;
-      const props = __props;
       const pageList = vue.computed(
         () => editorService.get("root")?.items.filter((item) => item.type === core.NodeType.PAGE_FRAGMENT)
       );
       const selectConfig = {
         type: "select",
-        name: props.name,
         options: () => {
           if (pageList.value) {
             return pageList.value.map((item) => ({
@@ -11680,24 +11712,26 @@
           return [];
         }
       };
-      const changeHandler = async () => {
-        emit("change", props.model[props.name]);
+      const changeHandler = (v) => {
+        emit("change", v);
       };
       const editPageFragment = (id) => {
         editorService.select(id);
       };
       return (_ctx, _cache) => {
-        const _component_m_form_container = vue.resolveComponent("m-form-container");
         return vue.openBlock(), vue.createElementBlock("div", _hoisted_1$L, [
           vue.createElementVNode("div", _hoisted_2$e, [
             vue.createCommentVNode(" 页面片下拉框 "),
-            vue.createVNode(_component_m_form_container, {
+            vue.createVNode(vue.unref(formPlugin.MSelect), {
               class: "select",
               config: selectConfig,
               model: __props.model,
+              name: __props.name,
               size: __props.size,
+              prop: __props.prop,
+              disabled: __props.disabled,
               onChange: changeHandler
-            }, null, 8, ["model", "size"]),
+            }, null, 8, ["model", "name", "size", "prop", "disabled"]),
             vue.createCommentVNode(" 编辑按钮 "),
             __props.model[__props.name] ? (vue.openBlock(), vue.createBlock(_sfc_main$1r, {
               key: 0,
@@ -11725,7 +11759,8 @@
       prop: {},
       disabled: { type: Boolean },
       size: {},
-      lastValues: {}
+      lastValues: {},
+      isCompare: { type: Boolean }
     },
     emits: ["change"],
     setup(__props, { emit: __emit }) {
@@ -12880,7 +12915,8 @@
       prop: {},
       disabled: { type: Boolean },
       size: {},
-      lastValues: {}
+      lastValues: {},
+      isCompare: { type: Boolean }
     },
     emits: ["change"],
     setup(__props, { emit: __emit }) {
@@ -12984,7 +13020,8 @@
       prop: {},
       disabled: { type: Boolean },
       size: {},
-      lastValues: {}
+      lastValues: {},
+      isCompare: { type: Boolean }
     },
     emits: ["change"],
     setup(__props, { emit: __emit }) {
@@ -13005,7 +13042,6 @@
           id = utils.getIdFromEl()(detail) || id;
         }
         if (id) {
-          props.model[props.name] = id;
           emit("change", id);
           mForm?.$emit("field-change", props.prop, id);
         }
@@ -13024,7 +13060,6 @@
       };
       const deleteHandler = () => {
         if (props.model) {
-          props.model[props.name] = "";
           emit("change", "");
           mForm?.$emit("field-change", props.prop, "");
         }
@@ -18384,7 +18419,7 @@
           );
         }
       });
-      const resizeObserver = new ResizeObserver((entries) => {
+      const resizeObserver = new globalThis.ResizeObserver((entries) => {
         for (const { contentRect } of entries) {
           uiService.set("stageContainerRect", {
             width: contentRect.width,
@@ -19699,7 +19734,7 @@
     return keys.some((key, index) => {
       const field = f.find(({ name }) => name === key);
       f = field?.fields || [];
-      return field && field.type === "array" && // 不是整数
+      return field?.type === "array" && // 不是整数
       /^(?!\\d+$).*$/.test(\`\${keys[index + 1]}\`) && index < keys.length - 1;
     });
   };

package/package.json

@@ -1,5 +1,5 @@
 {
-  "version": "1.7.0-beta.2",
+  "version": "1.7.0-beta.4",
   "name": "@tmagic/editor",
   "type": "module",
   "sideEffects": [
@@ -46,37 +46,36 @@
     "typescript"
   ],
   "dependencies": {
-    "@element-plus/icons-vue": "^2.3.1",
+    "@element-plus/icons-vue": "^2.3.2",
     "buffer": "^6.0.3",
-    "color": "^3.1.3",
     "deep-object-diff": "^1.1.9",
-    "emmet-monaco-es": "^5.5.0",
+    "emmet-monaco-es": "^5.6.1",
     "events": "^3.3.0",
     "gesto": "^1.19.4",
     "keycon": "^1.4.0",
     "lodash-es": "^4.17.21",
     "moveable": "^0.53.0",
-    "serialize-javascript": "^6.0.2",
+    "serialize-javascript": "^7.0.0",
     "sortablejs": "^1.15.6",
-    "@tmagic/design": "1.7.0-beta.2",
-    "@tmagic/form": "1.7.0-beta.2",
-    "@tmagic/stage": "1.7.0-beta.2",
-    "@tmagic/table": "1.7.0-beta.2",
-    "@tmagic/utils": "1.7.0-beta.2"
+    "@tmagic/design": "1.7.0-beta.4",
+    "@tmagic/form": "1.7.0-beta.4",
+    "@tmagic/table": "1.7.0-beta.4",
+    "@tmagic/stage": "1.7.0-beta.4",
+    "@tmagic/utils": "1.7.0-beta.4"
   },
   "devDependencies": {
     "@types/events": "^3.0.3",
     "@types/lodash-es": "^4.17.4",
     "@types/serialize-javascript": "^5.0.4",
-    "@types/sortablejs": "^1.15.8",
+    "@types/sortablejs": "^1.15.9",
     "@vue/test-utils": "^2.4.6",
-    "type-fest": "^4.10.3"
+    "type-fest": "^5.2.0"
   },
   "peerDependencies": {
     "monaco-editor": "^0.48.0",
     "typescript": "^5.9.3",
-    "vue": "^3.5.22",
-    "@tmagic/core": "1.7.0-beta.2"
+    "vue": "^3.5.24",
+    "@tmagic/core": "1.7.0-beta.4"
   },
   "peerDependenciesMeta": {
     "typescript": {