@tmagic/form 1.0.0-beta.6 → 1.0.0-rc.2

package/dist/types/src/schema.d.ts

@@ -3,6 +3,7 @@
  */
 export declare type FormState = {
     config: FormConfig;
+    popperClass?: string;
     initValues: FormValue;
     values: FormValue;
     $emit: (event: string, ...args: any[]) => void;
@@ -137,6 +138,7 @@ export interface SelectGroupOption {
 }
 declare type SelectOptionFunction = (mForm: FormState | undefined, data: {
     model: any;
+    prop?: string;
     formValues: any;
     formValue: any;
 }) => SelectOption[] | SelectGroupOption[];

package/package.json

@@ -1,7 +1,10 @@
 {
-  "version": "1.0.0-beta.6",
+  "version": "1.0.0-rc.2",
   "name": "@tmagic/form",
-  "sideEffects": false,
+  "sideEffects": [
+    "dist/*",
+    "src/theme/*"
+  ],
   "main": "dist/tmagic-form.umd.js",
   "module": "dist/tmagic-form.es.js",
   "style": "dist/style.css",
@@ -14,10 +17,14 @@
     "./dist/style.css": {
       "import": "./dist/style.css",
       "require": "./dist/style.css"
-    }
+    },
+    "./*": "./*"
   },
+  "license": "Apache-2.0",
   "scripts": {
-    "build": "vite build"
+    "build": "vite build",
+    "test": "jest --maxWorkers=8",
+    "test:coverage": "jest --maxWorkers=16 --coverage"
   },
   "engines": {
     "node": ">=14"
@@ -28,25 +35,38 @@
   },
   "dependencies": {
     "@element-plus/icons": "0.0.11",
-    "@tmagic/utils": "^1.0.0-beta.6",
-    "element-plus": "^2.0.2",
+    "@tmagic/utils": "^1.0.0-rc.2",
+    "element-plus": "^2.2.0",
     "lodash-es": "^4.17.21",
-    "moment": "^2.29.1",
+    "moment": "^2.29.2",
     "sortablejs": "^1.14.0",
     "vue": "^3.2.0"
   },
+  "peerDependencies": {
+    "element-plus": "^2.2.0",
+    "vue": "^3.2.0"
+  },
   "devDependencies": {
+    "@babel/core": "^7.18.0",
+    "@types/jest": "^27.5.1",
     "@types/lodash-es": "^4.17.4",
     "@types/node": "^15.12.4",
     "@types/sortablejs": "^1.10.7",
     "@vitejs/plugin-vue": "^1.2.3",
     "@vitejs/plugin-vue-jsx": "^1.1.6",
     "@vue/compiler-sfc": "^3.2.0",
-    "@vue/test-utils": "^2.0.0-rc.12",
+    "@vue/test-utils": "^2.0.0-rc.20",
+    "@vue/vue3-jest": "^27.0.0-alpha.4",
+    "babel-jest": "^27.0.6",
+    "jest": "^27.5.1",
+    "jest-serializer-vue": "^2.0.2",
+    "jest-transform-stub": "^2.0.0",
     "sass": "^1.35.1",
+    "ts-jest": "^27.1.4",
     "typescript": "^4.3.4",
     "vite": "^2.3.7",
     "vite-plugin-dts": "^0.9.6",
     "vue-tsc": "^0.0.24"
-  }
+  },
+  "gitHead": "3e309780ed33640ab3fc986a93dd0e7b15c167e5"
 }

package/src/Form.vue

