chore: upgrade deps

buqiyuan · Apr 1, 2022 · 9f2d268 · 9f2d268
1 parent 1ee3376
commit 9f2d268
Show file tree

Hide file tree

Showing 9 changed files with 22 additions and 16 deletions.
diff --git a/.gitignore b/.gitignore
@@ -17,7 +17,7 @@ tests/server/static/upload
 npm-debug.log*
 yarn-debug.log*
 yarn-error.log*
-pnpm-debug.log*
+*pnpm-debug.log*
 
 # Editor directories and files
 .idea

diff --git a/package.json b/package.json
@@ -30,7 +30,7 @@
     "@ant-design/icons-vue": "^6.1.0",
     "@vue/runtime-core": "^3.2.31",
     "@vueuse/core": "^8.2.3",
-    "ant-design-vue": "3.1.0-rc.2",
+    "ant-design-vue": "3.1.0-rc.6",
     "axios": "^0.26.1",
     "core-js": "^3.21.1",
     "dayjs": "^1.11.0",

diff --git a/pnpm-lock.yaml b/pnpm-lock.yaml
diff --git a/src/components/basic/image-preview/index.tsx b/src/components/basic/image-preview/index.tsx
@@ -10,7 +10,7 @@ interface PreviewType extends ImagePreviewType {
 
 export default defineComponent({
   props: {
-    ...imageProps,
+    ...imageProps(),
     preview: {
       type: Object as PropType<PreviewType | boolean>,
     },

diff --git a/src/components/core/schema-form/src/schema-form.ts b/src/components/core/schema-form/src/schema-form.ts
@@ -10,7 +10,7 @@ import { isObject } from '@/utils/is';
 export const aFormPropKeys = Object.keys(formProps);
 
 export const schemaFormProps = {
-  ...formProps,
+  ...formProps(),
   layout: {
     type: String as PropType<FormProps['layout']>,
     default: 'horizontal',

diff --git a/src/views/demos/form/basic-form/form-schema.tsx b/src/views/demos/form/basic-form/form-schema.tsx
@@ -334,14 +334,9 @@ export const schemas: FormSchema[] = [
   },
   {
     field: 'field34',
-    component: ({ formModel, schema, field }) => {
+    component: ({ schema }) => {
       const options = schema.componentProps?.requestResult || [];
-      return (
-        <Radio.Group
-          v-model={[formModel[field], 'value']}
-          options={options.slice(0, 2)}
-        ></Radio.Group>
-      );
+      return <Radio.Group options={options.slice(0, 2)}></Radio.Group>;
     },
     label: '远程Radio',
     helpMessage: ['RadioGroup组件', '使用接口提供的数据生成选项'],

diff --git a/src/views/demos/form/basic-form/index.vue b/src/views/demos/form/basic-form/index.vue
@@ -116,6 +116,7 @@
       </div>,
       3,
     );
+    console.log('values', values);
   }
 </script>
 

diff --git a/src/views/system/permission/menu/components/multiple-cascader/index.vue b/src/views/system/permission/menu/components/multiple-cascader/index.vue
@@ -1,5 +1,5 @@
 <template>
-  <Popover placement="bottomLeft" trigger="click">
+  <Popover placement="bottomLeft" trigger="click" overlay-class-name="__multiple-cascader">
     <template #content>
       <NodePanel ref="nodePanelRef" :options="myOptions" />
     </template>
@@ -142,6 +142,12 @@
   // });
 </script>
 
+<style lang="less">
+  .__multiple-cascader .ant-popover-inner-content {
+    padding: 8px 0;
+  }
+</style>
+
 <style lang="less" scoped>
   .input-box {
     display: flex;

diff --git a/src/views/system/permission/menu/components/multiple-cascader/node-panel.vue b/src/views/system/permission/menu/components/multiple-cascader/node-panel.vue
@@ -80,6 +80,9 @@
 </script>
 
 <style lang="less" scoped>
+  .ant-cascader-menu:last-of-type {
+    border-right: 0;
+  }
   .check-row {
     @apply flex justify-between items-center relative;
     .label {
-Original file line number
+Diff line change
@@ Expand Up / @@ -116,6 +116,7 @@ @@
           </div>,
 ,
         );
+        console.log('values', values);
       }
     </script>
@@ Expand Down @@