@epic-designer/antd 1.1.4-beta.2 → 1.1.4-beta.4

package/dist/chunks/input.cjs

@@ -6,14 +6,17 @@ const antDesignVue = require('ant-design-vue');
 const _sfc_main = /* @__PURE__ */ vue.defineComponent({
   __name: "input",
   props: {
-    componentSchema: { type: Object, required: true },
+    componentSchema: { type: Object, required: false, default: () => ({
+      field: "",
+      type: "input"
+    }) },
     options: { type: Array, required: false, default: () => [] },
     remoteSelector: { type: Boolean, required: false, default: false }
   },
   setup(__props) {
     const props = __props;
-    const eventBus = vue.inject("eventBus");
-    const fromData = vue.inject("fromData", {});
+    const formData = vue.inject("formData", {});
+    const eventBus = vue.inject("eventBus", null);
     const handleRemoteSelector = () => {
       eventBus == null ? void 0 : eventBus.emit("openRemoteSelector", props.componentSchema, props.options);
     };
@@ -21,9 +24,7 @@ const _sfc_main = /* @__PURE__ */ vue.defineComponent({
       if (data.nodeId !== props.componentSchema.id) {
         return;
       }
-      console.log("setRemoteSelectorData", data.record);
-      console.log("fromData", fromData);
-      fromData[props.componentSchema.field] = data.record.value;
+      formData[props.componentSchema.field] = data.record.value;
     });
     return (_ctx, _cache) => {
       return vue.openBlock(), vue.createBlock(
@@ -36,11 +37,10 @@ const _sfc_main = /* @__PURE__ */ vue.defineComponent({
           props.remoteSelector ? {
             name: "suffix",
             fn: vue.withCtx(() => [
-              props.remoteSelector ? (vue.openBlock(), vue.createElementBlock("span", {
-                key: 0,
+              vue.createElementVNode("span", {
                 onClick: handleRemoteSelector,
-                class: "iconfont icon--epic--search-rounded icon--epic"
-              })) : vue.createCommentVNode("v-if", true)
+                class: "iconfont icon--epic icon--epic--search-rounded"
+              })
             ]),
             key: "0"
           } : void 0

package/dist/chunks/input.mjs

@@ -1,17 +1,20 @@
-import { defineComponent, inject, createBlock, openBlock, unref, createSlots, withCtx, createElementBlock, createCommentVNode } from 'vue';
+import { defineComponent, inject, createBlock, openBlock, unref, createSlots, withCtx, createElementVNode } from 'vue';
 import { Input } from 'ant-design-vue';
 
 const _sfc_main = /* @__PURE__ */ defineComponent({
   __name: "input",
   props: {
-    componentSchema: { type: Object, required: true },
+    componentSchema: { type: Object, required: false, default: () => ({
+      field: "",
+      type: "input"
+    }) },
     options: { type: Array, required: false, default: () => [] },
     remoteSelector: { type: Boolean, required: false, default: false }
   },
   setup(__props) {
     const props = __props;
-    const eventBus = inject("eventBus");
-    const fromData = inject("fromData", {});
+    const formData = inject("formData", {});
+    const eventBus = inject("eventBus", null);
     const handleRemoteSelector = () => {
       eventBus == null ? void 0 : eventBus.emit("openRemoteSelector", props.componentSchema, props.options);
     };
@@ -19,9 +22,7 @@ const _sfc_main = /* @__PURE__ */ defineComponent({
       if (data.nodeId !== props.componentSchema.id) {
         return;
       }
-      console.log("setRemoteSelectorData", data.record);
-      console.log("fromData", fromData);
-      fromData[props.componentSchema.field] = data.record.value;
+      formData[props.componentSchema.field] = data.record.value;
     });
     return (_ctx, _cache) => {
       return openBlock(), createBlock(
@@ -34,11 +35,10 @@ const _sfc_main = /* @__PURE__ */ defineComponent({
           props.remoteSelector ? {
             name: "suffix",
             fn: withCtx(() => [
-              props.remoteSelector ? (openBlock(), createElementBlock("span", {
-                key: 0,
+              createElementVNode("span", {
                 onClick: handleRemoteSelector,
-                class: "iconfont icon--epic--search-rounded icon--epic"
-              })) : createCommentVNode("v-if", true)
+                class: "iconfont icon--epic icon--epic--search-rounded"
+              })
             ]),
             key: "0"
           } : void 0

package/dist/chunks/modal.cjs

@@ -4,7 +4,10 @@ const vue = require('vue');
 const antDesignVue = require('ant-design-vue');
 
 const _hoisted_1 = { class: "epic-modal-main epic-scoped" };
-const _hoisted_2 = { class: "epic-modal-footer" };
+const _hoisted_2 = {
+  key: 0,
+  class: "epic-modal-footer"
+};
 const _sfc_main = /* @__PURE__ */ vue.defineComponent({
   __name: "modal",
   props: {
@@ -12,6 +15,8 @@ const _sfc_main = /* @__PURE__ */ vue.defineComponent({
     componentSchema: { type: Object, required: false, default: () => ({
       type: "modal"
     }) },
+    fixedHeight: { type: Boolean, required: false, default: true },
+    footer: { type: Boolean, required: false, default: true },
     hideConfirm: { type: Boolean, required: false },
     okText: { type: String, required: false, default: "\u786E\u5B9A" }
   },
@@ -32,22 +37,21 @@ const _sfc_main = /* @__PURE__ */ vue.defineComponent({
       top: "56px",
       width: "auto"
     };
-    const bodyStyle = {
-      height: "calc(100vh - 108px)",
-      padding: 0
-    };
     const getProps = vue.computed(() => {
       var _a, _b;
       return {
         ...props.componentSchema,
         ...attrs,
-        bodyStyle,
+        bodyStyle: {
+          height: props.fixedHeight ? "calc(100vh - 108px)" : "auto",
+          padding: 0
+        },
         dialogStyle,
         footer: null,
         "onUpdate:open": updateModelValue,
         "onUpdate:visible": updateModelValue,
         open: attrs.modelValue,
-        style: "top:20px",
+        style: props.fixedHeight ? "top:20px" : "",
         title: (_b = (_a = props.componentSchema) == null ? void 0 : _a.label) != null ? _b : "",
         visible: firstNumber > 3 ? void 0 : attrs.modelValue,
         wrapClassName: "epic-modal-ant",
@@ -88,7 +92,7 @@ const _sfc_main = /* @__PURE__ */ vue.defineComponent({
                 ])
               ])
             ]),
-            vue.createElementVNode("div", _hoisted_2, [
+            props.footer ? (vue.openBlock(), vue.createElementBlock("div", _hoisted_2, [
               vue.createVNode(vue.unref(antDesignVue.Space), { align: "end" }, {
                 default: vue.withCtx(() => [
                   vue.createVNode(vue.unref(antDesignVue.Button), { onClick: handleClose }, {
@@ -121,7 +125,7 @@ const _sfc_main = /* @__PURE__ */ vue.defineComponent({
                 _: 1
                 /* STABLE */
               })
-            ])
+            ])) : vue.createCommentVNode("v-if", true)
           ]),
           _: 3
           /* FORWARDED */

package/dist/chunks/modal.mjs

@@ -1,8 +1,11 @@
-import { defineComponent, useAttrs, computed, createBlock, openBlock, unref, normalizeProps, guardReactiveProps, withCtx, createElementVNode, renderSlot, createElementBlock, Fragment, renderList, createVNode, createCommentVNode, createTextVNode, toDisplayString } from 'vue';
+import { defineComponent, useAttrs, computed, createBlock, openBlock, unref, normalizeProps, guardReactiveProps, withCtx, createElementVNode, createElementBlock, createCommentVNode, renderSlot, Fragment, renderList, createVNode, createTextVNode, toDisplayString } from 'vue';
 import { version, Modal, Space, Button } from 'ant-design-vue';
 
 const _hoisted_1 = { class: "epic-modal-main epic-scoped" };
-const _hoisted_2 = { class: "epic-modal-footer" };
+const _hoisted_2 = {
+  key: 0,
+  class: "epic-modal-footer"
+};
 const _sfc_main = /* @__PURE__ */ defineComponent({
   __name: "modal",
   props: {
@@ -10,6 +13,8 @@ const _sfc_main = /* @__PURE__ */ defineComponent({
     componentSchema: { type: Object, required: false, default: () => ({
       type: "modal"
     }) },
+    fixedHeight: { type: Boolean, required: false, default: true },
+    footer: { type: Boolean, required: false, default: true },
     hideConfirm: { type: Boolean, required: false },
     okText: { type: String, required: false, default: "\u786E\u5B9A" }
   },
@@ -30,22 +35,21 @@ const _sfc_main = /* @__PURE__ */ defineComponent({
       top: "56px",
       width: "auto"
     };
-    const bodyStyle = {
-      height: "calc(100vh - 108px)",
-      padding: 0
-    };
     const getProps = computed(() => {
       var _a, _b;
       return {
         ...props.componentSchema,
         ...attrs,
-        bodyStyle,
+        bodyStyle: {
+          height: props.fixedHeight ? "calc(100vh - 108px)" : "auto",
+          padding: 0
+        },
         dialogStyle,
         footer: null,
         "onUpdate:open": updateModelValue,
         "onUpdate:visible": updateModelValue,
         open: attrs.modelValue,
-        style: "top:20px",
+        style: props.fixedHeight ? "top:20px" : "",
         title: (_b = (_a = props.componentSchema) == null ? void 0 : _a.label) != null ? _b : "",
         visible: firstNumber > 3 ? void 0 : attrs.modelValue,
         wrapClassName: "epic-modal-ant",
@@ -86,7 +90,7 @@ const _sfc_main = /* @__PURE__ */ defineComponent({
                 ])
               ])
             ]),
-            createElementVNode("div", _hoisted_2, [
+            props.footer ? (openBlock(), createElementBlock("div", _hoisted_2, [
               createVNode(unref(Space), { align: "end" }, {
                 default: withCtx(() => [
                   createVNode(unref(Button), { onClick: handleClose }, {
@@ -119,7 +123,7 @@ const _sfc_main = /* @__PURE__ */ defineComponent({
                 _: 1
                 /* STABLE */
               })
-            ])
+            ])) : createCommentVNode("v-if", true)
           ]),
           _: 3
           /* FORWARDED */

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@epic-designer/antd",
-  "version": "1.1.4-beta.2",
+  "version": "1.1.4-beta.4",
   "description": "epic-designer base antd ui",
   "private": false,
   "author": "kchengz",

package/src/input/input.vue

@@ -1,48 +1,49 @@
-<script lang="ts" setup>
-import type { ComponentSchema } from '@epic-designer/types';
-
-import { inject } from 'vue';
-
-import { EventBus } from '@epic-designer/hooks';
-import { Input } from 'ant-design-vue';
-
-const props = withDefaults(
-  defineProps<{
-    componentSchema: ComponentSchema;
-    options?: any[];
-    remoteSelector?: boolean;
-  }>(),
-  {
-    options: () => [],
-    remoteSelector: false,
-  },
-);
-
-const eventBus = inject<EventBus>('eventBus');
-const fromData = inject<any>('fromData', {});
-
-const handleRemoteSelector = () => {
-  eventBus?.emit('openRemoteSelector', props.componentSchema, props.options);
-};
-
-eventBus?.on('setRemoteSelectorData', (data: any) => {
-  // 检查是否是当前组件的返回数据,如果不是则不处理
-  if (data.nodeId !== props.componentSchema.id) {
-    return;
-  }
-  console.log('setRemoteSelectorData', data.record);
-  console.log('fromData', fromData);
-  fromData[props.componentSchema.field!] = data.record.value;
-});
-</script>
-<template>
-  <Input>
-    <template #suffix v-if="props.remoteSelector">
-      <span
-        v-if="props.remoteSelector"
-        @click="handleRemoteSelector"
-        class="iconfont icon--epic--search-rounded icon--epic"
-      ></span>
-    </template>
-  </Input>
-</template>
+<script lang="ts" setup>
+import type { ComponentSchema } from '@epic-designer/types';
+
+import { inject } from 'vue';
+
+import { EventBus } from '@epic-designer/hooks';
+import { Input } from 'ant-design-vue';
+
+const props = withDefaults(
+  defineProps<{
+    componentSchema?: ComponentSchema;
+    options?: any[];
+    remoteSelector?: boolean;
+  }>(),
+  {
+    componentSchema: () => ({
+      field: '',
+      type: 'input',
+    }),
+    options: () => [],
+    remoteSelector: false,
+  },
+);
+
+const formData = inject<Record<string, any>>('formData', {});
+const eventBus = inject<EventBus | null>('eventBus', null);
+
+const handleRemoteSelector = () => {
+  eventBus?.emit('openRemoteSelector', props.componentSchema, props.options);
+};
+
+eventBus?.on('setRemoteSelectorData', (data) => {
+  if (data.nodeId !== props.componentSchema.id) {
+    return;
+  }
+
+  formData[props.componentSchema.field!] = data.record.value;
+});
+</script>
+<template>
+  <Input>
+    <template #suffix v-if="props.remoteSelector">
+      <span
+        @click="handleRemoteSelector"
+        class="iconfont icon--epic icon--epic--search-rounded"
+      ></span>
+    </template>
+  </Input>
+</template>

package/src/modal/modal.vue

@@ -9,6 +9,8 @@ const props = withDefaults(
   defineProps<{
     cancelText?: string;
     componentSchema?: ComponentSchema;
+    fixedHeight?: boolean;
+    footer?: boolean;
     hideConfirm?: boolean;
     okText?: string;
   }>(),
@@ -17,6 +19,8 @@ const props = withDefaults(
     componentSchema: () => ({
       type: 'modal',
     }),
+    fixedHeight: true,
+    footer: true,
     okText: '确定',
   },
 );
@@ -37,21 +41,19 @@ const dialogStyle = {
   width: 'auto',
 };
 
-const bodyStyle = {
-  height: 'calc(100vh - 108px)',
-  padding: 0,
-};
-
 const getProps = computed<Record<string, any>>(() => ({
   ...props.componentSchema,
   ...attrs,
-  bodyStyle,
+  bodyStyle: {
+    height: props.fixedHeight ? 'calc(100vh - 108px)' : 'auto',
+    padding: 0,
+  },
   dialogStyle,
   footer: null,
   'onUpdate:open': updateModelValue,
   'onUpdate:visible': updateModelValue,
   open: attrs.modelValue,
-  style: 'top:20px',
+  style: props.fixedHeight ? 'top:20px' : '',
   title: props.componentSchema?.label ?? '',
   visible: firstNumber > 3 ? undefined : attrs.modelValue,
   wrapClassName: 'epic-modal-ant',
@@ -86,7 +88,7 @@ function handleClose() {
         </slot>
       </slot>
     </div>
-    <div class="epic-modal-footer">
+    <div v-if="props.footer" class="epic-modal-footer">
       <Space align="end">
         <Button @click="handleClose"> {{ props.cancelText }} </Button>
         <Button v-if="!props.hideConfirm" type="primary" @click="handleOk">