@@ -86,7 +86,7 @@ export default defineComponent({
     },
 
     size: {
-      type: String,
+      type: String as PropType<'small' | 'default' | 'large'>,
     },
 
     inline: {
@@ -103,6 +103,10 @@ export default defineComponent({
       type: String,
       default: '__key',
     },
+
+    popperClass: {
+      type: String,
+    },
   },
 
   emits: ['change', 'field-input', 'field-change'],
@@ -117,6 +121,7 @@ export default defineComponent({
 
     const formState: FormState = reactive<FormState>({
       keyProp: props.keyProp,
+      popperClass: props.popperClass,
       config: props.config,
       initValues: props.initValues,
       parentValues: props.parentValues,
@@ -172,7 +177,7 @@ export default defineComponent({
       submitForm: async (native?: boolean): Promise<any> => {
         try {
           await elForm.value?.validate();
-          return native ? values.value : cloneDeep(values.value);
+          return native ? values.value : cloneDeep(toRaw(values.value));
         } catch (invalidFields: any) {
           const error: string[] = [];
 

package/src/FormDialog.vue

@@ -78,7 +78,7 @@ export default defineComponent({
 
     labelWidth: [Number, String],
 
-    size: String as PropType<'mini' | 'small' | 'medium'>,
+    size: String as PropType<'small' | 'default' | 'large'>,
 
     confirmText: {
       type: String,

package/src/containers/Col.vue

@@ -0,0 +1,56 @@
+<template>
+  <el-col v-show="display && config.type !== 'hidden'" :span="span">
+    <m-form-container
+      :model="model"
+      :config="config"
+      :prop="prop"
+      :label-width="config.labelWidth || labelWidth"
+      :expand-more="expandMore"
+      :size="size"
+      @change="changeHandler"
+    ></m-form-container>
+  </el-col>
+</template>
+
+<script lang="ts">
+import { computed, defineComponent, inject, PropType } from 'vue';
+
+import { ChildConfig, FormState } from '../schema';
+import { display as displayFunction } from '../utils/form';
+
+export default defineComponent({
+  props: {
+    labelWidth: String,
+    expandMore: Boolean,
+    span: Number,
+
+    model: {
+      type: Object,
+      default: () => ({}),
+    },
+
+    config: {
+      type: Object as PropType<ChildConfig>,
+      default: () => ({}),
+    },
+
+    prop: String,
+
+    size: String,
+  },
+
+  emits: ['change'],
+
+  setup(props, { emit }) {
+    const mForm = inject<FormState | undefined>('mForm');
+
+    const changeHandler = () => emit('change', props.model);
+
+    return {
+      mForm,
+      display: computed(() => displayFunction(mForm, props.config.display, props)),
+      changeHandler,
+    };
+  },
+});
+</script>

package/src/containers/Container.vue

@@ -1,5 +1,10 @@
 <template>
-  <div v-if="config" :style="config.tip ? 'display: flex' : ''" :class="config.className" class="m-form-container">
+  <div
+    v-if="config"
+    :style="config.tip ? 'display: flex;align-items: baseline;' : ''"
+    :class="config.className"
+    class="m-form-container"
+  >
     <m-fields-hidden
       v-if="type === 'hidden'"
       :model="model"
@@ -20,15 +25,16 @@
       :prop="itemProp"
       :step-active="stepActive"
       :expand-more="expand"
-      :label-width="config.labelWidth || labelWidth"
+      :label-width="itemLabelWidth"
       @change="onChangeHandler"
     ></component>
 
     <template v-else-if="type && display">
       <el-form-item
         :style="config.tip ? 'flex: 1' : ''"
+        :class="{ hidden: itemLabelWidth === 0 || !config.text }"
         :prop="itemProp"
-        :label-width="config.text ? config.labelWidth || labelWidth : '0'"
+        :label-width="itemLabelWidth"
         :rules="rule"
       >
         <template #label><span v-html="type === 'checkbox' ? '' : config.text"></span></template>
@@ -65,8 +71,8 @@
         <div v-if="extra" v-html="extra" class="m-form-tip"></div>
       </el-form-item>
 
-      <el-tooltip v-if="config.tip" placement="top" style="line-height: 40px; margin-left: 5px">
-        <i class="el-icon-warning"></i>
+      <el-tooltip v-if="config.tip" placement="left">
+        <el-icon style="line-height: 40px; margin-left: 5px"><warning-filled /></el-icon>
         <template #content>
           <div v-html="config.tip"></div>
         </template>
@@ -83,7 +89,7 @@
           :size="size"
           :step-active="stepActive"
           :expand-more="expand"
-          :label-width="config.labelWidth || labelWidth"
+          :label-width="itemLabelWidth"
           :prop="itemProp"
           @change="onChangeHandler"
         ></m-form-container>
@@ -91,13 +97,14 @@
     </template>
 
     <div style="text-align: center" v-if="config.expand && type !== 'fieldset'">
-      <el-button type="text" @click="expandHandler">{{ expand ? '收起配置' : '展开更多配置' }}</el-button>
+      <el-button text @click="expandHandler">{{ expand ? '收起配置' : '展开更多配置' }}</el-button>
     </div>
   </div>
 </template>
 
 <script lang="ts">
 import { computed, defineComponent, inject, PropType, ref, resolveComponent, watchEffect } from 'vue';
+import { WarningFilled } from '@element-plus/icons';
 
 import { ChildConfig, ContainerCommonConfig, FormState, FormValue } from '../schema';
 import { display as displayFunction, filterFunction, getRules } from '../utils/form';
@@ -105,6 +112,8 @@ import { display as displayFunction, filterFunction, getRules } from '../utils/f
 export default defineComponent({
   name: 'm-form-container',
 
+  components: { WarningFilled },
+
   props: {
     labelWidth: String,
     expandMore: Boolean,
@@ -180,6 +189,8 @@ export default defineComponent({
       return displayFunction(mForm, props.config.display, props);
     });
 
+    const itemLabelWidth = computed(() => props.config.labelWidth || props.labelWidth);
+
     watchEffect(() => {
       expand.value = props.expandMore;
     });
@@ -224,10 +235,15 @@ export default defineComponent({
 
     const onChangeHandler = async function (v: FormValue, key?: string) {
       const { filter, onChange, trim, name, dynamicKey } = props.config as any;
-      let value: FormValue | number | string = filterHandler(filter, v);
-
-      value = (await changeHandler(onChange, value)) ?? value;
-      value = trimHandler(trim, value) ?? value;
+      let value: FormValue | number | string = v;
+
+      try {
+        value = filterHandler(filter, v);
+        value = (await changeHandler(onChange, value)) ?? value;
+        value = trimHandler(trim, value) ?? value;
+      } catch (e) {
+        console.error(e);
+      }
 
       // field内容下包含field-link时，model===value, 这里避免循环引用
       if ((name || name === 0) && props.model !== value && (v !== value || props.model[name] !== value)) {
@@ -250,6 +266,7 @@ export default defineComponent({
       itemProp,
       items,
       display,
+      itemLabelWidth,
       tagName,
       rule,
       tooltip,

package/src/containers/GroupListItem.vue

@@ -5,21 +5,21 @@
         ><caret-bottom v-if="expand" /><caret-right v-else
       /></el-icon>
 
-      <el-button type="text" @click="expandHandler">{{ title }}</el-button>
+      <el-button text @click="expandHandler">{{ title }}</el-button>
 
       <el-button
         v-show="showDelete(parseInt(String(index)))"
-        type="text"
+        text
         :icon="Delete"
         style="color: #f56c6c"
         @click="removeHandler"
       ></el-button>
 
       <template v-if="movable()">
-        <el-button v-show="index !== 0" type="text" size="small" @click="changeOrder(-1)"
+        <el-button v-show="index !== 0" text size="small" @click="changeOrder(-1)"
           >上移<el-icon><CaretRight /></el-icon
         ></el-button>
-        <el-button v-show="index !== length - 1" type="text" size="small" @click="changeOrder(1)"
+        <el-button v-show="index !== length - 1" text size="small" @click="changeOrder(1)"
           >下移<el-icon><CaretBottom /></el-icon
         ></el-button>
       </template>

package/src/containers/Row.vue

@@ -1,21 +1,17 @@
 <template>
   <el-row :gutter="10">
-    <el-col
+    <Col
       v-for="(col, index) in config.items"
-      :style="!display(col) || col.type === 'hidden' ? 'display: none' : ''"
       :key="col[mForm?.keyProp || '__key'] ?? index"
       :span="col.span || config.span || 24 / config.items.length"
-    >
-      <m-form-container
-        :model="name ? model[name] : model"
-        :config="col"
-        :prop="prop"
-        :label-width="config.labelWidth || labelWidth"
-        :expand-more="expandMore"
-        :size="size"
-        @change="changeHandler"
-      ></m-form-container>
-    </el-col>
+      :config="col"
+      :labelWidth="config.labelWidth || labelWidth"
+      :expandMore="expandMore"
+      :model="name ? model[name] : model"
+      :prop="prop"
+      :size="size"
+      @change="changeHandler"
+    />
   </el-row>
 </template>
 
@@ -23,11 +19,14 @@
 import { defineComponent, inject, PropType } from 'vue';
 
 import { FormState, RowConfig } from '../schema';
-import { display as displayFunction } from '../utils/form';
+
+import Col from './Col.vue';
 
 export default defineComponent({
   name: 'm-form-row',
 
+  components: { Col },
+
   props: {
     labelWidth: String,
     expandMore: Boolean,
@@ -58,9 +57,6 @@ export default defineComponent({
 
     return {
       mForm,
-      display(config: any) {
-        return displayFunction(mForm, config.display, props);
-      },
       changeHandler,
     };
   },

package/src/containers/Table.vue

@@ -25,8 +25,8 @@
             <template v-slot="scope">
               <el-button
                 v-show="showDelete(scope.$index + 1 + pagecontext * pagesize - 1)"
-                style="color: #f56c6c"
-                type="text"
+                type="danger"
+                text
                 :icon="Delete"
                 @click="removeHandler(scope.$index + 1 + pagecontext * pagesize - 1)"
               ></el-button>
@@ -43,8 +43,9 @@
                 <el-button
                   plain
                   size="small"
+                  type="primary"
                   :icon="ArrowUp"
-                  type="text"
+                  text
                   @click="upHandler(scope.$index + 1 + pagecontext * pagesize - 1)"
                   @dblclick="topHandler(scope.$index + 1 + pagecontext * pagesize - 1)"
                 ></el-button>
@@ -57,8 +58,9 @@
                 <el-button
                   plain
                   size="small"
+                  type="primary"
                   :icon="ArrowDown"
-                  type="text"
+                  text
                   @click="downHandler(scope.$index + 1 + pagecontext * pagesize - 1)"
                   @dblclick="bottomHandler(scope.$index + 1 + pagecontext * pagesize - 1)"
                 ></el-button>
@@ -107,10 +109,16 @@
       </el-tooltip>
       <slot></slot>
       <el-button v-if="addable" size="small" type="primary" plain @click="newHandler()">添加</el-button> &nbsp;
-      <el-button :icon="Grid" size="small" @click="toggleMode" v-if="enableToggleMode && !isFullscreen"
+      <el-button :icon="Grid" size="small" type="primary" @click="toggleMode" v-if="enableToggleMode && !isFullscreen"
         >展开配置</el-button
       >
-      <el-button :icon="FullScreen" size="small" @click="toggleFullscreen" v-if="config.enableFullscreen !== false">
+      <el-button
+        :icon="FullScreen"
+        size="small"
+        type="primary"
+        @click="toggleFullscreen"
+        v-if="config.enableFullscreen !== false"
+      >
         {{ isFullscreen ? '退出全屏' : '全屏编辑' }}
       </el-button>
       <el-upload

package/src/fields/Checkbox.vue

@@ -43,7 +43,7 @@ export default defineComponent({
           return props.config.activeValue;
         }
 
-        return 'true';
+        return undefined;
       }),
 
       inactiveValue: computed(() => {
@@ -55,7 +55,7 @@ export default defineComponent({
           return props.config.inactiveValue;
         }
 
-        return 'false';
+        return undefined;
       }),
 
       changeHandler(value: number | boolean) {

package/src/fields/Link.vue

@@ -2,7 +2,7 @@
   <a v-if="config.href && !disabled" target="_blank" :href="href" :style="config.css || {}">{{ displayText }}</a>
   <span v-else-if="config.href && disabled" :style="config.disabledCss || {}">{{ displayText }}</span>
   <div v-else class="m-fields-link">
-    <el-button type="text" @click="editHandler">点击编辑</el-button>
+    <el-button text type="primary" @click="editHandler">点击编辑</el-button>
     <m-form-dialog
       ref="editor"
       :title="config.formTitle || '编辑扩展配置'"

package/src/fields/Select.vue

@@ -7,6 +7,7 @@
     ref="select"
     clearable
     filterable
+    :popper-class="`m-select-popper ${popperClass}`"
     :size="size"
     :remote="remote"
     :placeholder="config.placeholder"
@@ -14,20 +15,15 @@
     :value-key="config.valueKey || 'value'"
     :allow-create="config.allowCreate"
     :disabled="disabled"
-    :remote-method="remoteMethod"
+    :remote-method="config.remote && remoteMethod"
     @change="changeHandler"
     @visible-change="visibleHandler"
   >
     <template v-if="config.group">
-      <el-option-group
-        v-for="(group, index) in options"
-        :key="group.label + index"
-        :label="group.label"
-        :disabled="group.disabled"
-      >
+      <el-option-group v-for="(group, index) in options" :key="index" :label="group.label" :disabled="group.disabled">
         <el-option
           v-for="(item, index) in group.options"
-          :key="item.label + index"
+          :key="index"
           :label="item.label"
           :value="item.value"
           :disabled="item.disabled"
@@ -288,6 +284,7 @@ export default defineComponent({
             Promise.resolve(
               props.config.options(mForm, {
                 model: props.model,
+                prop: props.prop,
                 formValues: mForm?.values,
                 formValue: mForm?.values,
               }),
@@ -346,13 +343,14 @@ export default defineComponent({
       remote,
       options,
       moreLoadingVisible,
+      popperClass: mForm?.popperClass,
+
+      getOptions,
 
       getRequestFuc() {
         return getConfig('request');
       },
 
-      async getInitOption() {},
-
       changeHandler(value: any) {
         emit('change', value);
       },
@@ -370,11 +368,6 @@ export default defineComponent({
         }
       },
 
-      async editAfterAction() {
-        pgIndex.value = 0;
-        options.value = await getOptions();
-      },
-
       async remoteMethod(q: string) {
         if (!localOptions.value.length) {
           query.value = q;

package/src/fields/Text.vue

@@ -14,7 +14,8 @@
       <el-button
         v-if="typeof config.append === 'object' && config.append.type === 'button'"
         style="color: #409eff"
-        @click="buttonClickHandler"
+        :size="size"
+        @click.prevent="buttonClickHandler"
       >
         {{ config.append.text }}
       </el-button>
@@ -43,6 +44,8 @@ export default defineComponent({
   emits: ['change', 'input'],
 
   setup(props, { emit }) {
+    const mForm = inject<FormState | undefined>('mForm');
+
     useAddField(props.prop);
 
     const modelName = computed(() => props.name || props.config.name || '');
@@ -54,14 +57,11 @@ export default defineComponent({
       },
 
       inputHandler(v: string | number) {
-        const mForm = inject<FormState | undefined>('mForm');
         emit('input', v);
         mForm?.$emit('field-input', props.prop, v);
       },
 
       buttonClickHandler() {
-        const mForm = inject<FormState | undefined>('mForm');
-
         if (typeof props.config.append === 'string') return;
 
         if (props.config.append?.handler) {

package/src/fields/Textarea.vue

@@ -1,17 +1,15 @@
 <template>
-  <div v-if="model">
-    <el-input
-      v-model="model[name]"
-      type="textarea"
-      :size="size"
-      clearable
-      :placeholder="config.placeholder"
-      :disabled="disabled"
-      @change="changeHandler"
-      @input="inputHandler"
-    >
-    </el-input>
-  </div>
+  <el-input
+    v-model="model[name]"
+    type="textarea"
+    :size="size"
+    clearable
+    :placeholder="config.placeholder"
+    :disabled="disabled"
+    @change="changeHandler"
+    @input="inputHandler"
+  >
+  </el-input>
 </template>
 
 <script lang="ts">

package/src/schema.ts

@@ -21,6 +21,7 @@
  */
 export type FormState = {
   config: FormConfig;
+  popperClass?: string;
   initValues: FormValue;
   values: FormValue;
   $emit: (event: string, ...args: any[]) => void;
@@ -187,6 +188,7 @@ type SelectOptionFunction = (
   mForm: FormState | undefined,
   data: {
     model: any;
+    prop?: string;
     formValues: any;
     formValue: any;
   },

package/src/theme/form.scss

@@ -2,29 +2,36 @@
 .fade-leave-active {
   transition: opacity 0.5s;
 }
+
 .fade-enter, .fade-leave-to /* .fade-leave-active below version 2.1.8 */ {
   opacity: 0;
 }
 
-.m-form,
-.m-form-panel.el-card .el-card__body {
-  color: #333;
-  background-color: #fff;
-}
+.m-form {
+  .m-form-tip {
+    color: rgba(0, 0, 0, 0.45);
+    font-size: 12px;
+    transition: color 0.3s cubic-bezier(0.215, 0.61, 0.355, 1);
+  }
 
-.m-form .m-form-tip {
-  color: rgba(0, 0, 0, 0.45);
-  font-size: 12px;
-  transition: color 0.3s cubic-bezier(0.215, 0.61, 0.355, 1);
-}
+  .m-form-schematic {
+    max-width: 50%;
+    height: 100%;
+  }
 
-.m-form .m-form-schematic {
-  max-width: 50%;
-  height: 100%;
-}
+  .el-table {
+    .cell > div.m-form-container {
+      display: block;
+    }
+  }
+
+  .el-tabs {
+    margin-bottom: 10px;
+  }
 
-.el-table {
-  .cell > div.m-form-container {
-    display: block;
+  .el-form-item.hidden {
+    .el-form-item__label {
+      display: none;
+    }
   }
 }