@tmagic/form 1.2.0-beta.8 → 1.2.0-beta.9

package/package.json

@@ -1,5 +1,5 @@
 {
-  "version": "1.2.0-beta.8",
+  "version": "1.2.0-beta.9",
   "name": "@tmagic/form",
   "sideEffects": [
     "dist/*",
@@ -35,8 +35,8 @@
   },
   "dependencies": {
     "@element-plus/icons-vue": "^2.0.9",
-    "@tmagic/design": "1.2.0-beta.8",
-    "@tmagic/utils": "1.2.0-beta.8",
+    "@tmagic/design": "1.2.0-beta.9",
+    "@tmagic/utils": "1.2.0-beta.9",
     "lodash-es": "^4.17.21",
     "sortablejs": "^1.14.0",
     "vue": "^3.2.37"

package/src/Form.vue

@@ -25,7 +25,7 @@
 </template>
 
 <script setup lang="ts">
-import { provide, reactive, ref, toRaw, watch } from 'vue';
+import { provide, reactive, ref, toRaw, watch, watchEffect } from 'vue';
 import cloneDeep from 'lodash-es/cloneDeep';
 import isEqual from 'lodash-es/isEqual';
 
@@ -96,6 +96,14 @@ const formState: FormState = reactive<FormState>({
   },
 });
 
+watchEffect(() => {
+  formState.initValues = props.initValues;
+  formState.config = props.config;
+  formState.keyProp = props.keyProp;
+  formState.popperClass = props.popperClass;
+  formState.parentValues = props.parentValues;
+});
+
 provide('mForm', formState);
 
 watch(

package/src/containers/Container.vue

@@ -97,7 +97,9 @@
     </template>
 
     <div style="text-align: center" v-if="config.expand && type !== 'fieldset'">
-      <TMagicButton text @click="expandHandler">{{ expand ? '收起配置' : '展开更多配置' }}</TMagicButton>
+      <TMagicButton type="primary" size="small" text @click="expandHandler">{{
+        expand ? '收起配置' : '展开更多配置'
+      }}</TMagicButton>
     </div>
   </div>
 </template>
@@ -177,11 +179,12 @@ const type = computed((): string => {
 });
 
 const display = computed((): boolean => {
-  if (props.config.display === 'expand') {
+  const value = displayFunction(mForm, props.config.display, props);
+
+  if (value === 'expand') {
     return expand.value;
   }
-
-  return displayFunction(mForm, props.config.display, props);
+  return value;
 });
 
 const itemLabelWidth = computed(() => props.config.labelWidth || props.labelWidth);

package/src/utils/form.ts

@@ -197,6 +197,10 @@ export const filterFunction = (mForm: FormState | undefined, config: any, props:
 };
 
 export const display = function (mForm: FormState | undefined, config: any, props: any) {
+  if (config === 'expand') {
+    return config;
+  }
+
   if (typeof config === 'function') {
     return filterFunction(mForm, config, props);
   }