Merge branch 'temp' of http://123.60.103.97:3000/xuziqiang/SaaS-lib into temp

lib/component/form/form/form.vue

@@ -121,14 +121,8 @@
       provide('addChildForm', addChildForm);
 
       const getFormClass = computed(() => {
-        if (props.formLayout === 'flexVertical') {
-          return formConfig.formLayout.flexVertical;
-        }
-        if (props.formLayout === 'flex') {
-          return formConfig.formLayout.flex;
-        }
-        if (props.formLayout === 'flexv2') {
-          return formConfig.formLayout.flexv2;
+        if (props.formLayout) {
+          return formConfig.formLayout[props.formLayout as keyof typeof formConfig.formLayout];
         }
         return formConfig.formLayout.vertical;
       });

lib/component/tree/props.ts

@@ -14,6 +14,7 @@ export const treeProps = {
     type: [String, Object, Function] as PropType<string | Function | AxiosRequestConfig>,
     default: undefined,
   },
+  treeData: PropTypes.array.def([]),
   params: PropTypes.object.def(() => ({})),
   dynamicParams: PropTypes.oneOfType([
     PropTypes.string,

lib/component/tree/tree-api.vue

@@ -10,10 +10,10 @@
       </div>
     </div>
 
-    <div style="min-height: 300px">
+    <div style="min-height: 300px; overflow-y: scroll">
       <ns-tree v-if="treeData?.length" v-bind="getBindValue" v-model:selectedKeys="selectedKeys">
         <template #[item]="data" v-for="(item, index) in Object.keys($slots)" :key="index">
-          <slot :name="item" v-bind="data || {}"></slot>
+          <slot :name="item" v-bind="{ ...data, formModel } || {}"></slot>
         </template>
       </ns-tree>
       <!-- <a-empty v-if="!treeData?.length" /> -->
@@ -21,7 +21,7 @@
   </a-spin>
 </template>
 <script lang="ts" setup>
-  import { computed, nextTick, reactive, ref, unref, useAttrs } from 'vue';
+  import { computed, nextTick, reactive, ref, unref, useAttrs, watch } from 'vue';
   import { TreeDataItem } from 'ant-design-vue/es/tree/Tree';
   import { useApi } from '/nerv-lib/use/use-api';
   import { AxiosRequestConfig } from 'axios';
@@ -33,16 +33,28 @@
   defineOptions({
     name: 'NsTreeApi',
   });
+  const emit = defineEmits(['update:treeData']);
+  // const model = defineModel('treeData');
 
   const formElRef = ref();
   const props = defineProps(treeProps);
-  const treeData = ref<TreeDataItem[]>([]);
+
+  const treeData = ref(props.treeData);
   const selectedKeys = ref(props.selectedKeys || []);
   const { httpRequest } = useApi();
   const requestConfig: AxiosRequestConfig = { method: 'get' };
   const route = useRoute();
   const attrs = useAttrs();
   const formModel = reactive({});
+  watch(
+    () => props.treeData,
+    (val) => {
+      treeData.value = val;
+    },
+    {
+      deep: true,
+    },
+  );
   const treeState = reactive({
     loading: false,
   });
@@ -56,6 +68,7 @@
     return props.isSticky ? 'sticky' : 'static';
   });
   const formFinish = debounce((data: object) => {
+    selectedKeys.value = [];
     getData(data);
   }, 200);
   const getBindValue = computed(() => ({
@@ -83,6 +96,8 @@
     })
       .then((res) => {
         treeData.value = transform(get(res, resultField));
+        emit('update:treeData', treeData.value);
+        // model.value = treeData.value;
       })
       .finally(() => {
         setLoading(false);