diff --git a/.gitignore b/.gitignore
index ca1015e..a0b9717 100644
--- a/.gitignore
+++ b/.gitignore
@@ -31,3 +31,4 @@ pnpm-debug.log*
 /os_del.cmd
 /.vscode/
 /.history/
+/svn clear.bat
diff --git a/package.json b/package.json
index 80d006e..2817516 100644
--- a/package.json
+++ b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "jeecgboot-vue3",
-  "version": "1.2.0",
+  "version": "1.3.0",
   "author": {
     "name": "jeecg",
     "email": "jeecgos@163.com",
@@ -36,11 +36,12 @@
   "dependencies": {
     "@jeecg/online": "1.0.1",
     "@iconify/iconify": "^2.0.4",
-    "@fullcalendar/core": "^5.10.1",
-    "@fullcalendar/daygrid": "^5.10.1",
-    "@fullcalendar/interaction": "^5.10.1",
-    "@fullcalendar/timegrid": "^5.10.1",
-    "@fullcalendar/vue3": "^5.10.1",
+    "@fullcalendar/core": "5.10.1",
+    "@fullcalendar/daygrid": "5.10.1",
+    "@fullcalendar/interaction": "5.10.1",
+    "@fullcalendar/resource-timeline": "5.10.1",
+    "@fullcalendar/timegrid": "5.10.1",
+    "@fullcalendar/vue3": "5.10.1",
     "@vueuse/core": "^6.6.2",
     "@zxcvbn-ts/core": "^1.0.0-beta.0",
     "ant-design-vue": "2.2.8",
@@ -66,6 +67,7 @@
     "path-to-regexp": "^6.2.0",
     "pinia": "2.0.0-rc.14",
     "print-js": "^1.6.0",
+    "qiankun": "^2.5.1",
     "qrcode": "^1.4.4",
     "qrcodejs2": "0.0.2",
     "resize-observer-polyfill": "^1.5.1",
@@ -81,12 +83,11 @@
     "vue-print-nb-jeecg": "^1.0.10",
     "vue-router": "^4.0.12",
     "vue-types": "^4.1.1",
+    "vuedraggable": "^4.1.0",
     "vxe-table": "4.1.0",
     "vxe-table-plugin-antd": "^3.0.3",
     "xe-utils": "^3.3.1",
     "xlsx": "^0.17.3",
-    "qiankun": "^2.5.1",
-    "vuedraggable": "^4.1.0",
     "vue-json-pretty": "^2.0.4"
   },
   "devDependencies": {
@@ -291,6 +292,7 @@
         "vue-print-nb-jeecg/src/printarea",
         "vue-router",
         "vue-types",
+        "vuedraggable",
         "vxe-table",
         "vxe-table-plugin-antd",
         "xe-utils",
diff --git a/prettier.config.js b/prettier.config.js
index 4a88a0c..bd6a55b 100644
--- a/prettier.config.js
+++ b/prettier.config.js
@@ -8,6 +8,7 @@ module.exports = {
   quoteProps: 'as-needed',
   bracketSpacing: true,
   trailingComma: 'es5',
+  jsxBracketSameLine: false,
   jsxSingleQuote: false,
   arrowParens: 'always',
   insertPragma: false,
diff --git a/src/api/common/api.ts b/src/api/common/api.ts
index 5dfebb1..1e90d11 100644
--- a/src/api/common/api.ts
+++ b/src/api/common/api.ts
@@ -1,4 +1,5 @@
 import { defHttp } from '/@/utils/http/axios';
+import { message } from 'ant-design-vue';
 import { useGlobSetting } from '/@/hooks/setting';
 const globSetting = useGlobSetting();
 const baseUploadUrl = globSetting.uploadUrl;
@@ -95,3 +96,48 @@ export const loadCategoryData = (params) => {
 export const uploadFile = (params, success) => {
   return defHttp.uploadFile({ url: uploadUrl }, params, { success });
 };
+/**
+ * 下载文件
+ * @param url 文件路径
+ * @param fileName 文件名
+ * @param parameter
+ * @returns {*}
+ */
+export const downloadFile = (url, fileName?, parameter?) => {
+  return getFileblob(url, parameter).then((data) => {
+    if (!data || data.size === 0) {
+      message.warning('文件下载失败');
+      return;
+    }
+    if (typeof window.navigator.msSaveBlob !== 'undefined') {
+      window.navigator.msSaveBlob(new Blob([data]), fileName);
+    } else {
+      let url = window.URL.createObjectURL(new Blob([data]));
+      let link = document.createElement('a');
+      link.style.display = 'none';
+      link.href = url;
+      link.setAttribute('download', fileName);
+      document.body.appendChild(link);
+      link.click();
+      document.body.removeChild(link); //下载完成移除元素
+      window.URL.revokeObjectURL(url); //释放掉blob对象
+    }
+  });
+};
+
+/**
+ * 下载文件 用于excel导出
+ * @param url
+ * @param parameter
+ * @returns {*}
+ */
+export const getFileblob = (url, parameter) => {
+  return defHttp.get(
+    {
+      url: url,
+      params: parameter,
+      responseType: 'blob',
+    },
+    { isTransformResponse: false }
+  );
+};
diff --git a/src/api/sys/user.ts b/src/api/sys/user.ts
index a152f8d..60554d3 100644
--- a/src/api/sys/user.ts
+++ b/src/api/sys/user.ts
@@ -80,7 +80,7 @@ export function phoneLoginApi(params: LoginParams, mode: ErrorMessageMode = 'mod
 export function getUserInfo() {
   return defHttp.get<GetUserInfoModel>({ url: Api.GetUserInfo }, { errorMessageMode: 'none' }).catch((e) => {
     // update-begin--author:zyf---date:20220425---for:【VUEN-76】捕获接口超时异常,跳转到登录界面
-    if (e && e.message.includes('timeout')) {
+    if (e && (e.message.includes('timeout') || e.message.includes('401'))) {
       //接口不通时跳转到登录界面
       const userStore = useUserStoreWithOut();
       userStore.setToken('');
diff --git a/src/assets/images/panel_cover.png b/src/assets/images/panel_cover.png
new file mode 100644
index 0000000..faf0065
Binary files /dev/null and b/src/assets/images/panel_cover.png differ
diff --git a/src/components/Button/index.ts b/src/components/Button/index.ts
index 677700a..71bd2e4 100644
--- a/src/components/Button/index.ts
+++ b/src/components/Button/index.ts
@@ -1,11 +1,11 @@
 import { withInstall } from '/@/utils';
 import type { ExtractPropTypes } from 'vue';
 import button from './src/BasicButton.vue';
-import uploadButton from './src/UploadButton.vue';
+import jUploadButton from './src/JUploadButton.vue';
 import popConfirmButton from './src/PopConfirmButton.vue';
 import { buttonProps } from './src/props';
 
 export const Button = withInstall(button);
-export const UploadButton = withInstall(uploadButton);
+export const JUploadButton = withInstall(jUploadButton);
 export const PopConfirmButton = withInstall(popConfirmButton);
 export declare type ButtonProps = Partial<ExtractPropTypes<typeof buttonProps>>;
diff --git a/src/components/Button/src/JUploadButton.vue b/src/components/Button/src/JUploadButton.vue
new file mode 100644
index 0000000..ec0df2c
--- /dev/null
+++ b/src/components/Button/src/JUploadButton.vue
@@ -0,0 +1,41 @@
+<template>
+  <a-upload name="file" :showUploadList="false" :customRequest="(file) => onClick(file)">
+    <Button :type="type" :class="getButtonClass">
+      <template #default="data">
+        <Icon :icon="preIcon" v-if="preIcon" :size="iconSize" />
+        <slot v-bind="data || {}"></slot>
+        <Icon :icon="postIcon" v-if="postIcon" :size="iconSize" />
+      </template>
+    </Button>
+  </a-upload>
+</template>
+
+<script lang="ts">
+  import { defineComponent } from 'vue';
+  export default defineComponent({
+    name: 'JUploadButton',
+    inheritAttrs: false,
+  });
+</script>
+<script lang="ts" setup>
+  import { computed, unref } from 'vue';
+  import { Button } from 'ant-design-vue';
+  import Icon from '/@/components/Icon/src/Icon.vue';
+  import { buttonProps } from './props';
+  import { useAttrs } from '/@/hooks/core/useAttrs';
+  const props = defineProps(buttonProps);
+  // get component class
+  const attrs = useAttrs({ excludeDefaultKeys: false });
+  const getButtonClass = computed(() => {
+    const { color, disabled } = props;
+    return [
+      {
+        [`ant-btn-${color}`]: !!color,
+        [`is-disabled`]: disabled,
+      },
+    ];
+  });
+
+  // get inherit binding value
+  const getBindValue = computed(() => ({ ...unref(attrs), ...props }));
+</script>
diff --git a/src/components/Button/src/props.ts b/src/components/Button/src/props.ts
index 8e1b254..b5026d6 100644
--- a/src/components/Button/src/props.ts
+++ b/src/components/Button/src/props.ts
@@ -13,9 +13,9 @@ export const buttonProps = {
   type: { type: String },
   /**
    * preIcon and postIcon icon size.
-   * @default: 14
+   * @default: 15
    */
-  iconSize: { type: Number, default: 14 },
+  iconSize: { type: Number, default: 15 },
   isUpload: { type: Boolean, default: false },
   onClick: { type: Function as PropType<(...args) => any>, default: null },
 };
diff --git a/src/components/Cropper/src/CopperModal.vue b/src/components/Cropper/src/CopperModal.vue
index 46c34b6..851c68f 100644
--- a/src/components/Cropper/src/CopperModal.vue
+++ b/src/components/Cropper/src/CopperModal.vue
@@ -129,7 +129,10 @@
           try {
             setModalProps({ confirmLoading: true });
             const result = await uploadApi({ name: 'file', file: blob, filename });
-            emit('uploadSuccess', { source: previewSource.value, data: result.data || result.message });
+            emit('uploadSuccess', {
+              source: previewSource.value,
+              data: result.data || result.message,
+            });
             closeModal();
           } finally {
             setModalProps({ confirmLoading: false });
diff --git a/src/components/Form/src/BasicForm.vue b/src/components/Form/src/BasicForm.vue
index 94fc13f..0df3c3b 100644
--- a/src/components/Form/src/BasicForm.vue
+++ b/src/components/Form/src/BasicForm.vue
@@ -233,6 +233,7 @@
         updateSchema,
         resetSchema,
         setProps,
+        getProps,
         removeSchemaByFiled,
         appendSchemaByField,
         clearValidate,
diff --git a/src/components/Form/src/componentMap.ts b/src/components/Form/src/componentMap.ts
index 2ee9616..75a0c36 100644
--- a/src/components/Form/src/componentMap.ts
+++ b/src/components/Form/src/componentMap.ts
@@ -42,7 +42,6 @@ import JUpload from './jeecg/components/JUpload/JUpload.vue';
 import JSearchSelect from './jeecg/components/JSearchSelect.vue';
 import JAddInput from './jeecg/components/JAddInput.vue';
 import { Time } from '/@/components/Time';
-import JOnlineSelectCascade from './jeecg/components/JOnlineSelectCascade.vue';
 import JRangeNumber from './jeecg/components/JRangeNumber.vue';
 
 const componentMap = new Map<ComponentType, Component>();
@@ -110,7 +109,6 @@ componentMap.set('JSelectUserByDept', JSelectUserByDept);
 componentMap.set('JUpload', JUpload);
 componentMap.set('JSearchSelect', JSearchSelect);
 componentMap.set('JAddInput', JAddInput);
-componentMap.set('JOnlineSelectCascade', JOnlineSelectCascade);
 componentMap.set('JRangeNumber', JRangeNumber);
 
 export function add(compName: ComponentType, component: Component) {
diff --git a/src/components/Form/src/components/FormAction.vue b/src/components/Form/src/components/FormAction.vue
index 20c7201..4f7e721 100644
--- a/src/components/Form/src/components/FormAction.vue
+++ b/src/components/Form/src/components/FormAction.vue
@@ -5,13 +5,11 @@
         <!-- update-begin-author:zyf   Date:20211213  for：调换按钮前后位置-->
         <slot name="submitBefore"></slot>
         <Button type="primary" class="mr-2" v-bind="getSubmitBtnOptions" @click="submitAction" v-if="showSubmitButton">
-          <Icon icon="ant-design:search-outlined"></Icon>
           {{ getSubmitBtnOptions.text }}
         </Button>
 
         <slot name="resetBefore"></slot>
         <Button type="default" class="mr-2" v-bind="getResetBtnOptions" @click="resetAction" v-if="showResetButton">
-          <Icon icon="ic:baseline-restart-alt"></Icon>
           {{ getResetBtnOptions.text }}
         </Button>
         <!-- update-end-author:zyf    Date:20211213  for：调换按钮前后位置-->
@@ -89,6 +87,7 @@
         return Object.assign(
           {
             text: t('common.resetText'),
+            preIcon: 'ic:baseline-restart-alt',
           },
           props.resetButtonOptions
         );
@@ -96,8 +95,10 @@
 
       const getSubmitBtnOptions = computed(() => {
         return Object.assign(
+          {},
           {
             text: t('common.queryText'),
+            preIcon: 'ant-design:search-outlined',
           },
           props.submitButtonOptions
         );
diff --git a/src/components/Form/src/hooks/useForm.ts b/src/components/Form/src/hooks/useForm.ts
index e76eae3..af6c4bb 100644
--- a/src/components/Form/src/hooks/useForm.ts
+++ b/src/components/Form/src/hooks/useForm.ts
@@ -110,17 +110,18 @@ export function useForm(props?: Props): UseFormReturnType {
      */
     validate: async (nameList?: NamePath[]): Promise<Recordable> => {
       const form = await getForm();
+      let getProps = props || form.getProps;
       let values = form.validate(nameList).then((values) => {
         for (let key in values) {
           if (values[key] instanceof Array) {
-            let valueType = getValueType(props, key);
+            let valueType = getValueType(getProps, key);
             if (valueType === 'string') {
               values[key] = values[key].join(',');
             }
           }
         }
         //--@updateBy-begin----author:liusq---date:20210916------for:处理区域事件字典信息------
-        return handleRangeValue(props, values);
+        return handleRangeValue(getProps, values);
         //--@updateBy-end----author:liusq---date:20210916------for:处理区域事件字典信息------
       });
       return values;
diff --git a/src/components/Form/src/jeecg/components/JAddInput.vue b/src/components/Form/src/jeecg/components/JAddInput.vue
index 5abb7ff..d63b628 100644
--- a/src/components/Form/src/jeecg/components/JAddInput.vue
+++ b/src/components/Form/src/jeecg/components/JAddInput.vue
@@ -2,7 +2,7 @@
   <div v-for="(param, index) in dynamicInput.params" :key="index" style="display: flex">
     <a-input placeholder="请输入参数key" v-model:value="param.label" style="width: 30%; margin-bottom: 5px" @input="emitChange" />
     <a-input placeholder="请输入参数value" v-model:value="param.value" style="width: 30%; margin: 0 0 5px 5px" @input="emitChange" />
-    <MinusCircleOutlined v-if="dynamicInput.params.length > 1" class="dynamic-delete-button" @click="remove(param)" style="width: 50px"></MinusCircleOutlined>
+    <MinusCircleOutlined v-if="dynamicInput.params.length > min" class="dynamic-delete-button" @click="remove(param)" style="width: 50px"></MinusCircleOutlined>
   </div>
   <div>
     <a-button type="dashed" style="width: 60%" @click="add">
@@ -26,6 +26,10 @@
     name: 'JAddInput',
     props: {
       value: propTypes.string.def(''),
+      //update-begin---author:wangshuai ---date:20220516  for：[VUEN-1043]系统编码规则，最后一个输入框不能删除------------
+      //自定义删除按钮多少才会显示
+      min: propTypes.integer.def(1),
+      //update-end---author:wangshuai ---date:20220516  for：[VUEN-1043]系统编码规则，最后一个输入框不能删除--------------
     },
     emits: ['change', 'update:value'],
     setup(props, { emit }) {
diff --git a/src/components/Form/src/jeecg/components/JAreaLinkage.vue b/src/components/Form/src/jeecg/components/JAreaLinkage.vue
index 48819f5..49c8e3f 100644
--- a/src/components/Form/src/jeecg/components/JAreaLinkage.vue
+++ b/src/components/Form/src/jeecg/components/JAreaLinkage.vue
@@ -1,5 +1,5 @@
 <template>
-  <Cascader v-bind="attrs" v-model:value="state" :options="getOptions" @change="handleChange" />
+  <Cascader v-bind="attrs" :value="state" :options="getOptions" @change="handleChange" />
 </template>
 <script lang="ts">
   import { defineComponent, PropType, ref, reactive, watchEffect, computed, unref, watch, onMounted } from 'vue';
@@ -40,6 +40,23 @@
           return provinceAndCityDataPlus;
         }
       });
+      /**
+       * 监听value变化
+       */
+      watchEffect(() => {
+        props.value && initValue();
+      });
+
+      /**
+       * 将字符串值转化为数组
+       */
+      function initValue() {
+        let value = props.value ? props.value : [];
+        if (value && typeof value === 'string' && value != 'null' && value != 'undefined') {
+          state.value = value.split(',');
+        }
+      }
+
       function handleChange(_, ...args) {
         emitData.value = args;
         console.info(emitData);
diff --git a/src/components/Form/src/jeecg/components/JAreaSelect.vue b/src/components/Form/src/jeecg/components/JAreaSelect.vue
index f854833..8a6d1d3 100644
--- a/src/components/Form/src/jeecg/components/JAreaSelect.vue
+++ b/src/components/Form/src/jeecg/components/JAreaSelect.vue
@@ -1,19 +1,19 @@
 <template>
   <div class="area-select">
     <!--省份-->
-    <a-select v-model:value="province" @change="proChange" allowClear>
+    <a-select v-model:value="province" @change="proChange" allowClear :disabled="disabled">
       <template v-for="item in provinceOptions" :key="`${item.value}`">
         <a-select-option :value="item.value">{{ item.label }}</a-select-option>
       </template>
     </a-select>
     <!--城市-->
-    <a-select v-if="level >= 2" v-model:value="city" @change="cityChange">
+    <a-select v-if="level >= 2" v-model:value="city" @change="cityChange" :disabled="disabled">
       <template v-for="item in cityOptions" :key="`${item.value}`">
         <a-select-option :value="item.value">{{ item.label }}</a-select-option>
       </template>
     </a-select>
     <!--地区-->
-    <a-select v-if="level >= 3" v-model:value="area" @change="areaChange">
+    <a-select v-if="level >= 3" v-model:value="area" @change="areaChange" :disabled="disabled">
       <template v-for="item in areaOptions" :key="`${item.value}`">
         <a-select-option :value="item.value">{{ item.label }}</a-select-option>
       </template>
@@ -34,6 +34,7 @@
       city: [String],
       area: [String],
       level: propTypes.number.def(3),
+      disabled: propTypes.bool.def(false),
     },
     emits: ['change', 'update:value'],
     setup(props, { emit, refs }) {
diff --git a/src/components/Form/src/jeecg/components/JCodeEditor.vue b/src/components/Form/src/jeecg/components/JCodeEditor.vue
index 342c8ff..82088e6 100644
--- a/src/components/Form/src/jeecg/components/JCodeEditor.vue
+++ b/src/components/Form/src/jeecg/components/JCodeEditor.vue
@@ -96,7 +96,8 @@
           },
         },
       });
-      let innerValue = '';
+      // 内部存储值，初始为 props.value
+      let innerValue = props.value ?? '';
       // 全屏状态
       const isFullScreen = ref(false);
       const fullScreenIcon = computed(() => (isFullScreen.value ? 'fullscreen-exit' : 'fullscreen'));
@@ -175,6 +176,17 @@
         isFullScreen.value = !isFullScreen.value;
       }
 
+      //update-begin-author:taoyan date:2022-5-9 for: codeEditor禁用功能
+      watch(
+        () => props.disabled,
+        (val) => {
+          if (coder) {
+            coder.setOption('readOnly', val);
+          }
+        }
+      );
+      //update-end-author:taoyan date:2022-5-9 for: codeEditor禁用功能
+
       const getBindValue = Object.assign({}, unref(props), unref(attrs));
       return {
         state,
diff --git a/src/components/Form/src/jeecg/components/JEasyCron/EasyCronInner.vue b/src/components/Form/src/jeecg/components/JEasyCron/EasyCronInner.vue
index e263fca..de8796c 100644
--- a/src/components/Form/src/jeecg/components/JEasyCron/EasyCronInner.vue
+++ b/src/components/Form/src/jeecg/components/JEasyCron/EasyCronInner.vue
@@ -122,7 +122,16 @@
   const month = ref('*');
   const week = ref('?');
   const year = ref('*');
-  const inputValues = reactive({ second: '', minute: '', hour: '', day: '', month: '', week: '', year: '', cron: '' });
+  const inputValues = reactive({
+    second: '',
+    minute: '',
+    hour: '',
+    day: '',
+    month: '',
+    week: '',
+    year: '',
+    cron: '',
+  });
   const preTimeList = ref('执行预览，会忽略年份参数。');
 
   // cron表达式
diff --git a/src/components/Form/src/jeecg/components/JEllipsis.vue b/src/components/Form/src/jeecg/components/JEllipsis.vue
index f63def4..4a8b3e5 100644
--- a/src/components/Form/src/jeecg/components/JEllipsis.vue
+++ b/src/components/Form/src/jeecg/components/JEllipsis.vue
@@ -11,7 +11,7 @@
   import { propTypes } from '/@/utils/propTypes';
 
   const props = defineProps({
-    value: propTypes.string.def(''),
+    value: propTypes.oneOfType([propTypes.string, propTypes.array]),
     length: propTypes.number.def(25),
   });
   //显示的文本
diff --git a/src/components/Form/src/jeecg/components/JFormContainer.vue b/src/components/Form/src/jeecg/components/JFormContainer.vue
new file mode 100644
index 0000000..5df1698
--- /dev/null
+++ b/src/components/Form/src/jeecg/components/JFormContainer.vue
@@ -0,0 +1,60 @@
+<template>
+  <div :class="disabled ? 'jeecg-form-container-disabled' : ''">
+    <fieldset :disabled="disabled">
+      <slot name="detail"></slot>
+    </fieldset>
+    <slot name="edit"></slot>
+    <fieldset disabled>
+      <slot></slot>
+    </fieldset>
+  </div>
+</template>
+
+<script lang="ts">
+  import { defineComponent } from 'vue';
+
+  export default defineComponent({
+    name: 'JFormContainer',
+    props: {
+      disabled: {
+        type: Boolean,
+        default: false,
+        required: false,
+      },
+    },
+  });
+</script>
+
+<style lang="less" scoped>
+  .jeecg-form-container-disabled {
+    cursor: not-allowed;
+
+    fieldset[disabled] {
+      -ms-pointer-events: none;
+      pointer-events: none;
+    }
+
+    .ant-select {
+      -ms-pointer-events: none;
+      pointer-events: none;
+    }
+
+    .ant-upload-select {
+      display: none;
+    }
+
+    .ant-upload-list {
+      cursor: grabbing;
+    }
+  }
+
+  .jeecg-form-container-disabled fieldset[disabled] .ant-upload-list {
+    -ms-pointer-events: auto !important;
+    pointer-events: auto !important;
+  }
+
+  .jeecg-form-container-disabled .ant-upload-list-item-actions .anticon-delete,
+  .jeecg-form-container-disabled .ant-upload-list-item .anticon-close {
+    display: none;
+  }
+</style>
diff --git a/src/components/Form/src/jeecg/components/JImageUpload.vue b/src/components/Form/src/jeecg/components/JImageUpload.vue
index c15121b..ae13d9b 100644
--- a/src/components/Form/src/jeecg/components/JImageUpload.vue
+++ b/src/components/Form/src/jeecg/components/JImageUpload.vue
@@ -18,7 +18,7 @@
           <UploadOutlined v-else />
           <div class="ant-upload-text">{{ text }}</div>
         </div>
-        <a-button v-if="listType == 'picture'">
+        <a-button v-if="listType == 'picture'" :disabled="disabled">
           <UploadOutlined></UploadOutlined>
           {{ text }}
         </a-button>
diff --git a/src/components/Form/src/jeecg/components/JInputPop.vue b/src/components/Form/src/jeecg/components/JInputPop.vue
index 9b81b3c..555303d 100644
--- a/src/components/Form/src/jeecg/components/JInputPop.vue
+++ b/src/components/Form/src/jeecg/components/JInputPop.vue
@@ -35,7 +35,7 @@
     height: propTypes.number.def(150),
     disabled: propTypes.bool.def(false),
     // 弹出框挂载的元素ID
-    popContainer: propTypes.string.def(''),
+    popContainer: propTypes.oneOfType([propTypes.string, propTypes.func]).def(''),
   });
   const attrs = useAttrs();
   const emit = defineEmits(['change', 'update:value']);
@@ -75,6 +75,8 @@
   function getPopupContainer(node) {
     if (!props.popContainer) {
       return node.parentNode;
+    } else if (typeof props.popContainer === 'function') {
+      return props.popContainer(node);
     } else {
       return document.getElementById(props.popContainer);
     }
diff --git a/src/components/Form/src/jeecg/components/JOnlineSelectCascade.vue b/src/components/Form/src/jeecg/components/JOnlineSelectCascade.vue
deleted file mode 100644
index 12f233b..0000000
--- a/src/components/Form/src/jeecg/components/JOnlineSelectCascade.vue
+++ /dev/null
@@ -1,220 +0,0 @@
-<template>
-  <!-- 级联下拉框 form组件 暂且只在online使用 不对外提供api -->
-  <a-select :placeholder="placeholder" :value="selectedValue" @change="handleChange" allowClear style="width: 100%">
-    <a-select-option v-for="(item, index) in dictOptions" :key="index" :value="item.store">
-      <span style="display: inline-block; width: 100%" :title="item.label">{{ item.label }}</span>
-    </a-select-option>
-  </a-select>
-</template>
-
-<script lang="ts">
-  import { defineComponent, watch, ref } from 'vue';
-  import { defHttp } from '/@/utils/http/axios';
-  import { useMessage } from '/@/hooks/web/useMessage';
-
-  /**获取下拉选项*/
-  const SELECT_OPTIONS_URL = '/online/cgform/api/querySelectOptions';
-
-  export default defineComponent({
-    name: 'JOnlineSelectCascade',
-    props: {
-      table: { type: String, default: '' },
-      txt: { type: String, default: '' },
-      store: { type: String, default: '' },
-      idField: { type: String, default: '' },
-      pidField: { type: String, default: '' },
-      pidValue: { type: String, default: '-1' },
-      origin: { type: Boolean, default: false },
-      condition: { type: String, default: '' },
-      value: { type: String, default: '' },
-      isNumber: { type: Boolean, default: false },
-      placeholder: { type: String, default: '请选择' },
-    },
-    emits: ['change', 'next'],
-    setup(props, { emit }) {
-      const { createMessage: $message } = useMessage();
-      // 选中值
-      const selectedValue = ref<any>('');
-      // 选项数组
-      const dictOptions = ref<any[]>([]);
-      const optionsLoad = ref(true);
-      // 选项改变事件
-      function handleChange(value) {
-        console.log('handleChange', value);
-        // 这个value是 存储的值 实际还需要获取id值
-        let temp = value || '';
-        emit('change', temp);
-        valueChangeThenEmitNext(temp);
-      }
-
-      // 第一个节点 选项加载走condition
-      watch(
-        () => props.condition,
-        (val) => {
-          optionsLoad.value = true;
-          if (val) {
-            loadOptions();
-          }
-        },
-        { immediate: true }
-      );
-
-      // 被联动节点 选项加载走pidValue
-      watch(
-        () => props.pidValue,
-        (val) => {
-          if (val === '-1') {
-            dictOptions.value = [];
-          } else {
-            loadOptions();
-          }
-        }
-      );
-
-      // 值回显
-      watch(
-        () => props.value,
-        (newVal, oldVal) => {
-          console.log('值改变事件', newVal, oldVal);
-          if (!newVal) {
-            // value不存在的时候--
-            selectedValue.value = [];
-            if (oldVal) {
-              // 如果oldVal存在， 需要往上抛事件
-              emit('change', '');
-              emit('next', '-1');
-            }
-          } else {
-            // value存在的时候
-            selectedValue.value = newVal;
-          }
-          if (newVal && !oldVal) {
-            // 有新值没有旧值 表单第一次加载赋值 需要往外抛一个事件 触发下级options的加载
-            handleFirstValueSetting(newVal);
-          }
-        },
-        { immediate: true }
-      );
-
-      /**
-       * 第一次加载赋值
-       */
-      async function handleFirstValueSetting(value) {
-        if (props.idField === props.store) {
-          // 如果id字段就是存储字段 那么可以不用调用请求
-          emit('next', value);
-        } else {
-          if (props.origin === true) {
-            // 如果是联动组件的第一个组件，等待options加载完后从options中取值
-            await getSelfOptions();
-            valueChangeThenEmitNext(value);
-          } else {
-            // 如果是联动组件的后续组件，根据选中的value加载一遍数据
-            let arr = await loadValueText();
-            valueChangeThenEmitNext(value, arr);
-          }
-        }
-      }
-
-      function loadOptions() {
-        let params = getQueryParams();
-        if (props.origin === true) {
-          params['condition'] = props.condition;
-        } else {
-          params['pidValue'] = props.pidValue;
-        }
-        console.log('请求参数', params);
-        dictOptions.value = [];
-        defHttp.get({ url: SELECT_OPTIONS_URL, params }, { isTransformResponse: false }).then((res) => {
-          if (res.success) {
-            dictOptions.value = [...res.result];
-            console.log('请求结果', res.result, dictOptions);
-          } else {
-            $message.warning('联动组件数据加载失败,请检查配置!');
-          }
-        });
-      }
-
-      function getQueryParams() {
-        let params = {
-          table: props.table,
-          txt: props.txt,
-          key: props.store,
-          idField: props.idField,
-          pidField: props.pidField,
-        };
-        return params;
-      }
-
-      function loadValueText() {
-        return new Promise((resolve) => {
-          if (!props.value) {
-            selectedValue.value = [];
-            resolve([]);
-          } else {
-            let params = getQueryParams();
-            if (props.isNumber === true) {
-              params['condition'] = `${props.store} = ${props.value}`;
-            } else {
-              params['condition'] = `${props.store} = '${props.value}'`;
-            }
-            defHttp.get({ url: SELECT_OPTIONS_URL, params }, { isTransformResponse: false }).then((res) => {
-              if (res.success) {
-                resolve(res.result);
-              } else {
-                $message.warning('联动组件数据加载失败,请检查配置!');
-                resolve([]);
-              }
-            });
-          }
-        });
-      }
-
-      /**
-       * 获取下拉选项
-       */
-      function getSelfOptions() {
-        return new Promise((resolve) => {
-          let index = 0;
-          (function next(index) {
-            if (index > 10) {
-              resolve([]);
-            }
-            let arr = dictOptions.value;
-            if (arr && arr.length > 0) {
-              resolve(arr);
-            } else {
-              setTimeout(() => {
-                next(index++);
-              }, 300);
-            }
-          })(index);
-        });
-      }
-
-      /**
-       * 值改变后 需要往外抛事件 触发下级节点的选项改变
-       */
-      function valueChangeThenEmitNext(value, arr: any = []) {
-        if (value && value.length > 0) {
-          if (!arr || arr.length == 0) {
-            arr = dictOptions.value;
-          }
-          let selected = arr.filter((item) => item.store === value);
-          if (selected && selected.length > 0) {
-            let id = selected[0].id;
-            emit('next', id);
-          }
-        }
-      }
-
-      return {
-        selectedValue,
-        dictOptions,
-        handleChange,
-      };
-    },
-  });
-</script>
-
-<style scoped></style>
diff --git a/src/components/Form/src/jeecg/components/JPopup.vue b/src/components/Form/src/jeecg/components/JPopup.vue
index 393275e..5e3d268 100644
--- a/src/components/Form/src/jeecg/components/JPopup.vue
+++ b/src/components/Form/src/jeecg/components/JPopup.vue
@@ -6,9 +6,11 @@
       <template #prefix>
         <Icon icon="ant-design:cluster-outlined"></Icon>
       </template>
-      <template #suffix>
-        <Icon icon="ant-design:close-circle-outlined" @click="handleEmpty" title="清空" v-if="showText"></Icon>
-      </template>
+      <!-- update-begin-author:taoyan date:2022-5-31 for: VUEN-1157 popup 选中后，有两个清除图标；后边这个清除，只是把输入框中数据清除，实际值并没有清除 -->
+      <!-- <template #suffix>
+                <Icon icon="ant-design:close-circle-outlined" @click="handleEmpty" title="清空" v-if="showText"></Icon>
+            </template>-->
+      <!-- update-begin-author:taoyan date:2022-5-31 for: VUEN-1157 popup 选中后，有两个清除图标；后边这个清除，只是把输入框中数据清除，实际值并没有清除 -->
     </a-input>
     <!--popup弹窗-->
     <JPopupOnlReportModal @register="regModal" :code="code" :multi="multi" :sorter="sorter" :groupId="uniqGroupId" :param="param" @ok="callBack"></JPopupOnlReportModal>
diff --git a/src/components/Form/src/jeecg/components/JSearchSelect.vue b/src/components/Form/src/jeecg/components/JSearchSelect.vue
index 83e0c2b..6433000 100644
--- a/src/components/Form/src/jeecg/components/JSearchSelect.vue
+++ b/src/components/Form/src/jeecg/components/JSearchSelect.vue
@@ -117,15 +117,20 @@
         options.value = [];
         loading.value = true;
         // 字典code格式：table,text,code
-        defHttp.get({ url: `/sys/dict/loadDict/${props.dict}`, params: { keyword: value, pageSize: props.pageSize } }).then((res) => {
-          loading.value = false;
-          if (res && res.length > 0) {
-            if (currentLoad != unref(lastLoad)) {
-              return;
+        defHttp
+          .get({
+            url: `/sys/dict/loadDict/${props.dict}`,
+            params: { keyword: value, pageSize: props.pageSize },
+          })
+          .then((res) => {
+            loading.value = false;
+            if (res && res.length > 0) {
+              if (currentLoad != unref(lastLoad)) {
+                return;
+              }
+              options.value = res;
             }
-            options.value = res;
-          }
-        });
+          });
       }
       /**
        * 初始化value
@@ -186,12 +191,17 @@
           } else {
             //异步一开始也加载一点数据
             loading.value = true;
-            defHttp.get({ url: `/sys/dict/loadDict/${dict}`, params: { pageSize: pageSize, keyword: '' } }).then((res) => {
-              loading.value = false;
-              if (res && res.length > 0) {
-                options.value = res;
-              }
-            });
+            defHttp
+              .get({
+                url: `/sys/dict/loadDict/${dict}`,
+                params: { pageSize: pageSize, keyword: '' },
+              })
+              .then((res) => {
+                loading.value = false;
+                if (res && res.length > 0) {
+                  options.value = res;
+                }
+              });
           }
         }
       }
diff --git a/src/components/Form/src/jeecg/components/JSelectDept.vue b/src/components/Form/src/jeecg/components/JSelectDept.vue
index 15235a2..960dad8 100644
--- a/src/components/Form/src/jeecg/components/JSelectDept.vue
+++ b/src/components/Form/src/jeecg/components/JSelectDept.vue
@@ -37,7 +37,7 @@
       //下拉框选项值
       const selectOptions = ref<SelectTypes['options']>([]);
       //下拉框选中值
-      let selectValues = reactive<object>({
+      let selectValues = reactive<Recordable>({
         value: [],
       });
       // 是否正在加载回显数据
@@ -57,14 +57,16 @@
        */
       watchEffect(() => {
         props.value && initValue();
-        // update-begin-author:taoyan date:20220401 for:调用表单的 resetFields不会清空当前部门信息，界面显示上一次的数据
-        if (props.value === '' || props.value === undefined) {
-          state.value = [];
-          selectValues.value = [];
-        }
-        // update-end-author:taoyan date:20220401 for:调用表单的 resetFields不会清空当前部门信息，界面显示上一次的数据
       });
 
+      //update-begin-author:liusq---date:20220609--for: 为了解决弹窗form初始化赋值问题 ---
+      watch(
+        () => props.value,
+        () => {
+          initValue();
+        }
+      );
+      //update-end-author:liusq---date:20220609--for: 为了解决弹窗form初始化赋值问题 ---
       /**
        * 监听selectValues变化
        */
@@ -100,6 +102,9 @@
         if (value && typeof value === 'string') {
           state.value = value.split(',');
           selectValues.value = value.split(',');
+        } else {
+          // 【VUEN-857】兼容数组（行编辑的用法问题）
+          selectValues.value = value;
         }
       }
 
diff --git a/src/components/Form/src/jeecg/components/JSelectMultiple.vue b/src/components/Form/src/jeecg/components/JSelectMultiple.vue
index cbdcbc7..5673ce6 100644
--- a/src/components/Form/src/jeecg/components/JSelectMultiple.vue
+++ b/src/components/Form/src/jeecg/components/JSelectMultiple.vue
@@ -1,6 +1,6 @@
 <!--字典下拉多选-->
 <template>
-  <a-select :value="arrayValue" @change="onChange" mode="multiple" :placeholder="placeholder" allowClear :getPopupContainer="getParentContainer">
+  <a-select :value="arrayValue" @change="onChange" mode="multiple" :filter-option="filterOption" :disabled="disabled" :placeholder="placeholder" allowClear :getPopupContainer="getParentContainer">
     <a-select-option v-for="(item, index) in dictOptions" :key="index" :getPopupContainer="getParentContainer" :value="item.value">
       {{ item.text || item.label }}
     </a-select-option>
@@ -39,7 +39,7 @@
       triggerChange: {
         type: Boolean,
         required: false,
-        default: false,
+        default: true,
       },
       spliter: {
         type: String,
@@ -55,6 +55,10 @@
         type: String,
         required: false,
       },
+      disabled: {
+        type: Boolean,
+        default: false,
+      },
     },
     emits: ['options-change', 'change', 'input', 'update:value'],
     setup(props, { emit, refs }) {
@@ -103,7 +107,14 @@
 
       // 根据字典code查询字典项
       function loadDictOptions() {
-        getDictItems(props.dictCode).then((res) => {
+        //update-begin-author:taoyan date:2022-6-21 for: 字典数据请求前将参数编码处理，但是不能直接编码，因为可能之前已经编码过了
+        let temp = props.dictCode || '';
+        if (temp.indexOf(',') > 0 && temp.indexOf(' ') > 0) {
+          // 编码后 是不包含空格的
+          temp = encodeURI(temp);
+        }
+        //update-end-author:taoyan date:2022-6-21 for: 字典数据请求前将参数编码处理，但是不能直接编码，因为可能之前已经编码过了
+        getDictItems(temp).then((res) => {
           if (res) {
             dictOptions.value = res.map((item) => ({ value: item.value, label: item.text }));
             //console.info('res', dictOptions.value);
@@ -114,6 +125,12 @@
         });
       }
 
+      //update-begin-author:taoyan date:2022-5-31 for: VUEN-1145 下拉多选，搜索时，查不到数据
+      function filterOption(input, option) {
+        return option.children[0].el.data.toLowerCase().indexOf(input.toLowerCase()) >= 0;
+      }
+      //update-end-author:taoyan date:2022-5-31 for: VUEN-1145 下拉多选，搜索时，查不到数据
+
       return {
         state,
         attrs,
@@ -121,6 +138,7 @@
         onChange,
         arrayValue,
         getParentContainer,
+        filterOption,
       };
     },
   });
diff --git a/src/components/Form/src/jeecg/components/JSelectRole.vue b/src/components/Form/src/jeecg/components/JSelectRole.vue
index 9cabefc..d6c88d2 100644
--- a/src/components/Form/src/jeecg/components/JSelectRole.vue
+++ b/src/components/Form/src/jeecg/components/JSelectRole.vue
@@ -47,7 +47,7 @@
       //下拉框选项值
       const selectOptions = ref<SelectTypes['options']>([]);
       //下拉框选中值
-      let selectValues = reactive<object>({
+      let selectValues = reactive<Recordable>({
         value: [],
         change: false,
       });
@@ -68,6 +68,10 @@
        */
       watchEffect(() => {
         props.value && initValue();
+        // 查询条件重置的时候，清空界面显示
+        if (!props.value) {
+          selectValues.value = [];
+        }
       });
 
       /**
@@ -97,6 +101,8 @@
         if (value && typeof value === 'string' && value != 'null' && value != 'undefined') {
           state.value = value.split(',');
           selectValues.value = value.split(',');
+        } else {
+          selectValues.value = value;
         }
       }
 
diff --git a/src/components/Form/src/jeecg/components/JSelectUser.vue b/src/components/Form/src/jeecg/components/JSelectUser.vue
index 17435c3..9da5948 100644
--- a/src/components/Form/src/jeecg/components/JSelectUser.vue
+++ b/src/components/Form/src/jeecg/components/JSelectUser.vue
@@ -48,7 +48,7 @@
       //下拉框选项值
       const selectOptions = ref<SelectTypes['options']>([]);
       //下拉框选中值
-      let selectValues = reactive<object>({
+      let selectValues = reactive<Recordable>({
         value: [],
         change: false,
       });
@@ -102,6 +102,9 @@
         if (value && typeof value === 'string' && value != 'null' && value != 'undefined') {
           state.value = value.split(',');
           selectValues.value = value.split(',');
+        } else {
+          // 【VUEN-857】兼容数组（行编辑的用法问题）
+          selectValues.value = value;
         }
       }
 
diff --git a/src/components/Form/src/jeecg/components/JSwitch.vue b/src/components/Form/src/jeecg/components/JSwitch.vue
index baebadf..869f886 100644
--- a/src/components/Form/src/jeecg/components/JSwitch.vue
+++ b/src/components/Form/src/jeecg/components/JSwitch.vue
@@ -1,6 +1,6 @@
 <template>
   <div :class="prefixCls">
-    <a-select v-if="query" :options="selectOptions" :disabled="disabled" style="width: 100%" v-bind="attrs" @change="onSelectChange" />
+    <a-select v-if="query" v-model:value="value" :options="selectOptions" :disabled="disabled" style="width: 100%" v-bind="attrs" @change="onSelectChange" />
     <a-switch v-else v-model:checked="checked" :disabled="disabled" v-bind="attrs" @change="onSwitchChange" />
   </div>
 </template>
diff --git a/src/components/Form/src/jeecg/components/JTreeSelect.vue b/src/components/Form/src/jeecg/components/JTreeSelect.vue
index 358a3c7..6b2b2c9 100644
--- a/src/components/Form/src/jeecg/components/JTreeSelect.vue
+++ b/src/components/Form/src/jeecg/components/JTreeSelect.vue
@@ -39,11 +39,14 @@
     dict: propTypes.string.def('id'),
     parentCode: propTypes.string.def(''),
     pidField: propTypes.string.def('pid'),
-    pidValue: propTypes.string.def('0'),
+    //update-begin---author:wangshuai ---date:20220620  for：JTreeSelect组件pidValue还原成空，否则会影响自定义组件树示例------------
+    pidValue: propTypes.string.def(''),
+    //update-end---author:wangshuai ---date:20220620  for：JTreeSelect组件pidValue还原成空，否则会影响自定义组件树示例--------------
     hasChildField: propTypes.string.def(''),
     condition: propTypes.string.def(''),
     multiple: propTypes.bool.def(false),
     loadTriggleChange: propTypes.bool.def(false),
+    reload: propTypes.number.def(1),
   });
   const attrs = useAttrs();
   const emit = defineEmits(['change', 'update:value']);
@@ -75,6 +78,19 @@
     { deep: true, immediate: true }
   );
 
+  //update-begin-author:taoyan date:2022-5-25 for: VUEN-1056 15、严重——online树表单，添加的时候，父亲节点是空的
+  watch(
+    () => props.reload,
+    async () => {
+      treeData.value = [];
+      await loadRoot();
+    },
+    {
+      immediate: false,
+    }
+  );
+  //update-end-author:taoyan date:2022-5-25 for: VUEN-1056 15、严重——online树表单，添加的时候，父亲节点是空的
+
   /**
    * 根据code获取下拉数据并回显
    */
diff --git a/src/components/Form/src/jeecg/components/JUpload/JUpload.vue b/src/components/Form/src/jeecg/components/JUpload/JUpload.vue
index 4091065..0459e6e 100644
--- a/src/components/Form/src/jeecg/components/JUpload/JUpload.vue
+++ b/src/components/Form/src/jeecg/components/JUpload/JUpload.vue
@@ -367,6 +367,12 @@
             display: none;
           }
         }
+
+        /* update-begin-author:taoyan date:2022-5-24 for:VUEN-1093详情界面 图片下载按钮显示不全*/
+        .upload-download-handler {
+          right: 6px !important;
+        }
+        /* update-end-author:taoyan date:2022-5-24 for:VUEN-1093详情界面 图片下载按钮显示不全*/
       }
 
       .ant-upload-list-item {
diff --git a/src/components/Form/src/jeecg/components/base/JSelectBiz.vue b/src/components/Form/src/jeecg/components/base/JSelectBiz.vue
index fba8c66..e5af5b9 100644
--- a/src/components/Form/src/jeecg/components/base/JSelectBiz.vue
+++ b/src/components/Form/src/jeecg/components/base/JSelectBiz.vue
@@ -17,13 +17,15 @@
           :open="false"
           :disabled="disabled"
           :options="options"
+          :maxTagCount="maxTagCount"
           @change="handleChange"
           style="width: 100%"
           @click="!disabled && openModal(false)"
         ></a-select>
       </a-col>
       <a-col v-if="showButton" class="right">
-        <a-button type="primary" @click="openModal(true)" :disabled="disabled">选择</a-button>
+        <a-button v-if="buttonIcon" :preIcon="buttonIcon" type="primary" @click="openModal(true)" :disabled="disabled">选择</a-button>
+        <a-button v-else type="primary" @click="openModal(true)" :disabled="disabled">选择</a-button>
       </a-col>
     </a-row>
   </div>
@@ -52,6 +54,10 @@
       },
       // 是否正在加载
       loading: propTypes.bool.def(false),
+      // 最多显示多少个 tag
+      maxTagCount: propTypes.number,
+      // buttonIcon
+      buttonIcon: propTypes.string.def(''),
     },
     emits: ['handleOpen', 'change'],
     setup(props, { emit, refs }) {
diff --git a/src/components/Form/src/jeecg/components/modal/DeptSelectModal.vue b/src/components/Form/src/jeecg/components/modal/DeptSelectModal.vue
index 506c559..6fddce4 100644
--- a/src/components/Form/src/jeecg/components/modal/DeptSelectModal.vue
+++ b/src/components/Form/src/jeecg/components/modal/DeptSelectModal.vue
@@ -1,7 +1,7 @@
 <!--部门选择框-->
 <template>
   <div>
-    <BasicModal v-bind="$attrs" @register="register" title="部门选择" width="500px" @ok="handleOk" destroyOnClose @visible-change="visibleChange">
+    <BasicModal v-bind="$attrs" @register="register" :title="modalTitle" width="500px" @ok="handleOk" destroyOnClose @visible-change="visibleChange">
       <BasicTree
         ref="treeRef"
         :treeData="treeData"
@@ -47,6 +47,11 @@
     },
     props: {
       ...treeProps,
+      //选择框标题
+      modalTitle: {
+        type: String,
+        default: '部门选择',
+      },
     },
     emits: ['register', 'getSelectResult'],
     setup(props, { emit, refs }) {
@@ -55,7 +60,7 @@
       const attrs = useAttrs();
       const treeRef = ref<Nullable<TreeActionType>>(null);
       const getBindValue = Object.assign({}, unref(props), unref(attrs));
-      const queryUrl = props.sync ? queryDepartTreeSync : queryTreeList;
+      const queryUrl = getQueryUrl();
       const [{ visibleChange, checkedKeys, getCheckStrictly, getSelectTreeData, onCheck, onLoadData, treeData, checkALL, expandAll, onSelect }] = useTreeBiz(treeRef, queryUrl, getBindValue);
       const searchInfo = ref(props.params);
       const tree = ref([]);
@@ -75,6 +80,12 @@
         });
       }
 
+      /** 获取查询数据方法 */
+      function getQueryUrl() {
+        let queryFn = props.sync ? queryDepartTreeSync : queryTreeList;
+        return (params) => queryFn(Object.assign({}, params, { primaryKey: props.primaryKey }));
+      }
+
       return {
         tree,
         handleOk,
diff --git a/src/components/Form/src/jeecg/components/modal/JPopupOnlReportModal.vue b/src/components/Form/src/jeecg/components/modal/JPopupOnlReportModal.vue
index aa89625..b108c6a 100644
--- a/src/components/Form/src/jeecg/components/modal/JPopupOnlReportModal.vue
+++ b/src/components/Form/src/jeecg/components/modal/JPopupOnlReportModal.vue
@@ -78,7 +78,9 @@
       //此处需要异步加载BasicTable
       BasicModal,
       SearchFormItem: createAsyncComponent(() => import('/@/components/jeecg/OnLine/SearchFormItem.vue'), { loading: false }),
-      BasicTable: createAsyncComponent(() => import('/@/components/Table/src/BasicTable.vue'), { loading: true }),
+      BasicTable: createAsyncComponent(() => import('/@/components/Table/src/BasicTable.vue'), {
+        loading: true,
+      }),
     },
     props: ['multi', 'code', 'sorter', 'groupId', 'param'],
     emits: ['ok', 'register'],
@@ -101,7 +103,7 @@
       const tableScroll = ref({ x: true });
       const getBindValue = Object.assign({}, unref(props), unref(attrs));
       const [
-        { visibleChange, loadColumnsInfo, dynamicParamHandler, loadData, handleChangeInTable, combineRowKey, clickThenCheck, filterUnuseSelect },
+        { visibleChange, loadColumnsInfo, dynamicParamHandler, loadData, handleChangeInTable, combineRowKey, clickThenCheck, filterUnuseSelect, getOkSelectRows },
         { visible, rowSelection, checkedKeys, selectRows, pagination, dataSource, columns, loading, title, iSorter, queryInfo, queryParam, dictOptions },
       ] = usePopBiz(getBindValue);
 
@@ -149,6 +151,19 @@
         }
       });
 
+      //update-begin-author:taoyan date:2022-5-31 for: VUEN-1156 popup 多数据有分页时，选中其他页，关闭popup 再点开，分页仍然选中上一次点击的分页，但数据是第一页的数据 未刷新
+      watch(
+        () => pagination.current,
+        (current) => {
+          if (current) {
+            tableRef.value.setPagination({
+              current: current,
+            });
+          }
+        }
+      );
+      //update-end-author:taoyan date:2022-5-31 for: VUEN-1156 popup 多数据有分页时，选中其他页，关闭popup 再点开，分页仍然选中上一次点击的分页，但数据是第一页的数据 未刷新
+
       function handleToggleSearch() {
         toggleSearchStatus.value = !unref(toggleSearchStatus);
       }
@@ -174,7 +189,10 @@
           createMessage.warning('至少选择一条记录');
           return false;
         }
-        emit('ok', unref(selectRows));
+        //update-begin-author:taoyan date:2022-5-31 for: VUEN-1155 popup 选择数据时，会选择多条重复数据
+        let rows = getOkSelectRows!();
+        emit('ok', rows);
+        //update-end-author:taoyan date:2022-5-31 for: VUEN-1155 popup 选择数据时，会选择多条重复数据
         handleCancel();
       }
 
diff --git a/src/components/Form/src/jeecg/components/modal/PositionSelectModal.vue b/src/components/Form/src/jeecg/components/modal/PositionSelectModal.vue
index 9260342..746d0d9 100644
--- a/src/components/Form/src/jeecg/components/modal/PositionSelectModal.vue
+++ b/src/components/Form/src/jeecg/components/modal/PositionSelectModal.vue
@@ -1,7 +1,7 @@
 <!--职务选择框-->
 <template>
   <div>
-    <BasicModal v-bind="$attrs" @register="register" title="职务选择" width="900px" wrapClassName="j-user-select-modal" @ok="handleOk" destroyOnClose @visible-change="visibleChange">
+    <BasicModal v-bind="$attrs" @register="register" :title="modalTitle" width="900px" wrapClassName="j-user-select-modal" @ok="handleOk" destroyOnClose @visible-change="visibleChange">
       <a-row>
         <a-col :span="showSelected ? 18 : 24">
           <BasicTable
@@ -42,10 +42,17 @@
     components: {
       //此处需要异步加载BasicTable
       BasicModal,
-      BasicTable: createAsyncComponent(() => import('/@/components/Table/src/BasicTable.vue'), { loading: true }),
+      BasicTable: createAsyncComponent(() => import('/@/components/Table/src/BasicTable.vue'), {
+        loading: true,
+      }),
     },
     props: {
       ...selectProps,
+      //选择框标题
+      modalTitle: {
+        type: String,
+        default: '职务选择',
+      },
     },
     emits: ['register', 'getSelectResult'],
     setup(props, { emit, refs }) {
@@ -118,7 +125,13 @@
             dataIndex: 'name',
             width: 40,
           },
-          { title: '操作', dataIndex: 'action', align: 'center', width: 40, slots: { customRender: 'action' } },
+          {
+            title: '操作',
+            dataIndex: 'action',
+            align: 'center',
+            width: 40,
+            slots: { customRender: 'action' },
+          },
         ],
       };
       /**
diff --git a/src/components/Form/src/jeecg/components/modal/RoleSelectModal.vue b/src/components/Form/src/jeecg/components/modal/RoleSelectModal.vue
index 9d8764c..258d8ca 100644
--- a/src/components/Form/src/jeecg/components/modal/RoleSelectModal.vue
+++ b/src/components/Form/src/jeecg/components/modal/RoleSelectModal.vue
@@ -1,7 +1,7 @@
 <!--角色选择框-->
 <template>
   <div>
-    <BasicModal v-bind="$attrs" @register="register" title="角色选择" width="800px" @ok="handleOk" destroyOnClose @visible-change="visibleChange">
+    <BasicModal v-bind="$attrs" @register="register" :title="modalTitle" width="800px" @ok="handleOk" destroyOnClose @visible-change="visibleChange">
       <BasicTable
         :columns="columns"
         v-bind="config"
@@ -29,10 +29,17 @@
     components: {
       //此处需要异步加载BasicTable
       BasicModal,
-      BasicTable: createAsyncComponent(() => import('/@/components/Table/src/BasicTable.vue'), { loading: true }),
+      BasicTable: createAsyncComponent(() => import('/@/components/Table/src/BasicTable.vue'), {
+        loading: true,
+      }),
     },
     props: {
       ...selectProps,
+      //选择框标题
+      modalTitle: {
+        type: String,
+        default: '角色选择',
+      },
     },
     emits: ['register', 'getSelectResult'],
     setup(props, { emit, refs }) {
@@ -44,7 +51,7 @@
         canResize: false,
         bordered: true,
         size: 'small',
-        rowKey: 'id',
+        rowKey: unref(props).rowKey,
       };
       const getBindValue = Object.assign({}, unref(props), unref(attrs), config);
       const [{ rowSelection, indexColumnProps, visibleChange, getSelectResult }] = useSelectBiz(getRoleList, getBindValue);
diff --git a/src/components/Form/src/jeecg/components/modal/UserSelectByDepModal.vue b/src/components/Form/src/jeecg/components/modal/UserSelectByDepModal.vue
index 9b0b8a9..41cb9e7 100644
--- a/src/components/Form/src/jeecg/components/modal/UserSelectByDepModal.vue
+++ b/src/components/Form/src/jeecg/components/modal/UserSelectByDepModal.vue
@@ -1,6 +1,6 @@
 <!--通过部门选择用户-->
 <template>
-  <BasicModal v-bind="$attrs" @register="register" title="用户选择" width="1200px" @ok="handleOk" destroyOnClose @visible-change="visibleChange">
+  <BasicModal v-bind="$attrs" @register="register" :title="modalTitle" width="1200px" @ok="handleOk" destroyOnClose @visible-change="visibleChange">
     <a-row :gutter="10">
       <a-col :md="7" :sm="24">
         <a-card :style="{ minHeight: '613px', overflow: 'auto' }">
@@ -43,10 +43,17 @@
       //此处需要异步加载BasicTable
       BasicModal,
       BasicTree,
-      BasicTable: createAsyncComponent(() => import('/@/components/Table/src/BasicTable.vue'), { loading: true }),
+      BasicTable: createAsyncComponent(() => import('/@/components/Table/src/BasicTable.vue'), {
+        loading: true,
+      }),
     },
     props: {
       ...selectProps,
+      //选择框标题
+      modalTitle: {
+        type: String,
+        default: '部门用户选择',
+      },
     },
     emits: ['register', 'getSelectResult'],
     setup(props, { emit, refs }) {
diff --git a/src/components/Form/src/jeecg/components/modal/UserSelectModal.vue b/src/components/Form/src/jeecg/components/modal/UserSelectModal.vue
index 7fdc7c7..d308532 100644
--- a/src/components/Form/src/jeecg/components/modal/UserSelectModal.vue
+++ b/src/components/Form/src/jeecg/components/modal/UserSelectModal.vue
@@ -1,11 +1,13 @@
 <!--用户选择框-->
 <template>
   <div>
-    <BasicModal v-bind="$attrs" @register="register" title="用户选择" width="900px" wrapClassName="j-user-select-modal" @ok="handleOk" destroyOnClose @visible-change="visibleChange">
+    <BasicModal v-bind="$attrs" @register="register" :title="modalTitle" width="900px" wrapClassName="j-user-select-modal" @ok="handleOk" destroyOnClose @visible-change="visibleChange">
       <a-row>
         <a-col :span="showSelected ? 18 : 24">
           <BasicTable
+            ref="tableRef"
             :columns="columns"
+            :scroll="tableScroll"
             v-bind="getBindValue"
             :useSearchForm="true"
             :formConfig="formConfig"
@@ -13,7 +15,11 @@
             :searchInfo="searchInfo"
             :rowSelection="rowSelection"
             :indexColumnProps="indexColumnProps"
-          ></BasicTable>
+          >
+            <!-- update-begin-author:taoyan date:2022-5-25 for: VUEN-1112一对多 用户选择 未显示选择条数，及清空 -->
+            <template #tableTitle></template>
+            <!-- update-end-author:taoyan date:2022-5-25 for: VUEN-1112一对多 用户选择 未显示选择条数，及清空 -->
+          </BasicTable>
         </a-col>
         <a-col :span="showSelected ? 6 : 0">
           <BasicTable v-bind="selectedTable" :dataSource="selectRows" :useSearchForm="true" :formConfig="{ showActionButtonGroup: false, baseRowStyle: { minHeight: '40px' } }">
@@ -41,15 +47,39 @@
     components: {
       //此处需要异步加载BasicTable
       BasicModal,
-      BasicTable: createAsyncComponent(() => import('/@/components/Table/src/BasicTable.vue'), { loading: true }),
+      BasicTable: createAsyncComponent(() => import('/@/components/Table/src/BasicTable.vue'), {
+        loading: true,
+      }),
     },
     props: {
       ...selectProps,
+      //选择框标题
+      modalTitle: {
+        type: String,
+        default: '选择用户',
+      },
     },
     emits: ['register', 'getSelectResult'],
     setup(props, { emit, refs }) {
+      // update-begin-author:taoyan date:2022-5-24 for: VUEN-1086 【移动端】用户选择 查询按钮 效果不好 列表展示没有滚动条
+      const tableScroll = ref<any>({ x: false });
+      const tableRef = ref();
       //注册弹框
-      const [register, { closeModal }] = useModalInner();
+      const [register, { closeModal }] = useModalInner(() => {
+        if (window.innerWidth < 900) {
+          tableScroll.value = { x: 900 };
+        } else {
+          tableScroll.value = { x: false };
+        }
+        //update-begin-author:taoyan date:2022-6-2 for: VUEN-1112 一对多 用户选择 未显示选择条数，及清空
+        setTimeout(() => {
+          if (tableRef.value) {
+            tableRef.value.setSelectedRowKeys(selectValues['value'] || []);
+          }
+        }, 800);
+        //update-end-author:taoyan date:2022-6-2 for: VUEN-1112 一对多 用户选择 未显示选择条数，及清空
+      });
+      // update-end-author:taoyan date:2022-5-24 for: VUEN-1086 【移动端】用户选择 查询按钮 效果不好 列表展示没有滚动条
       const attrs = useAttrs();
       //表格配置
       const config = {
@@ -58,7 +88,7 @@
         size: 'small',
       };
       const getBindValue = Object.assign({}, unref(props), unref(attrs), config);
-      const [{ rowSelection, visibleChange, indexColumnProps, getSelectResult, handleDeleteSelected, selectRows }] = useSelectBiz(getUserList, getBindValue);
+      const [{ rowSelection, visibleChange, selectValues, indexColumnProps, getSelectResult, handleDeleteSelected, selectRows }] = useSelectBiz(getUserList, getBindValue);
       const searchInfo = ref(props.params);
       //查询form
       const formConfig = {
@@ -71,6 +101,16 @@
           xl: 6,
           xxl: 6,
         },
+        //update-begin-author:taoyan date:2022-5-24 for: VUEN-1086 【移动端】用户选择 查询按钮 效果不好 列表展示没有滚动条---查询表单按钮的栅格布局和表单的保持一致
+        actionColOptions: {
+          xs: 24,
+          sm: 8,
+          md: 8,
+          lg: 8,
+          xl: 8,
+          xxl: 8,
+        },
+        //update-end-author:taoyan date:2022-5-24 for: VUEN-1086 【移动端】用户选择 查询按钮 效果不好 列表展示没有滚动条---查询表单按钮的栅格布局和表单的保持一致
         schemas: [
           {
             label: '账号',
@@ -133,7 +173,13 @@
             dataIndex: 'realname',
             width: 40,
           },
-          { title: '操作', dataIndex: 'action', align: 'center', width: 40, slots: { customRender: 'action' } },
+          {
+            title: '操作',
+            dataIndex: 'action',
+            align: 'center',
+            width: 40,
+            slots: { customRender: 'action' },
+          },
         ],
       };
       /**
@@ -163,6 +209,8 @@
         selectRows,
         selectedTable,
         handleDeleteSelected,
+        tableScroll,
+        tableRef,
       };
     },
   });
diff --git a/src/components/Form/src/jeecg/hooks/useSelectBiz.ts b/src/components/Form/src/jeecg/hooks/useSelectBiz.ts
index 029bebb..d743e7f 100644
--- a/src/components/Form/src/jeecg/hooks/useSelectBiz.ts
+++ b/src/components/Form/src/jeecg/hooks/useSelectBiz.ts
@@ -5,7 +5,7 @@ export function useSelectBiz(getList, props) {
   //接收下拉框选项
   const selectOptions = inject('selectOptions', ref<Array<object>>([]));
   //接收已选择的值
-  const selectValues = <object>inject('selectValues', reactive({}));
+  const selectValues = <object>inject('selectValues', reactive({ value: [], change: false }));
   // 是否正在加载回显
   const loadingEcho = inject<Ref<boolean>>('loadingEcho', ref(false));
   //数据集
@@ -62,7 +62,9 @@ export function useSelectBiz(getList, props) {
    * 选择列配置
    */
   const rowSelection = {
-    type: 'checkbox',
+    //update-begin-author:liusq---date:20220517--for: 动态设置rowSelection的type值,默认是'checkbox' ---
+    type: props.isRadioSelection ? 'radio' : 'checkbox',
+    //update-end-author:liusq---date:20220517--for: 动态设置rowSelection的type值,默认是'checkbox' ---
     columnWidth: 20,
     selectedRowKeys: checkedKeys,
     onChange: onSelectChange,
@@ -141,6 +143,20 @@ export function useSelectBiz(getList, props) {
     selectRows.value = [];
   }
   return [
-    { onSelectChange, getDataSource, visibleChange, selectOptions, selectValues, rowSelection, indexColumnProps, checkedKeys, selectRows, dataSource, getSelectResult, handleDeleteSelected, reset },
+    {
+      onSelectChange,
+      getDataSource,
+      visibleChange,
+      selectOptions,
+      selectValues,
+      rowSelection,
+      indexColumnProps,
+      checkedKeys,
+      selectRows,
+      dataSource,
+      getSelectResult,
+      handleDeleteSelected,
+      reset,
+    },
   ];
 }
diff --git a/src/components/Form/src/jeecg/props/props.ts b/src/components/Form/src/jeecg/props/props.ts
index 64c3830..3a5fa79 100644
--- a/src/components/Form/src/jeecg/props/props.ts
+++ b/src/components/Form/src/jeecg/props/props.ts
@@ -2,6 +2,13 @@
 import { propTypes } from '/@/utils/propTypes';
 
 export const selectProps = {
+  //是否多选
+  isRadioSelection: {
+    type: Boolean,
+    //update-begin---author:wangshuai ---date:20220527  for：部门用户组件默认应该单选，否则其他地方有问题------------
+    default: false,
+    //update-end---author:wangshuai ---date:20220527  for：部门用户组件默认应该单选，否则其他地方有问题--------------
+  },
   //回传value字段名
   rowKey: {
     type: String,
diff --git a/src/components/Form/src/types/form.ts b/src/components/Form/src/types/form.ts
index dd2f1c1..35c16d8 100644
--- a/src/components/Form/src/types/form.ts
+++ b/src/components/Form/src/types/form.ts
@@ -1,5 +1,5 @@
 import type { NamePath, RuleObject } from 'ant-design-vue/lib/form/interface';
-import type { VNode } from 'vue';
+import type { VNode, ComputedRef } from 'vue';
 import type { ButtonProps as AntdButtonProps } from '/@/components/Button';
 import type { FormItem } from './formItem';
 import type { ColEx, ComponentType } from './index';
@@ -34,6 +34,7 @@ export interface FormActionType {
   updateSchema: (data: Partial<FormSchema> | Partial<FormSchema>[]) => Promise<void>;
   resetSchema: (data: Partial<FormSchema> | Partial<FormSchema>[]) => Promise<void>;
   setProps: (formProps: Partial<FormProps>) => Promise<void>;
+  getProps: ComputedRef<Partial<FormProps>>;
   removeSchemaByFiled: (field: string | string[]) => Promise<void>;
   appendSchemaByField: (schema: FormSchema, prefixField: string | undefined, first?: boolean | undefined) => Promise<void>;
   validateFields: (nameList?: NamePath[]) => Promise<any>;
@@ -189,6 +190,9 @@ export interface FormSchema {
   dynamicDisabled?: boolean | ((renderCallbackParams: RenderCallbackParams) => boolean);
 
   dynamicRules?: (renderCallbackParams: RenderCallbackParams) => Rule[];
+
+  // 这个属性自定义的 用于自定义的业务 比如在表单打开的时候修改表单的禁用状态，但是又不能重写componentProps，因为他的内容太多了，所以使用dynamicDisabled和buss实现
+  buss?: any;
 }
 export interface HelpComponentProps {
   maxWidth: string;
diff --git a/src/components/Form/src/types/index.ts b/src/components/Form/src/types/index.ts
index ff7ce90..e422dee 100644
--- a/src/components/Form/src/types/index.ts
+++ b/src/components/Form/src/types/index.ts
@@ -141,5 +141,4 @@ export type ComponentType =
   | 'JSearchSelect'
   | 'JAddInput'
   | 'Time'
-  | 'JOnlineSelectCascade'
   | 'JRangeNumber';
diff --git a/src/components/Form/src/utils/Area.ts b/src/components/Form/src/utils/Area.ts
index 61de47e..c410ec5 100644
--- a/src/components/Form/src/utils/Area.ts
+++ b/src/components/Form/src/utils/Area.ts
@@ -98,6 +98,11 @@ const jeecgAreaData = new Area();
 
 // 根据code找文本
 const getAreaTextByCode = function (code) {
+  //update-begin-author:liusq---date:20220531--for: 判断code是否是多code逗号分割的字符串，是的话，获取最后一位的code ---
+  if (code && code.includes(',')) {
+    code = code.substr(code.lastIndexOf(',') + 1);
+  }
+  //update-end-author:liusq---date:20220531--for: 判断code是否是多code逗号分割的字符串，是的话，获取最后一位的code ---
   return jeecgAreaData.getText(code);
 };
 
diff --git a/src/components/Form/src/utils/formUtils.ts b/src/components/Form/src/utils/formUtils.ts
index 9ad6f74..ea04960 100644
--- a/src/components/Form/src/utils/formUtils.ts
+++ b/src/components/Form/src/utils/formUtils.ts
@@ -58,7 +58,13 @@ export function handleRangeNumberValue(props, values) {
     if (!field || !startNumberKey || !endNumberKey || !values[field]) {
       continue;
     }
-    const [startNumber, endNumber]: number[] = values[field];
+    //update-begin-author:taoyan date:2022-5-10 for: 用于数值的范围查询 数组格式的中间转换不知道哪里出了问题，这里会变成字符串，需要再强制转成数组
+    let temp = values[field];
+    if (typeof temp === 'string') {
+      temp = temp.split(',');
+    }
+    const [startNumber, endNumber]: number[] = temp;
+    //update-end-author:taoyan date:2022-5-10 for: 用于数值的范围查询 数组格式的中间转换不知道哪里出了问题，这里会变成字符串，需要再强制转成数组
     values[startNumberKey] = startNumber;
     values[endNumberKey] = endNumber;
     Reflect.deleteProperty(values, field);
diff --git a/src/components/Icon/src/IconPicker.vue b/src/components/Icon/src/IconPicker.vue
index 1afbaff..c692ee5 100644
--- a/src/components/Icon/src/IconPicker.vue
+++ b/src/components/Icon/src/IconPicker.vue
@@ -1,5 +1,5 @@
 <template>
-  <a-input disabled :style="{ width }" :placeholder="t('component.icon.placeholder')" :class="prefixCls" v-model:value="currentSelect">
+  <a-input :disabled="disabled" :style="{ width }" :placeholder="t('component.icon.placeholder')" :class="prefixCls" v-model:value="currentSelect">
     <template #addonAfter>
       <a-popover placement="bottomLeft" trigger="click" v-model="visible" :overlayClassName="`${prefixCls}-popover`">
         <template #title>
@@ -88,6 +88,7 @@
     pageSize: propTypes.number.def(140),
     copy: propTypes.bool.def(false),
     mode: propTypes.oneOf<('svg' | 'iconify')[]>(['svg', 'iconify']).def('iconify'),
+    disabled: propTypes.bool.def(true),
   });
 
   const emit = defineEmits(['change', 'update:value']);
diff --git a/src/components/JVxeCustom/src/components/JVxeDepartSelectCell.vue b/src/components/JVxeCustom/src/components/JVxeDepartSelectCell.vue
index b919b07..8598c61 100644
--- a/src/components/JVxeCustom/src/components/JVxeDepartSelectCell.vue
+++ b/src/components/JVxeCustom/src/components/JVxeDepartSelectCell.vue
@@ -23,7 +23,9 @@
   <!--      <a-icon style="margin-left:5px;vertical-align: middle" type="close-circle" @click="handleEmpty" title="清空"/>-->
   <!--    </span>-->
   <!--  </div>-->
-  <JSelectDept :value="selectedValue" :showButton="false" v-bind="cellProps" @change="handleChange" />
+  <div :class="[prefixCls]">
+    <JSelectDept :value="selectedValue" :maxTagCount="1" :showButton="false" v-bind="cellProps" @change="handleChange" />
+  </div>
 </template>
 
 <script lang="ts">
@@ -32,8 +34,6 @@
   import { JVxeComponent } from '/@/components/jeecg/JVxeTable/types';
   import { useJVxeComponent, useJVxeCompProps } from '/@/components/jeecg/JVxeTable/hooks';
 
-  // import { isArray, isEmpty, isString } from '/@/utils/is'
-
   // import JSelectDepartModal from '@/components/jeecgbiz/modal/JSelectDepartModal'
   import { dispatchEvent } from '/@/components/jeecg/JVxeTable/utils';
   import { isArray, isEmpty, isString } from '/@/utils/is';
@@ -43,32 +43,24 @@
     components: { JSelectDept },
     props: useJVxeCompProps(),
     setup(props: JVxeComponent.Props) {
-      const { innerValue, cellProps, handleChangeCommon } = useJVxeComponent(props);
-
-      // const selectedValue = computed(() => {
-      //   let val: any = innerValue.value
-      //   if (isEmpty(val)) {
-      //     return []
-      //   }
-      //   if (isArray(val)) {
-      //     return val
-      //   }
-      //   if (isString(val)) {
-      //     // @ts-ignore
-      //     return val.split(',')
-      //   }
-      //   return [val]
-      // })
+      const { innerValue, cellProps, handleChangeCommon, useCellDesign } = useJVxeComponent(props);
+      const { prefixCls } = useCellDesign('depart-select');
 
       const selectedValue = computed(() => {
-        let val = innerValue.value;
+        let val: any = innerValue.value;
+        if (val == null) {
+          return val;
+        }
         if (isEmpty(val)) {
-          return '';
+          return [];
         }
         if (isArray(val)) {
-          return (<any>val).join(',');
+          return val;
         }
-        return val;
+        if (isString(val)) {
+          return (<string>val).split(',');
+        }
+        return [val];
       });
 
       const multiple = computed(() => cellProps.value['multi'] != false);
@@ -78,6 +70,7 @@
       }
 
       return {
+        prefixCls,
         selectedValue,
         multiple,
         cellProps,
@@ -191,4 +184,14 @@
   });
 </script>
 
-<style scoped></style>
+<style lang="less">
+  // noinspection LessUnresolvedVariable
+  @prefix-cls: ~'@{namespace}-vxe-cell-depart-select';
+
+  .@{prefix-cls} {
+    // 限制tag最大长度为100px，防止选中文字过多的选项时换行
+    .ant-select .ant-select-selection-overflow-item {
+      max-width: 100px;
+    }
+  }
+</style>
diff --git a/src/components/JVxeCustom/src/components/JVxeUserSelectCell.vue b/src/components/JVxeCustom/src/components/JVxeUserSelectCell.vue
index 18092d4..53b110c 100644
--- a/src/components/JVxeCustom/src/components/JVxeUserSelectCell.vue
+++ b/src/components/JVxeCustom/src/components/JVxeUserSelectCell.vue
@@ -1,5 +1,7 @@
 <template>
-  <JSelectUser :value="selectedValue" :showButton="false" v-bind="cellProps" @change="handleChange" />
+  <div :class="[prefixCls]">
+    <JSelectUser :value="selectedValue" :maxTagCount="1" :showButton="false" v-bind="cellProps" @change="handleChange" />
+  </div>
 </template>
 
 <script lang="ts">
@@ -15,10 +17,14 @@
     components: { JSelectUser },
     props: useJVxeCompProps(),
     setup(props: JVxeComponent.Props) {
-      const { innerValue, cellProps, handleChangeCommon } = useJVxeComponent(props);
+      const { innerValue, cellProps, handleChangeCommon, useCellDesign } = useJVxeComponent(props);
+      const { prefixCls } = useCellDesign('user-select');
 
       const selectedValue = computed(() => {
         let val: any = innerValue.value;
+        if (val == null) {
+          return val;
+        }
         if (isEmpty(val)) {
           return [];
         }
@@ -39,6 +45,7 @@
       }
 
       return {
+        prefixCls,
         selectedValue,
         multiple,
         cellProps,
@@ -66,4 +73,14 @@
   });
 </script>
 
-<style scoped></style>
+<style lang="less">
+  // noinspection LessUnresolvedVariable
+  @prefix-cls: ~'@{namespace}-vxe-cell-user-select';
+
+  .@{prefix-cls} {
+    // 限制tag最大长度为100px，防止选中文字过多的选项时换行
+    .ant-select .ant-select-selection-overflow-item {
+      max-width: 100px;
+    }
+  }
+</style>
diff --git a/src/components/Markdown/src/Markdown.vue b/src/components/Markdown/src/Markdown.vue
index 4a22412..8d272ce 100644
--- a/src/components/Markdown/src/Markdown.vue
+++ b/src/components/Markdown/src/Markdown.vue
@@ -10,6 +10,8 @@
   import { useModalContext } from '../../Modal';
   import { useRootSetting } from '/@/hooks/setting/useRootSetting';
   import { onMountedOrActivated } from '/@/hooks/core/onMountedOrActivated';
+  import { getToken } from '/@/utils/auth';
+  import { getFileAccessHttpUrl } from '/@/utils/common/compUtils';
 
   type Lang = 'zh_CN' | 'en_US' | 'ja_JP' | 'ko_KR' | undefined;
 
@@ -73,6 +75,34 @@
         }
         return lang;
       });
+      //update-begin-author:taoyan date:2022-5-24 for: VUEN-1090 markdown 无法上传
+      const uploadUrl = `${window._CONFIG['domianURL']}/sys/common/upload`;
+      const token = getToken();
+      function formatResult(files, responseText): string {
+        let data: any = JSON.parse(responseText);
+        // {"success":true,"message":"markdown/aa_1653391146501.png","code":0,"result":null,"timestamp":1653391146501}'
+        let filename = files[0].name as string;
+        let result = {
+          msg: '',
+          code: 0,
+          data: {
+            errFiles: [''],
+            succMap: {},
+          },
+        };
+        if (data.success) {
+          result.data.errFiles = [];
+          result.data.succMap = {
+            [data.message]: getFileAccessHttpUrl(data.message),
+          };
+        } else {
+          result.code = 1;
+          result.msg = data.message;
+          result.data.errFiles = [filename];
+        }
+        return JSON.stringify(result);
+      }
+      //update-end-author:taoyan date:2022-5-24 for: VUEN-1090 markdown 无法上传
       function init() {
         const wrapEl = unref(wrapRef) as HTMLElement;
         if (!wrapEl) return;
@@ -87,6 +117,22 @@
           preview: {
             actions: [],
           },
+          //update-begin-author:taoyan date:2022-5-24 for: VUEN-1090 markdown 无法上传
+          upload: {
+            accept: 'image/*',
+            url: uploadUrl,
+            fieldName: 'file',
+            extraData: { biz: 'markdown' },
+            setHeaders() {
+              return {
+                'X-Access-Token': token as string,
+              };
+            },
+            format(files, response) {
+              return formatResult(files, response);
+            },
+          },
+          //update-end-author:taoyan date:2022-5-24 for: VUEN-1090 markdown 无法上传
           input: (v) => {
             valueRef.value = v;
             emit('update:value', v);
diff --git a/src/components/Menu/src/BasicMenu.vue b/src/components/Menu/src/BasicMenu.vue
index 4e6a06f..a61fe97 100644
--- a/src/components/Menu/src/BasicMenu.vue
+++ b/src/components/Menu/src/BasicMenu.vue
@@ -109,13 +109,15 @@
           }
         );
 
-      async function handleMenuClick({ key }: { key: string; keyPath: string[] }) {
+      //update-begin-author:taoyan date:2022-6-1 for: VUEN-1144 online 配置成菜单后，打开菜单，显示名称未展示为菜单名称
+      async function handleMenuClick({ item, key }: { item: any; key: string; keyPath: string[] }) {
         const { beforeClickFn } = props;
         if (beforeClickFn && isFunction(beforeClickFn)) {
           const flag = await beforeClickFn(key);
           if (!flag) return;
         }
-        emit('menuClick', key);
+        emit('menuClick', key, item);
+        //update-end-author:taoyan date:2022-6-1 for: VUEN-1144 online 配置成菜单后，打开菜单，显示名称未展示为菜单名称
 
         isClickGo.value = true;
         // const parentPath = await getCurrentParentPath(key);
diff --git a/src/components/Menu/src/components/BasicMenuItem.vue b/src/components/Menu/src/components/BasicMenuItem.vue
index 2a56562..fd54497 100644
--- a/src/components/Menu/src/components/BasicMenuItem.vue
+++ b/src/components/Menu/src/components/BasicMenuItem.vue
@@ -1,5 +1,5 @@
 <template>
-  <MenuItem :key="item.path">
+  <MenuItem :key="item.path" :title="item.title">
     <MenuItemContent v-bind="$props" :item="item" />
   </MenuItem>
 </template>
diff --git a/src/components/SimpleMenu/src/components/MenuItem.vue b/src/components/SimpleMenu/src/components/MenuItem.vue
index fa52f3c..0b7afc7 100644
--- a/src/components/SimpleMenu/src/components/MenuItem.vue
+++ b/src/components/SimpleMenu/src/components/MenuItem.vue
@@ -24,6 +24,8 @@
   import { useMenuItem } from './useMenu';
   import { Tooltip } from 'ant-design-vue';
   import { useSimpleRootMenuContext } from './useSimpleMenuContext';
+  import { useLocaleStore } from '/@/store/modules/locale';
+
   export default defineComponent({
     name: 'MenuItem',
     components: { Tooltip },
@@ -36,6 +38,7 @@
     },
     setup(props, { slots }) {
       const instance = getCurrentInstance();
+      const localeStore = useLocaleStore();
 
       const active = ref(false);
 
@@ -92,6 +95,8 @@
               }
             });
 
+            //存储路径和标题的关系
+            storePathTitle(props.name);
             rootMenuEmitter.emit('on-update-active-name:submenu', uidList);
           } else {
             active.value = false;
@@ -100,6 +105,22 @@
         { immediate: true }
       );
 
+      //update-begin-author:taoyan date:2022-6-1 for: VUEN-1144 online 配置成菜单后，打开菜单，显示名称未展示为菜单名称
+      function storePathTitle(path) {
+        console.log('storePathTitle', path);
+        let title = '';
+        if (instance!.attrs) {
+          let item: any = instance!.attrs.item;
+          if (item) {
+            title = item.title;
+          }
+        }
+        if (localeStore) {
+          localeStore.setPathTitle(path, title);
+        }
+      }
+      //update-end-author:taoyan date:2022-6-1 for: VUEN-1144 online 配置成菜单后，打开菜单，显示名称未展示为菜单名称
+
       return { getClass, prefixCls, getItemStyle, getCollapse, handleClickItem, showTooptip };
     },
   });
diff --git a/src/components/Table/src/components/TableAction.vue b/src/components/Table/src/components/TableAction.vue
index 5574928..100e8cc 100644
--- a/src/components/Table/src/components/TableAction.vue
+++ b/src/components/Table/src/components/TableAction.vue
@@ -1,16 +1,22 @@
 <template>
   <div :class="[prefixCls, getAlign]" @click="onCellClick">
     <template v-for="(action, index) in getActions" :key="`${index}-${action.label}`">
-      <Tooltip v-if="action.tooltip" v-bind="getTooltip(action.tooltip)">
-        <PopConfirmButton v-bind="action">
+      <template v-if="action.slot">
+        <slot name="customButton"></slot>
+      </template>
+      <template v-else>
+        <Tooltip v-if="action.tooltip" v-bind="getTooltip(action.tooltip)">
+          <PopConfirmButton v-bind="action">
+            <Icon :icon="action.icon" :class="{ 'mr-1': !!action.label }" v-if="action.icon" />
+            <template v-if="action.label">{{ action.label }}</template>
+          </PopConfirmButton>
+        </Tooltip>
+        <PopConfirmButton v-else v-bind="action">
           <Icon :icon="action.icon" :class="{ 'mr-1': !!action.label }" v-if="action.icon" />
           <template v-if="action.label">{{ action.label }}</template>
         </PopConfirmButton>
-      </Tooltip>
-      <PopConfirmButton v-else v-bind="action">
-        <Icon :icon="action.icon" :class="{ 'mr-1': !!action.label }" v-if="action.icon" />
-        <template v-if="action.label">{{ action.label }}</template>
-      </PopConfirmButton>
+      </template>
+
       <Divider type="vertical" class="action-divider" v-if="divider && index < getActions.length - 1" />
     </template>
     <Dropdown :trigger="['hover']" :dropMenuList="getDropdownList" popconfirm v-if="dropDownActions && getDropdownList.length > 0">
@@ -93,21 +99,21 @@
       });
 
       const getDropdownList = computed((): any[] => {
-        return (toRaw(props.dropDownActions) || [])
-          .filter((action) => {
-            return hasPermission(action.auth) && isIfShow(action);
-          })
-          .map((action, index) => {
-            const { label, popConfirm } = action;
-            return {
-              ...action,
-              ...popConfirm,
-              onConfirm: popConfirm?.confirm,
-              onCancel: popConfirm?.cancel,
-              text: label,
-              divider: index < props.dropDownActions.length - 1 ? props.divider : false,
-            };
-          });
+        //过滤掉隐藏的dropdown,避免出现多余的分割线
+        const list = (toRaw(props.dropDownActions) || []).filter((action) => {
+          return hasPermission(action.auth) && isIfShow(action);
+        });
+        return list.map((action, index) => {
+          const { label, popConfirm } = action;
+          return {
+            ...action,
+            ...popConfirm,
+            onConfirm: popConfirm?.confirm,
+            onCancel: popConfirm?.cancel,
+            text: label,
+            divider: index < list.length - 1 ? props.divider : false,
+          };
+        });
       });
 
       const getAlign = computed(() => {
diff --git a/src/components/Table/src/components/TableHeader.vue b/src/components/Table/src/components/TableHeader.vue
index a9d5682..ba4f9c3 100644
--- a/src/components/Table/src/components/TableHeader.vue
+++ b/src/components/Table/src/components/TableHeader.vue
@@ -18,7 +18,7 @@
           <template #content>
             <TableSetting mode="mobile" :setting="tableSetting" v-if="showTableSetting" @columns-change="handleColumnChange" />
           </template>
-          <a-button :class="`${prefixCls}__toolbar-mobile`" type="text" preIcon="ant-design:menu" shape="circle" />
+          <a-button :class="`${prefixCls}__toolbar-mobile`" v-if="showTableSetting" type="text" preIcon="ant-design:menu" shape="circle" />
         </a-popover>
       </div>
     </div>
diff --git a/src/components/Table/src/components/settings/ColumnSetting.vue b/src/components/Table/src/components/settings/ColumnSetting.vue
index fff33b5..438c53a 100644
--- a/src/components/Table/src/components/settings/ColumnSetting.vue
+++ b/src/components/Table/src/components/settings/ColumnSetting.vue
@@ -3,7 +3,14 @@
     <template #title>
       <span>{{ t('component.table.settingColumn') }}</span>
     </template>
-    <Popover placement="bottomLeft" trigger="click" @visibleChange="handleVisibleChange" :overlayClassName="`${prefixCls}__cloumn-list`" :getPopupContainer="getPopupContainer">
+    <Popover
+      v-model:visible="popoverVisible"
+      placement="bottomLeft"
+      trigger="click"
+      @visibleChange="handleVisibleChange"
+      :overlayClassName="`${prefixCls}__cloumn-list`"
+      :getPopupContainer="getPopupContainer"
+    >
       <template #title>
         <div :class="`${prefixCls}__popover-title`">
           <Checkbox :indeterminate="indeterminate" v-model:checked="checkAll" @change="onCheckAllChange">
@@ -21,10 +28,6 @@
           <!--                    >-->
           <!--                        {{ t('component.table.settingSelectColumnShow') }}-->
           <!--                    </Checkbox>-->
-
-          <a-button size="small" type="link" @click="reset">
-            {{ t('common.resetText') }}
-          </a-button>
         </div>
       </template>
 
@@ -33,7 +36,7 @@
           <CheckboxGroup v-model:value="checkedList" @change="onChange" ref="columnListRef">
             <template v-for="item in plainOptions" :key="item.value">
               <div :class="`${prefixCls}__check-item`" v-if="!('ifShow' in item && !item.ifShow)">
-                <DragOutlined class="table-coulmn-drag-icon" />
+                <DragOutlined class="table-column-drag-icon" />
                 <Checkbox :value="item.value">
                   {{ item.label }}
                 </Checkbox>
@@ -75,6 +78,12 @@
             </template>
           </CheckboxGroup>
         </ScrollContainer>
+        <div :class="`${prefixCls}__popover-footer`">
+          <a-button size="small" @click="reset">
+            {{ t('common.resetText') }}
+          </a-button>
+          <a-button size="small" type="primary" @click="saveSetting"> 保存 </a-button>
+        </div>
       </template>
       <SettingOutlined />
     </Popover>
@@ -89,14 +98,18 @@
   import { ScrollContainer } from '/@/components/Container';
   import { useI18n } from '/@/hooks/web/useI18n';
   import { useTableContext } from '../../hooks/useTableContext';
+  import { useColumnsCache } from '../../hooks/useColumnsCache';
   import { useDesign } from '/@/hooks/web/useDesign';
-  import { useSortable } from '/@/hooks/web/useSortable';
+  // import { useSortable } from '/@/hooks/web/useSortable';
   import { isFunction, isNullAndUnDef } from '/@/utils/is';
   import { getPopupContainer as getParentContainer } from '/@/utils';
-  import { omit } from 'lodash-es';
+  import { cloneDeep, omit } from 'lodash-es';
+  import Sortablejs from 'sortablejs';
+  import type Sortable from 'sortablejs';
 
   interface State {
     checkAll: boolean;
+    isInit?: boolean;
     checkedList: string[];
     defaultCheckList: string[];
   }
@@ -128,12 +141,13 @@
     setup(props, { emit, attrs }) {
       const { t } = useI18n();
       const table = useTableContext();
+      const popoverVisible = ref(false);
 
       const defaultRowSelection = omit(table.getRowSelection(), 'selectedRowKeys');
       let inited = false;
 
       const cachePlainOptions = ref<Options[]>([]);
-      const plainOptions = ref<Options[]>([]);
+      const plainOptions = ref<Options[] | any>([]);
 
       const plainSortOptions = ref<Options[]>([]);
 
@@ -162,9 +176,26 @@
         return obj;
       });
 
+      let sortable: Sortable;
+      const sortableOrder = ref<string[]>();
+
+      // 列表字段配置缓存
+      const { saveSetting, resetSetting } = useColumnsCache(
+        {
+          state,
+          popoverVisible,
+          plainOptions,
+          plainSortOptions,
+          sortableOrder,
+          checkIndex,
+        },
+        setColumns,
+        handleColumnFixed
+      );
+
       watchEffect(() => {
         const columns = table.getColumns();
-        if (columns.length) {
+        if (columns.length && !state.isInit) {
           init();
         }
       });
@@ -217,6 +248,7 @@
             }
           });
         }
+        state.isInit = true;
         state.checkedList = checkList;
       }
 
@@ -234,16 +266,15 @@
 
       const indeterminate = computed(() => {
         const len = plainOptions.value.length;
-        let checkdedLen = state.checkedList.length;
-        unref(checkIndex) && checkdedLen--;
-        return checkdedLen > 0 && checkdedLen < len;
+        let checkedLen = state.checkedList.length;
+        unref(checkIndex) && checkedLen--;
+        return checkedLen > 0 && checkedLen < len;
       });
 
       // Trigger when check/uncheck a column
       function onChange(checkedList: string[]) {
-        const len = plainOptions.value.length;
+        const len = plainSortOptions.value.length;
         state.checkAll = checkedList.length === len;
-
         const sortList = unref(plainSortOptions).map((item) => item.value);
         checkedList.sort((prev, next) => {
           return sortList.indexOf(prev) - sortList.indexOf(next);
@@ -258,6 +289,10 @@
         plainOptions.value = unref(cachePlainOptions);
         plainSortOptions.value = unref(cachePlainOptions);
         setColumns(table.getCacheColumns());
+        if (sortableOrder.value) {
+          sortable.sort(sortableOrder.value);
+        }
+        resetSetting();
       }
 
       // Open the pop-up window for drag and drop initialization
@@ -269,15 +304,18 @@
           const el = columnListEl.$el as any;
           if (!el) return;
           // Drag and drop sort
-          const { initSortable } = useSortable(el, {
-            handle: '.table-coulmn-drag-icon ',
+          sortable = Sortablejs.create(unref(el), {
+            animation: 500,
+            delay: 400,
+            delayOnTouchOnly: true,
+            handle: '.table-column-drag-icon ',
             onEnd: (evt) => {
               const { oldIndex, newIndex } = evt;
               if (isNullAndUnDef(oldIndex) || isNullAndUnDef(newIndex) || oldIndex === newIndex) {
                 return;
               }
               // Sort column
-              const columns = getColumns();
+              const columns = cloneDeep(plainSortOptions.value);
 
               if (oldIndex > newIndex) {
                 columns.splice(newIndex, 0, columns[oldIndex]);
@@ -288,11 +326,13 @@
               }
 
               plainSortOptions.value = columns;
-              plainOptions.value = columns;
               setColumns(columns);
             },
           });
-          initSortable();
+          // 记录原始 order 序列
+          if (!sortableOrder.value) {
+            sortableOrder.value = sortable.toArray();
+          }
           inited = true;
         });
       }
@@ -325,13 +365,13 @@
         if (isFixed && !item.width) {
           item.width = 100;
         }
-        table.setCacheColumnsByField?.(item.dataIndex, { fixed: isFixed });
+        table.setCacheColumnsByField?.(item.dataIndex as string, { fixed: isFixed });
         setColumns(columns);
       }
 
       function setColumns(columns: BasicColumn[] | string[]) {
         table.setColumns(columns);
-        const data: ColumnChangeParam[] = unref(plainOptions).map((col) => {
+        const data: ColumnChangeParam[] = unref(plainSortOptions).map((col) => {
           const visible = columns.findIndex((c: BasicColumn | string) => c === col.value || (typeof c !== 'string' && c.dataIndex === col.value)) !== -1;
           return { dataIndex: col.value, fixed: col.fixed, visible };
         });
@@ -347,11 +387,13 @@
         getBindProps,
         t,
         ...toRefs(state),
+        popoverVisible,
         indeterminate,
         onCheckAllChange,
         onChange,
         plainOptions,
         reset,
+        saveSetting,
         prefixCls,
         columnListRef,
         handleVisibleChange,
@@ -369,7 +411,7 @@
 <style lang="less">
   @prefix-cls: ~'@{namespace}-basic-column-setting';
 
-  .table-coulmn-drag-icon {
+  .table-column-drag-icon {
     margin: 0 5px;
     cursor: move;
   }
@@ -382,6 +424,19 @@
       justify-content: space-between;
     }
 
+    /* 卡片底部样式 */
+    &__popover-footer {
+      position: relative;
+      top: 7px;
+      text-align: right;
+      padding: 4px 0 0;
+      border-top: 1px solid #f0f0f0;
+
+      .ant-btn {
+        margin-right: 6px;
+      }
+    }
+
     &__check-item {
       display: flex;
       align-items: center;
diff --git a/src/components/Table/src/hooks/useColumns.ts b/src/components/Table/src/hooks/useColumns.ts
index fe312b3..9df470f 100644
--- a/src/components/Table/src/hooks/useColumns.ts
+++ b/src/components/Table/src/hooks/useColumns.ts
@@ -188,11 +188,13 @@ export function useColumns(propsRef: ComputedRef<BasicTableProps>, getPagination
       }
     });
   }
+
+  // update-begin--author:sunjianlei---date:20220523---for: 【VUEN-1089】合并vben最新版代码，解决表格字段排序问题
   /**
    * set columns
    * @param columnList key｜column
    */
-  function setColumns(columnList: Partial<BasicColumn>[] | string[]) {
+  function setColumns(columnList: Partial<BasicColumn>[] | (string | string[])[]) {
     const columns = cloneDeep(columnList);
     if (!isArray(columns)) return;
 
@@ -205,34 +207,27 @@ export function useColumns(propsRef: ComputedRef<BasicTableProps>, getPagination
 
     const cacheKeys = cacheColumns.map((item) => item.dataIndex);
 
-    if (!isString(firstColumn)) {
+    if (!isString(firstColumn) && !isArray(firstColumn)) {
       columnsRef.value = columns as BasicColumn[];
     } else {
-      const columnKeys = columns as string[];
+      const columnKeys = (columns as (string | string[])[]).map((m) => m.toString());
       const newColumns: BasicColumn[] = [];
       cacheColumns.forEach((item) => {
-        if (columnKeys.includes(item.dataIndex! || (item.key as string))) {
-          newColumns.push({
-            ...item,
-            defaultHidden: false,
-          });
-        } else {
-          newColumns.push({
-            ...item,
-            defaultHidden: true,
-          });
-        }
+        newColumns.push({
+          ...item,
+          defaultHidden: !columnKeys.includes(item.dataIndex?.toString() || (item.key as string)),
+        });
       });
-
       // Sort according to another array
       if (!isEqual(cacheKeys, columns)) {
         newColumns.sort((prev, next) => {
-          return cacheKeys.indexOf(prev.dataIndex as string) - cacheKeys.indexOf(next.dataIndex as string);
+          return columnKeys.indexOf(prev.dataIndex?.toString() as string) - columnKeys.indexOf(next.dataIndex?.toString() as string);
         });
       }
       columnsRef.value = newColumns;
     }
   }
+  // update-end--author:sunjianlei---date:20220523---for: 【VUEN-1089】合并vben最新版代码，解决表格字段排序问题
 
   function getColumns(opt?: GetColumnsParams) {
     const { ignoreIndex, ignoreAction, sort } = opt || {};
diff --git a/src/components/Table/src/hooks/useColumnsCache.ts b/src/components/Table/src/hooks/useColumnsCache.ts
new file mode 100644
index 0000000..1650608
--- /dev/null
+++ b/src/components/Table/src/hooks/useColumnsCache.ts
@@ -0,0 +1,137 @@
+import { computed, nextTick, unref, watchEffect } from 'vue';
+import { router } from '/@/router';
+import { createLocalStorage } from '/@/utils/cache';
+import { useTableContext } from './useTableContext';
+import { useMessage } from '/@/hooks/web/useMessage';
+
+/**
+ * 列表配置缓存
+ */
+export function useColumnsCache(opt, setColumns, handleColumnFixed) {
+  let isInit = false;
+  const table = useTableContext();
+  const $ls = createLocalStorage();
+  const { createMessage: $message } = useMessage();
+  // 列表配置缓存key
+  const cacheKey = computed(() => {
+    let { fullPath } = router.currentRoute.value;
+    let key = fullPath.replace(/[\/\\]/g, '_');
+    let cacheKey = table.getBindValues.value.tableSetting?.cacheKey;
+    if (cacheKey) {
+      key += ':' + cacheKey;
+    }
+    return 'columnCache:' + key;
+  });
+
+  watchEffect(() => {
+    const columns = table.getColumns();
+    if (columns.length) {
+      init();
+    }
+  });
+
+  async function init() {
+    if (isInit) {
+      return;
+    }
+    isInit = true;
+    let columnCache = $ls.get(cacheKey.value);
+    if (columnCache && columnCache.checkedList) {
+      const { checkedList, sortedList, sortableOrder, checkIndex } = columnCache;
+      await nextTick();
+      // checkbox的排序缓存
+      opt.sortableOrder.value = sortableOrder;
+      // checkbox的选中缓存
+      opt.state.checkedList = checkedList;
+      // tableColumn的排序缓存
+      opt.plainSortOptions.value.sort((prev, next) => {
+        return sortedList.indexOf(prev.value) - sortedList.indexOf(next.value);
+      });
+      // 重新排序tableColumn
+      checkedList.sort((prev, next) => sortedList.indexOf(prev) - sortedList.indexOf(next));
+      // 是否显示行号列
+      if (checkIndex) {
+        table.setProps({ showIndexColumn: true });
+      }
+      setColumns(checkedList);
+      // 设置固定列
+      setColumnFixed(columnCache);
+    }
+  }
+
+  /** 设置被固定的列 */
+  async function setColumnFixed(columnCache) {
+    const { fixedColumns } = columnCache;
+    const columns = opt.plainOptions.value;
+    for (const column of columns) {
+      let fixedCol = fixedColumns.find((fc) => fc.key === (column.key || column.dataIndex));
+      if (fixedCol) {
+        await nextTick();
+        handleColumnFixed(column, fixedCol.fixed);
+      }
+    }
+  }
+
+  // 判断列固定状态
+  const fixedReg = /^(true|left|right)$/;
+
+  /** 获取被固定的列 */
+  function getFixedColumns() {
+    let fixedColumns: any[] = [];
+    const columns = opt.plainOptions.value;
+    for (const column of columns) {
+      if (fixedReg.test((column.fixed ?? '').toString())) {
+        fixedColumns.push({
+          key: column.key || column.dataIndex,
+          fixed: column.fixed === true ? 'left' : column.fixed,
+        });
+      }
+    }
+    return fixedColumns;
+  }
+
+  /** 保存列配置 */
+  function saveSetting() {
+    const { checkedList } = opt.state;
+    const sortedList = unref(opt.plainSortOptions).map((item) => item.value);
+    $ls.set(cacheKey.value, {
+      // 保存的列
+      checkedList,
+      // 排序后的列
+      sortedList,
+      // 是否显示行号列
+      checkIndex: unref(opt.checkIndex),
+      // checkbox原始排序
+      sortableOrder: unref(opt.sortableOrder),
+      // 固定列
+      fixedColumns: getFixedColumns(),
+    });
+    $message.success('保存成功');
+    // 保存之后直接关闭
+    opt.popoverVisible.value = false;
+  }
+
+  /** 重置（删除）列配置 */
+  async function resetSetting() {
+    // 重置固定列
+    await resetFixedColumn();
+    $ls.remove(cacheKey.value);
+    $message.success('重置成功');
+  }
+
+  async function resetFixedColumn() {
+    const columns = opt.plainOptions.value;
+    for (const column of columns) {
+      column.fixed;
+      if (fixedReg.test((column.fixed ?? '').toString())) {
+        await nextTick();
+        handleColumnFixed(column, null);
+      }
+    }
+  }
+
+  return {
+    saveSetting,
+    resetSetting,
+  };
+}
diff --git a/src/components/Table/src/hooks/useTableHeader.ts b/src/components/Table/src/hooks/useTableHeader.ts
index 3f29d4e..597b5ec 100644
--- a/src/components/Table/src/hooks/useTableHeader.ts
+++ b/src/components/Table/src/hooks/useTableHeader.ts
@@ -48,7 +48,8 @@ export function useTableHeader(propsRef: ComputedRef<BasicTableProps>, slots: Sl
                       tableTop: () => getSlot(slots, 'tableTop'),
                     }
                   : {}),
-                //添加tableTop插槽
+                // 添加alertAfter插槽
+                ...(slots.alertAfter ? { alertAfter: () => getSlot(slots, 'alertAfter') } : {}),
               }
             ),
     };
diff --git a/src/components/Table/src/types/table.ts b/src/components/Table/src/types/table.ts
index e69fe85..2a33f34 100644
--- a/src/components/Table/src/types/table.ts
+++ b/src/components/Table/src/types/table.ts
@@ -127,9 +127,15 @@ export interface FetchSetting {
 }
 
 export interface TableSetting {
+  // 是否显示刷新按钮
   redo?: boolean;
+  // 是否显示尺寸调整按钮
   size?: boolean;
+  // 是否显示字段调整按钮
   setting?: boolean;
+  // 缓存“字段调整”配置的key，用于页面上有多个表格需要区分的情况
+  cacheKey?: string;
+  // 是否显示全屏按钮
   fullScreen?: boolean;
 }
 
diff --git a/src/components/Tinymce/src/Editor.vue b/src/components/Tinymce/src/Editor.vue
index 92f5b99..1859f2c 100644
--- a/src/components/Tinymce/src/Editor.vue
+++ b/src/components/Tinymce/src/Editor.vue
@@ -66,7 +66,7 @@
     },
 
     toolbar: {
-      type: Array as PropType<string[]>,
+      type: [Array as PropType<string[]>, String],
       default: toolbar,
     },
     plugins: {
@@ -74,7 +74,7 @@
       default: plugins,
     },
     menubar: {
-      type: Object,
+      type: [Object, String],
       default: menubar,
     },
     modelValue: {
diff --git a/src/components/Tinymce/src/ImgUpload.vue b/src/components/Tinymce/src/ImgUpload.vue
index b83eb9f..7609fc2 100644
--- a/src/components/Tinymce/src/ImgUpload.vue
+++ b/src/components/Tinymce/src/ImgUpload.vue
@@ -1,6 +1,6 @@
 <template>
   <div :class="[prefixCls, { fullscreen }]">
-    <Upload name="file" multiple @change="handleChange" :action="uploadUrl" :showUploadList="false" accept=".jpg,.jpeg,.gif,.png,.webp">
+    <Upload name="file" multiple @change="handleChange" :action="uploadUrl" :showUploadList="false" :data="getBizData()" :headers="getheader()" accept=".jpg,.jpeg,.gif,.png,.webp">
       <a-button type="primary" v-bind="{ ...getButtonProps }">
         {{ t('component.upload.imgUpload') }}
       </a-button>
@@ -14,6 +14,8 @@
   import { useDesign } from '/@/hooks/web/useDesign';
   import { useGlobSetting } from '/@/hooks/setting';
   import { useI18n } from '/@/hooks/web/useI18n';
+  import { getToken } from '/@/utils/auth';
+  import { getFileAccessHttpUrl } from '/@/utils/common/compUtils';
 
   export default defineComponent({
     name: 'TinymceImageUpload',
@@ -31,7 +33,20 @@
     setup(props, { emit }) {
       let uploading = false;
 
-      const { uploadUrl } = useGlobSetting();
+      //update-begin-author:taoyan date:2022-5-13 for: 富文本上传图片不支持
+      function getheader() {
+        return { 'X-Access-Token': getToken() };
+      }
+
+      function getBizData() {
+        return {
+          biz: 'jeditor',
+          jeditor: '1',
+        };
+      }
+      const { domainUrl } = useGlobSetting();
+      const uploadUrl = domainUrl + '/sys/common/upload';
+      //update-end-author:taoyan date:2022-5-13 for: 富文本上传图片不支持
       const { t } = useI18n();
       const { prefixCls } = useDesign('tinymce-img-upload');
 
@@ -45,7 +60,7 @@
       function handleChange(info: Recordable) {
         const file = info.file;
         const status = file?.status;
-        const url = file?.response?.url;
+        //const url = file?.response?.url;
         const name = file?.name;
 
         if (status === 'uploading') {
@@ -54,7 +69,10 @@
             uploading = true;
           }
         } else if (status === 'done') {
-          emit('done', name, url);
+          //update-begin-author:taoyan date:2022-5-13 for: 富文本上传图片不支持
+          let realUrl = getFileAccessHttpUrl(file.response.message);
+          emit('done', name, realUrl);
+          //update-end-author:taoyan date:2022-5-13 for: 富文本上传图片不支持
           uploading = false;
         } else if (status === 'error') {
           emit('error');
@@ -66,6 +84,8 @@
         prefixCls,
         handleChange,
         uploadUrl,
+        getheader,
+        getBizData,
         t,
         getButtonProps,
       };
diff --git a/src/components/jeecg/JVxeTable/src/components/JVxeDetailsModal.vue b/src/components/jeecg/JVxeTable/src/components/JVxeDetailsModal.vue
index 99225f4..48d63d0 100644
--- a/src/components/jeecg/JVxeTable/src/components/JVxeDetailsModal.vue
+++ b/src/components/jeecg/JVxeTable/src/components/JVxeDetailsModal.vue
@@ -15,7 +15,9 @@
 
   export default defineComponent({
     components: {
-      BasicModal: createAsyncComponent(() => import('/@/components/Modal/src/BasicModal.vue'), { loading: true }),
+      BasicModal: createAsyncComponent(() => import('/@/components/Modal/src/BasicModal.vue'), {
+        loading: true,
+      }),
     },
     props: {
       trigger: {
diff --git a/src/components/jeecg/JVxeTable/src/components/JVxeSubPopover.vue b/src/components/jeecg/JVxeTable/src/components/JVxeSubPopover.vue
index b0b5907..21698ff 100644
--- a/src/components/jeecg/JVxeTable/src/components/JVxeSubPopover.vue
+++ b/src/components/jeecg/JVxeTable/src/components/JVxeSubPopover.vue
@@ -76,6 +76,12 @@
         let className = target.className || '';
         className = isString(className) ? className : className.toString();
 
+        // 获取 td 父级
+        let td = getParentNodeByTagName(target, 'td');
+        // 点击的是拖拽排序列，不做处理
+        if (td && td.querySelector('.j-vxe-drag-box')) {
+          return;
+        }
         // 点击的是expand，不做处理
         if (className.includes('vxe-table--expand-btn')) {
           return;
@@ -119,7 +125,11 @@
           });
         } else {
           let num = ++level;
-          console.warn('【JVxeSubPopover】table or tr 获取失败，正在进行第 ' + num + '次重试', { event, table: parentElem, tr });
+          console.warn('【JVxeSubPopover】table or tr 获取失败，正在进行第 ' + num + '次重试', {
+            event,
+            table: parentElem,
+            tr,
+          });
           window.setTimeout(() => open(event, num), 100);
         }
       }
diff --git a/src/components/jeecg/JVxeTable/src/components/JVxeToolbar.vue b/src/components/jeecg/JVxeTable/src/components/JVxeToolbar.vue
index c38a266..bc130c5 100644
--- a/src/components/jeecg/JVxeTable/src/components/JVxeToolbar.vue
+++ b/src/components/jeecg/JVxeTable/src/components/JVxeToolbar.vue
@@ -64,7 +64,9 @@
     return btns.filter((btn) => {
       // 系统默认的批量删除编码配置为 batch_delete 此处需要兼容一下
       if (btn === 'remove') {
-        return hasBtnAuth(btn) || hasBtnAuth('batch_delete');
+        //update-begin-author:taoyan date:2022-6-1 for: VUEN-1162 子表按钮没控制
+        return hasBtnAuth(btn) && hasBtnAuth('batch_delete');
+        //update-end-author:taoyan date:2022-6-1 for: VUEN-1162 子表按钮没控制
       }
       return hasBtnAuth(btn);
     });
diff --git a/src/components/jeecg/JVxeTable/src/components/cells/JVxeTextareaCell.vue b/src/components/jeecg/JVxeTable/src/components/cells/JVxeTextareaCell.vue
index a1dfc7f..df9db7d 100644
--- a/src/components/jeecg/JVxeTable/src/components/cells/JVxeTextareaCell.vue
+++ b/src/components/jeecg/JVxeTable/src/components/cells/JVxeTextareaCell.vue
@@ -1,5 +1,5 @@
 <template>
-  <JInputPop :value="innerValue" :width="300" :height="210" v-bind="cellProps" style="width: 100%" @blur="handleBlurCommon" @change="handleChangeCommon" />
+  <JInputPop :value="innerValue" :width="300" :height="210" :pop-container="getPopupContainer" v-bind="cellProps" style="width: 100%" @blur="handleBlurCommon" @change="handleChangeCommon" />
 </template>
 
 <script lang="ts">
@@ -15,7 +15,12 @@
     props: useJVxeCompProps(),
     setup(props: JVxeComponent.Props) {
       const { innerValue, cellProps, handleChangeCommon, handleBlurCommon } = useJVxeComponent(props);
-      return { innerValue, cellProps, handleChangeCommon, handleBlurCommon };
+
+      function getPopupContainer() {
+        return document.body;
+      }
+
+      return { innerValue, cellProps, handleChangeCommon, handleBlurCommon, getPopupContainer };
     },
     // 【组件增强】注释详见：JVxeComponent.Enhanced
     enhanced: {
diff --git a/src/components/jeecg/JVxeTable/src/hooks/useColumns.ts b/src/components/jeecg/JVxeTable/src/hooks/useColumns.ts
index f4f9b40..cba07a2 100644
--- a/src/components/jeecg/JVxeTable/src/hooks/useColumns.ts
+++ b/src/components/jeecg/JVxeTable/src/hooks/useColumns.ts
@@ -262,7 +262,13 @@ async function handleDict({ col, methods }: HandleArgs) {
       // 查询字典
       if (!isPromise(col.params.optionsPromise)) {
         col.params.optionsPromise = new Promise(async (resolve) => {
-          const dictOptions: any = await initDictOptions(col.params.dictCode);
+          //update-begin-author:taoyan date:2022-6-1 for: VUEN-1180 【代码生成】子表不支持带条件？
+          let dictCodeString = col.params.dictCode;
+          if (dictCodeString) {
+            dictCodeString = encodeURI(dictCodeString);
+          }
+          const dictOptions: any = await initDictOptions(dictCodeString);
+          //update-end-author:taoyan date:2022-6-1 for: VUEN-1180 【代码生成】子表不支持带条件？
           let options = col.params.options ?? [];
           dictOptions.forEach((dict) => {
             // 过滤重复数据
diff --git a/src/components/jeecg/JVxeTable/src/hooks/useDataSource.ts b/src/components/jeecg/JVxeTable/src/hooks/useDataSource.ts
index 59816a8..eeb9328 100644
--- a/src/components/jeecg/JVxeTable/src/hooks/useDataSource.ts
+++ b/src/components/jeecg/JVxeTable/src/hooks/useDataSource.ts
@@ -4,7 +4,7 @@ import { cloneDeep } from 'lodash-es';
 
 export function useDataSource(props, data: JVxeDataProps, methods: JVxeTableMethods, refs: JVxeRefs) {
   watch(
-    () => [props.dataSource, props.disabledRows],
+    () => props.dataSource,
     async () => {
       data.disabledRowIds = [];
       data.vxeDataSource.value = cloneDeep(props.dataSource);
diff --git a/src/components/jeecg/JVxeTable/src/hooks/useJVxeComponent.ts b/src/components/jeecg/JVxeTable/src/hooks/useJVxeComponent.ts
index f615b21..e5ecb49 100644
--- a/src/components/jeecg/JVxeTable/src/hooks/useJVxeComponent.ts
+++ b/src/components/jeecg/JVxeTable/src/hooks/useJVxeComponent.ts
@@ -1,5 +1,6 @@
 import { computed, nextTick, ref, unref, watch } from 'vue';
 import { propTypes } from '/@/utils/propTypes';
+import { useDesign } from '/@/hooks/web/useDesign';
 import { getEnhanced, replaceProps, vModel } from '../utils/enhancedUtils';
 import { JVxeRenderType } from '../types/JVxeTypes';
 import { isBoolean, isFunction, isObject, isPromise } from '/@/utils/is';
@@ -59,6 +60,19 @@ export function useJVxeComponent(props: JVxeComponent.Props) {
     if (renderOptions.disabled === true) {
       cellProps['disabled'] = true;
     }
+    //update-begin-author:taoyan date:2022-5-25 for: VUEN-1111 一对多子表 部门选择 不应该级联
+    if (col.checkStrictly === true) {
+      cellProps['checkStrictly'] = true;
+    }
+    //update-end-author:taoyan date:2022-5-25 for: VUEN-1111 一对多子表 部门选择 不应该级联
+
+    //update-begin-author:taoyan date:2022-5-27 for: 用户组件 控制单选多选新的参数配置
+    if (col.isRadioSelection === true) {
+      cellProps['isRadioSelection'] = true;
+    } else if (col.isRadioSelection === false) {
+      cellProps['isRadioSelection'] = false;
+    }
+    //update-end-author:taoyan date:2022-5-27 for: 用户组件 控制单选多选新的参数配置
 
     return cellProps;
   });
@@ -182,10 +196,19 @@ export function useJVxeComponent(props: JVxeComponent.Props) {
     return event;
   }
 
+  /**
+   * 防样式冲突类名生成器
+   * @param scope
+   */
+  function useCellDesign(scope: string) {
+    return useDesign(`vxe-cell-${scope}`);
+  }
+
   return {
     ...context,
     enhanced,
     trigger,
+    useCellDesign,
   };
 }
 
diff --git a/src/components/jeecg/JVxeTable/src/hooks/useMethods.ts b/src/components/jeecg/JVxeTable/src/hooks/useMethods.ts
index 001c32a..b16f116 100644
--- a/src/components/jeecg/JVxeTable/src/hooks/useMethods.ts
+++ b/src/components/jeecg/JVxeTable/src/hooks/useMethods.ts
@@ -1,3 +1,4 @@
+import { watch } from 'vue';
 import XEUtils from 'xe-utils';
 import { simpleDebounce } from '/@/utils/common/compUtils';
 import { JVxeDataProps, JVxeRefs, JVxeTableProps, JVxeTypes } from '../types';
@@ -242,6 +243,12 @@ export function useMethods(props: JVxeTableProps, { emit }, data: JVxeDataProps,
     xTable.updateData();
   }
 
+  // 监听 disabledRows，更改时重新计算禁用行
+  watch(
+    () => props.disabledRows,
+    () => recalcDisableRows()
+  );
+
   // 返回值决定是否允许展开、收起行
   function handleExpandToggleMethod({ expanded }) {
     return !(expanded && props.disabled);
diff --git a/src/components/jeecg/JVxeTable/src/hooks/useValidateRules.ts b/src/components/jeecg/JVxeTable/src/hooks/useValidateRules.ts
index 53ffc3d..2535b41 100644
--- a/src/components/jeecg/JVxeTable/src/hooks/useValidateRules.ts
+++ b/src/components/jeecg/JVxeTable/src/hooks/useValidateRules.ts
@@ -82,12 +82,22 @@ const fooPatterns = [
   { title: '6到16位数字', value: 'n6-16', pattern: /^\d{6,16}$/ },
   { title: '6到16位任意字符', value: '*6-16', pattern: /^.{6,16}$/ },
   { title: '6到18位字母', value: 's6-18', pattern: /^[a-z|A-Z]{6,18}$/ },
-  { title: '网址', value: 'url', pattern: /^(?:([A-Za-z]+):)?(\/{0,3})([0-9.\-A-Za-z]+)(?::(\d+))?(?:\/([^?#]*))?(?:\?([^#]*))?(?:#(.*))?$/ },
+  //update-begin-author:taoyan date:2022-6-1 for: VUEN-1160 对多子表，网址校验不正确
+  {
+    title: '网址',
+    value: 'url',
+    pattern: /^((ht|f)tps?):\/\/[\w\-]+(\.[\w\-]+)+([\w\-.,@?^=%&:\/~+#]*[\w\-@?^=%&\/~+#])?$/,
+  },
+  //update-end-author:taoyan date:2022-6-1 for: VUEN-1160 对多子表，网址校验不正确
   { title: '电子邮件', value: 'e', pattern: /^([\w]+\.*)([\w]+)@[\w]+\.\w{3}(\.\w{2}|)$/ },
   { title: '手机号码', value: 'm', pattern: /^1[3456789]\d{9}$/ },
   { title: '邮政编码', value: 'p', pattern: /^[1-9]\d{5}$/ },
   { title: '字母', value: 's', pattern: /^[A-Z|a-z]+$/ },
   { title: '数字', value: 'n', pattern: /^-?\d+(\.?\d+|\d?)$/ },
   { title: '整数', value: 'z', pattern: /^-?\d+$/ },
-  { title: '金额', value: 'money', pattern: /^(([1-9][0-9]*)|([0]\.\d{0,2}|[1-9][0-9]*\.\d{0,2}))$/ },
+  {
+    title: '金额',
+    value: 'money',
+    pattern: /^(([1-9][0-9]*)|([0]\.\d{0,2}|[1-9][0-9]*\.\d{0,5}))$/,
+  },
 ];
diff --git a/src/components/jeecg/JVxeTable/src/utils/authUtils.ts b/src/components/jeecg/JVxeTable/src/utils/authUtils.ts
index 405f10a..1b4ca73 100644
--- a/src/components/jeecg/JVxeTable/src/utils/authUtils.ts
+++ b/src/components/jeecg/JVxeTable/src/utils/authUtils.ts
@@ -16,7 +16,7 @@ export function getJVxeAuths(prefix) {
   }
   // 将所有vxe用到的权限取出来
   for (let auth of allAuthList) {
-    if (auth.status == '1' && auth.action.startsWith(prefix)) {
+    if (auth.status == '1' && (auth.action || '').startsWith(prefix)) {
       authsMap.set(auth.action, { ...auth, isAuth: false });
     }
   }
@@ -27,6 +27,14 @@ export function getJVxeAuths(prefix) {
       getAuth.isAuth = true;
     }
   }
+  //update-begin-author:taoyan date:2022-6-1 for:  VUEN-1162 子表按钮没控制
+  let onlineButtonAuths = permissionStore.getOnlineSubTableAuth(prefix);
+  if (onlineButtonAuths && onlineButtonAuths.length > 0) {
+    for (let auth of onlineButtonAuths) {
+      authsMap.set(prefix + 'btn:' + auth, { action: auth, type: 1, status: 1, isAuth: false });
+    }
+  }
+  //update-end-author:taoyan date:2022-6-1 for:  VUEN-1162 子表按钮没控制
   return authsMap;
 }
 
diff --git a/src/components/jeecg/JVxeTable/src/utils/registerUtils.ts b/src/components/jeecg/JVxeTable/src/utils/registerUtils.ts
index 4a4f9ea..374f5a6 100644
--- a/src/components/jeecg/JVxeTable/src/utils/registerUtils.ts
+++ b/src/components/jeecg/JVxeTable/src/utils/registerUtils.ts
@@ -21,8 +21,8 @@ export function isRegistered(type: JVxeTypes | string) {
  * 注册vxe自定义组件
  *
  * @param type
- * @param component
- * @param spanComponent
+ * @param component 编辑状态显示的组件
+ * @param spanComponent 非编辑状态显示的组件，可以为空
  */
 export function registerComponent(type: JVxeTypes, component: Component, spanComponent?: Component) {
   addComponent(type, component, spanComponent);
diff --git a/src/components/jeecg/OnLine/JPopupOnlReport.vue b/src/components/jeecg/OnLine/JPopupOnlReport.vue
index df84be3..1d45bb3 100644
--- a/src/components/jeecg/OnLine/JPopupOnlReport.vue
+++ b/src/components/jeecg/OnLine/JPopupOnlReport.vue
@@ -68,7 +68,9 @@
     name: 'JPopupOnlReport',
     components: {
       SearchFormItem: createAsyncComponent(() => import('/@/components/jeecg/OnLine/SearchFormItem.vue'), { loading: true }),
-      BasicTable: createAsyncComponent(() => import('/@/components/Table/src/BasicTable.vue'), { loading: true }),
+      BasicTable: createAsyncComponent(() => import('/@/components/Table/src/BasicTable.vue'), {
+        loading: true,
+      }),
     },
     props: ['multi', 'code', 'id', 'sorter', 'groupId', 'param', 'clickToRowSelect'],
     emits: ['ok', 'register'],
diff --git a/src/components/jeecg/OnLine/SearchFormItem.vue b/src/components/jeecg/OnLine/SearchFormItem.vue
index 8171f50..da7f8c6 100644
--- a/src/components/jeecg/OnLine/SearchFormItem.vue
+++ b/src/components/jeecg/OnLine/SearchFormItem.vue
@@ -239,7 +239,16 @@
           'max-width': labelTextMaxWidth,
         },
       };
-      return { labelTextMaxWidth, labelCol, single_mode, getDictOptionKey, getDictCode, getSqlByDictCode, DateTypeEnum, CompTypeEnum };
+      return {
+        labelTextMaxWidth,
+        labelCol,
+        single_mode,
+        getDictOptionKey,
+        getDictCode,
+        getSqlByDictCode,
+        DateTypeEnum,
+        CompTypeEnum,
+      };
     },
   });
 </script>
diff --git a/src/components/jeecg/OnLine/hooks/usePopBiz.ts b/src/components/jeecg/OnLine/hooks/usePopBiz.ts
index 348c7c5..718ce1e 100644
--- a/src/components/jeecg/OnLine/hooks/usePopBiz.ts
+++ b/src/components/jeecg/OnLine/hooks/usePopBiz.ts
@@ -1,4 +1,4 @@
-import { reactive, ref, unref, defineAsyncComponent } from 'vue';
+import { reactive, ref, unref, defineAsyncComponent, toRaw, markRaw } from 'vue';
 import { httpGroupRequest } from '/@/components/Form/src/utils/GroupRequest';
 import { defHttp } from '/@/utils/http/axios';
 import { filterMultiDictText } from '/@/utils/dict/JDictSelectUtil.js';
@@ -7,6 +7,7 @@ import { OnlineColumn } from '/@/components/jeecg/OnLine/types/onlineConfig';
 import { h } from 'vue';
 import { useRouter } from 'vue-router';
 import { useMethods } from '/@/hooks/system/useMethods';
+import { importViewsFile } from '/@/utils';
 
 export function usePopBiz(props, tableRef?) {
   const { createMessage } = useMessage();
@@ -707,7 +708,12 @@ export function usePopBiz(props, tableRef?) {
       destroyOnClose: true,
       style: dialogStyle,
       // dialogStyle: dialogStyle,
-      bodyStyle: { padding: '8px', height: 'calc(100vh - 108px)', overflow: 'auto', overflowX: 'hidden' },
+      bodyStyle: {
+        padding: '8px',
+        height: 'calc(100vh - 108px)',
+        overflow: 'auto',
+        overflowX: 'hidden',
+      },
       // 隐藏掉取消按钮
       cancelButtonProps: { style: { display: 'none' } },
     },
@@ -739,11 +745,67 @@ export function usePopBiz(props, tableRef?) {
     }
     hrefComponent.value.model.visible = true;
     hrefComponent.value.model.title = '操作';
-    hrefComponent.value.is = defineAsyncComponent(() => import(/* @vite-ignore */ '/@/views/' + (path.startsWith('/') ? path.slice(1) : path)));
+    hrefComponent.value.is = markRaw(defineAsyncComponent(() => importViewsFile(path)));
   }
 
+  //update-begin-author:taoyan date:2022-5-31 for: VUEN-1155 popup 选择数据时，会选择多条重复数据
+  /**
+   * emit事件 获取选中的行数据
+   */
+  function getOkSelectRows(): any[] {
+    let arr = unref(selectRows);
+    let selectedRowKeys = checkedKeys.value;
+    console.log('arr', arr);
+    if (!selectedRowKeys || selectedRowKeys.length <= 0) {
+      return [];
+    }
+    if (!arr || arr.length <= 0) {
+      return [];
+    }
+    let rows: any = [];
+    for (let key of selectedRowKeys) {
+      for (let i = 0; i < arr.length; i++) {
+        let combineKey = combineRowKey(arr[i]);
+        if (key === combineKey) {
+          rows.push(toRaw(arr[i]));
+          break;
+        }
+      }
+    }
+    return rows;
+  }
+  //update-end-author:taoyan date:2022-5-31 for: VUEN-1155 popup 选择数据时，会选择多条重复数据
+
   return [
-    { visibleChange, loadColumnsInfo, loadColumnsAndData, dynamicParamHandler, loadData, handleChangeInTable, combineRowKey, clickThenCheck, filterUnuseSelect, handleExport },
-    { hrefComponent, visible, rowSelection, checkedKeys, selectRows, pagination, dataSource, columns, indexColumnProps, loading, title, iSorter, queryInfo, queryParam, dictOptions },
+    {
+      visibleChange,
+      loadColumnsInfo,
+      loadColumnsAndData,
+      dynamicParamHandler,
+      loadData,
+      handleChangeInTable,
+      combineRowKey,
+      clickThenCheck,
+      filterUnuseSelect,
+      handleExport,
+      getOkSelectRows,
+    },
+    {
+      hrefComponent,
+      visible,
+      rowSelection,
+      checkedKeys,
+      selectRows,
+      pagination,
+      dataSource,
+      columns,
+      indexColumnProps,
+      loading,
+      title,
+      iSorter,
+      queryInfo,
+      queryParam,
+      dictOptions,
+    },
   ];
 }
diff --git a/src/components/registerGlobComp.ts b/src/components/registerGlobComp.ts
index 716742a..0771ad6 100644
--- a/src/components/registerGlobComp.ts
+++ b/src/components/registerGlobComp.ts
@@ -1,7 +1,7 @@
 import type { App } from 'vue';
 import { Icon } from './Icon';
 import AIcon from '/@/components/jeecg/AIcon.vue';
-import { Button, UploadButton } from './Button';
+import { Button, JUploadButton } from './Button';
 import {
   // Need
   Button as AntButton,
@@ -47,9 +47,12 @@ import {
   InputNumber,
   Carousel,
   Popconfirm,
+  Skeleton,
+  Cascader,
+  Rate,
 } from 'ant-design-vue';
 
-const compList = [AntButton.Group, Icon, AIcon, UploadButton];
+const compList = [AntButton.Group, Icon, AIcon, JUploadButton];
 
 export function registerGlobComp(app: App) {
   compList.forEach((comp) => {
@@ -99,5 +102,8 @@ export function registerGlobComp(app: App) {
     .use(Slider)
     .use(InputNumber)
     .use(Carousel)
-    .use(Popconfirm);
+    .use(Popconfirm)
+    .use(Skeleton)
+    .use(Cascader)
+    .use(Rate);
 }
diff --git a/src/hooks/event/useEventListener.ts b/src/hooks/event/useEventListener.ts
index 46fd186..35e58be 100644
--- a/src/hooks/event/useEventListener.ts
+++ b/src/hooks/event/useEventListener.ts
@@ -12,7 +12,9 @@ export interface UseEventParams {
   isDebounce?: boolean;
   wait?: number;
 }
-export function useEventListener({ el = window, name, listener, options, autoRemove = true, isDebounce = true, wait = 80 }: UseEventParams): { removeEvent: RemoveEventFn } {
+export function useEventListener({ el = window, name, listener, options, autoRemove = true, isDebounce = true, wait = 80 }: UseEventParams): {
+  removeEvent: RemoveEventFn;
+} {
   /* eslint-disable-next-line */
   let remove: RemoveEventFn = () => {};
   const isAddRef = ref(false);
diff --git a/src/hooks/system/useJvxeMethods.ts b/src/hooks/system/useJvxeMethods.ts
index d45f40d..5d94b42 100644
--- a/src/hooks/system/useJvxeMethods.ts
+++ b/src/hooks/system/useJvxeMethods.ts
@@ -44,7 +44,7 @@ export function useJvxeMethod(requestAddOrEdit, classifyIntoFormData, tableRefs,
     getAllTable()
       .then((tables) => {
         let values = formRef.value.getFieldsValue();
-        return validateFormModelAndTables(formRef.value.validate, values, tables);
+        return validateFormModelAndTables(formRef.value.validate, values, tables, formRef.value.getProps);
       })
       .then((allValues) => {
         /** 一次性验证一对一的所有子表 */
@@ -86,3 +86,95 @@ export function useJvxeMethod(requestAddOrEdit, classifyIntoFormData, tableRefs,
   }
   return [handleChangeTabs, handleSubmit, requestSubTableData, formRef];
 }
+
+//update-begin-author:taoyan date:2022-6-16 for: 代码生成-原生表单用
+/**
+ * 校验多个表单和子表table，用于原生的antd-vue的表单
+ * @param activeKey 子表表单/vxe-table 所在tabs的 activeKey
+ * @param refMap 子表表单/vxe-table对应的ref对象 map结构
+ * 示例：
+ * useValidateAntFormAndTable(activeKey, {
+ *   'tableA': tableARef,
+ *   'formB': formBRef
+ * })
+ */
+export function useValidateAntFormAndTable(activeKey, refMap) {
+  /**
+   * 获取所有子表数据
+   */
+  async function getSubFormAndTableData() {
+    let formData = {};
+    let all = Object.keys(refMap);
+    let key = '';
+    for (let i = 0; i < all.length; i++) {
+      key = all[i];
+      let instance = refMap[key].value;
+      if (instance.isForm) {
+        let subFormData = await validateFormAndGetData(instance, key);
+        if (subFormData) {
+          formData[key + 'List'] = [subFormData];
+        }
+      } else {
+        let arr = await validateTableAndGetData(instance, key);
+        if (arr && arr.length > 0) {
+          formData[key + 'List'] = arr;
+        }
+      }
+    }
+    return formData;
+  }
+
+  /**
+   * 转换数据用 如果有数组转成逗号分割的格式
+   * @param data
+   */
+  function transformData(data) {
+    if (data) {
+      Object.keys(data).map((k) => {
+        if (data[k] instanceof Array) {
+          data[k] = data[k].join(',');
+        }
+      });
+    }
+    return data;
+  }
+
+  /**
+   * 子表table
+   * @param instance
+   * @param key
+   */
+  async function validateTableAndGetData(instance, key) {
+    const errors = await instance.validateTable();
+    if (!errors) {
+      return instance.getTableData();
+    } else {
+      activeKey.value = key;
+      // 自动重置scrollTop状态，防止出现白屏
+      instance.resetScrollTop(0);
+      return Promise.reject(1);
+    }
+  }
+
+  /**
+   * 子表表单
+   * @param instance
+   * @param key
+   */
+  async function validateFormAndGetData(instance, key) {
+    try {
+      let data = await instance.getFormData();
+      transformData(data);
+      return data;
+    } catch (e) {
+      activeKey.value = key;
+      return Promise.reject(e);
+    }
+  }
+
+  return {
+    getSubFormAndTableData,
+    transformData,
+  };
+}
+//update-end-author:taoyan date:2022-6-16 for: 代码生成-原生表单用
diff --git a/src/hooks/system/useListPage.ts b/src/hooks/system/useListPage.ts
index 1cae6a1..b935641 100644
--- a/src/hooks/system/useListPage.ts
+++ b/src/hooks/system/useListPage.ts
@@ -1,4 +1,4 @@
-import { reactive, ref, Ref } from 'vue';
+import { reactive, ref, Ref, unref } from 'vue';
 import { merge } from 'lodash-es';
 import { DynamicProps } from '/#/utils';
 import { BasicTableProps, TableActionType, useTable } from '/@/components/Table';
@@ -20,7 +20,7 @@ interface ListPageOptions {
   pagination?: boolean;
   // 导出配置
   exportConfig?: {
-    url: string;
+    url: string | (() => string);
     // 导出文件名
     name?: string | (() => string);
     //导出参数
@@ -28,7 +28,9 @@ interface ListPageOptions {
   };
   // 导入配置
   importConfig?: {
-    url: string;
+    //update-begin-author:taoyan date:20220507 for: erp代码生成 子表 导入地址是动态的
+    url: string | (() => string);
+    //update-end-author:taoyan date:20220507 for: erp代码生成 子表 导入地址是动态的
     // 导出成功后的回调
     success?: (fileInfo?: any) => void;
   };
@@ -63,17 +65,32 @@ export function useListPage(options: ListPageOptions) {
   async function onExportXls() {
     //update-begin---author:wangshuai ---date:20220411  for：导出新增自定义参数------------
     let { url, name, params } = options?.exportConfig ?? {};
-    if (url) {
+    let realUrl = typeof url === 'function' ? url() : url;
+    if (realUrl) {
       let title = typeof name === 'function' ? name() : name;
-      let paramsForm = await getForm().validate();
-      //如果参数不为空，则整合到一起
-      if (params) {
-        paramsForm = Object.assign({}, paramsForm, params);
+      //update-begin-author:taoyan date:20220507 for: erp代码生成 子表 导出报错，原因未知-
+      let paramsForm = {};
+      try {
+        paramsForm = await getForm().validate();
+      } catch (e) {
+        console.error(e);
       }
+      //update-end-author:taoyan date:20220507 for: erp代码生成 子表 导出报错，原因未知-
+      //如果参数不为空，则整合到一起
+      //update-begin-author:taoyan date:20220507 for: erp代码生成 子表 导出动态设置mainId
+      if (params) {
+        Object.keys(params).map((k) => {
+          let temp = (params as object)[k];
+          if (temp) {
+            paramsForm[k] = unref(temp);
+          }
+        });
+      }
+      //update-end-author:taoyan date:20220507 for: erp代码生成 子表 导出动态设置mainId
       if (selectedRowKeys.value && selectedRowKeys.value.length > 0) {
         paramsForm['selections'] = selectedRowKeys.value.join(',');
       }
-      return handleExportXls(title as string, url, filterObj(paramsForm));
+      return handleExportXls(title as string, realUrl, filterObj(paramsForm));
       //update-end---author:wangshuai ---date:20220411  for：导出新增自定义参数--------------
     } else {
       $message.createMessage.warn('没有传递 exportConfig.url 参数');
@@ -84,8 +101,11 @@ export function useListPage(options: ListPageOptions) {
   // 导入 excel
   function onImportXls(file) {
     let { url, success } = options?.importConfig ?? {};
-    if (url) {
-      return handleImportXls(file, url, success || reload);
+    //update-begin-author:taoyan date:20220507 for: erp代码生成 子表 导入地址是动态的
+    let realUrl = typeof url === 'function' ? url() : url;
+    if (realUrl) {
+      return handleImportXls(file, realUrl, success || reload);
+      //update-end-author:taoyan date:20220507 for: erp代码生成 子表 导入地址是动态的
     } else {
       $message.createMessage.warn('没有传递 importConfig.url 参数');
       return Promise.reject();
diff --git a/src/hooks/system/useThirdLogin.ts b/src/hooks/system/useThirdLogin.ts
index 3566d79..08b7786 100644
--- a/src/hooks/system/useThirdLogin.ts
+++ b/src/hooks/system/useThirdLogin.ts
@@ -152,7 +152,11 @@ export function useThirdLogin() {
     if (!unref(thirdCaptcha)) {
       cmsFailed('请输入验证码');
     }
-    let params = { mobile: unref(thirdPhone), captcha: unref(thirdCaptcha), thirdUserUuid: unref(thirdUserUuid) };
+    let params = {
+      mobile: unref(thirdPhone),
+      captcha: unref(thirdCaptcha),
+      thirdUserUuid: unref(thirdUserUuid),
+    };
     defHttp.post({ url: '/sys/thirdLogin/bindingThirdPhone', params }, { isTransformResponse: false }).then((res) => {
       if (res.success) {
         bindingPhoneModal.value = false;
diff --git a/src/hooks/web/usePermission.ts b/src/hooks/web/usePermission.ts
index eebfa54..ed132a7 100644
--- a/src/hooks/web/usePermission.ts
+++ b/src/hooks/web/usePermission.ts
@@ -18,12 +18,29 @@ import { isArray } from '/@/utils/is';
 import { useMultipleTabStore } from '/@/store/modules/multipleTab';
 
 // User permissions related operations
-export function usePermission() {
+export function usePermission(formData?) {
   const userStore = useUserStore();
   const appStore = useAppStore();
   const permissionStore = usePermissionStore();
   const { closeAll } = useTabs(router);
 
+  //==================================工作流权限判断-begin=========================================
+  function hasBpmPermission(code, type) {
+    // 禁用-type=2
+    // 显示-type=1
+    let codeList: string[] = [];
+    let permissionList = formData.permissionList;
+    if (permissionList && permissionList.length > 0) {
+      for (let item of permissionList) {
+        if (item.type == type) {
+          codeList.push(item.action);
+        }
+      }
+    }
+    return codeList.indexOf(code) >= 0;
+  }
+  //==================================工作流权限判断-end=========================================
+
   /**
    * Change permission mode
    */
@@ -71,6 +88,14 @@ export function usePermission() {
     if (PermissionModeEnum.BACK === permMode) {
       const allCodeList = permissionStore.getPermCodeList as string[];
       if (!isArray(value) && allCodeList && allCodeList.length > 0) {
+        //=============================工作流权限判断-显示-begin==============================================
+        if (formData) {
+          let code = value as string;
+          if (hasBpmPermission(code, '1') === true) {
+            return true;
+          }
+        }
+        //=============================工作流权限判断-显示-end==============================================
         return allCodeList.includes(value);
       }
       return (intersection(value, allCodeList) as string[]).length > 0;
@@ -81,6 +106,19 @@ export function usePermission() {
    * 是否禁用组件
    */
   function isDisabledAuth(value?: RoleEnum | RoleEnum[] | string | string[], def = true): boolean {
+    //=============================工作流权限判断-禁用-begin==============================================
+    if (formData) {
+      let code = value as string;
+      if (hasBpmPermission(code, '2') === true) {
+        return true;
+      }
+      //update-begin-author:taoyan date:2022-6-17 for: VUEN-1342【流程】编码方式 节点权限配置好后，未生效
+      if (isCodingButNoConfig(code) == true) {
+        return false;
+      }
+      //update-end-author:taoyan date:2022-6-17 for: VUEN-1342【流程】编码方式 节点权限配置好后，未生效
+    }
+    //=============================工作流权限判断-禁用-end==============================================
     return !hasPermission(value);
   }
 
@@ -107,5 +145,25 @@ export function usePermission() {
     resume();
   }
 
+  //update-begin-author:taoyan date:2022-6-17 for: VUEN-1342【流程】编码方式 节点权限配置好后，未生效
+  /**
+   * 判断是不是 代码里写了逻辑但是没有配置权限这种情况
+   */
+  function isCodingButNoConfig(code) {
+    let all = permissionStore.allAuthList;
+    if (all && all instanceof Array) {
+      let temp = all.filter((item) => item.action == code);
+      if (temp && temp.length > 0) {
+        if (temp[0].status == '0') {
+          return true;
+        }
+      } else {
+        return true;
+      }
+    }
+    return false;
+  }
+  //update-end-author:taoyan date:2022-6-17 for: VUEN-1342【流程】编码方式 节点权限配置好后，未生效
+
   return { changeRole, hasPermission, togglePermissionMode, refreshMenu, isDisabledAuth };
 }
diff --git a/src/layouts/default/header/components/notify/NoticeList.vue b/src/layouts/default/header/components/notify/NoticeList.vue
index 8f82824..7b0e871 100644
--- a/src/layouts/default/header/components/notify/NoticeList.vue
+++ b/src/layouts/default/header/components/notify/NoticeList.vue
@@ -141,7 +141,14 @@
         props.onTitleClick && props.onTitleClick(item);
       }
 
-      return { prefixCls, getPagination, getData, handleTitleClick, isTitleClickable, PriorityTypes };
+      return {
+        prefixCls,
+        getPagination,
+        getData,
+        handleTitleClick,
+        isTitleClickable,
+        PriorityTypes,
+      };
     },
   });
 </script>
diff --git a/src/layouts/default/header/components/notify/index.vue b/src/layouts/default/header/components/notify/index.vue
index fd66a23..d2dcbd6 100644
--- a/src/layouts/default/header/components/notify/index.vue
+++ b/src/layouts/default/header/components/notify/index.vue
@@ -50,7 +50,16 @@
   import { readAllMsg } from '/@/views/monitor/mynews/mynews.api';
   import { getToken } from '/@/utils/auth';
   export default defineComponent({
-    components: { Popover, BellOutlined, Tabs, TabPane: Tabs.TabPane, Badge, NoticeList, DetailModal, DynamicNotice },
+    components: {
+      Popover,
+      BellOutlined,
+      Tabs,
+      TabPane: Tabs.TabPane,
+      Badge,
+      NoticeList,
+      DetailModal,
+      DynamicNotice,
+    },
     setup() {
       const { prefixCls } = useDesign('header-notify');
       const instance: any = getCurrentInstance();
@@ -89,7 +98,9 @@
       // 获取系统消息
       async function loadData() {
         try {
-          let { anntMsgList, sysMsgList, anntMsgTotal, sysMsgTotal } = await listCementByUser({ pageSize: 5 });
+          let { anntMsgList, sysMsgList, anntMsgTotal, sysMsgTotal } = await listCementByUser({
+            pageSize: 5,
+          });
           listData.value[0].list = anntMsgList.map(mapAnnouncement);
           listData.value[1].list = sysMsgList.map(mapAnnouncement);
           listData.value[0].count = anntMsgTotal;
diff --git a/src/layouts/default/header/components/user-dropdown/DepartSelect.vue b/src/layouts/default/header/components/user-dropdown/DepartSelect.vue
index 4b1c2db..58f86bc 100644
--- a/src/layouts/default/header/components/user-dropdown/DepartSelect.vue
+++ b/src/layouts/default/header/components/user-dropdown/DepartSelect.vue
@@ -182,7 +182,10 @@
       if (!unref(isMultiDepart)) {
         resolve();
       } else {
-        const result = await selectDepart({ username: userStore.getUserInfo.username, orgCode: unref(departSelected) });
+        const result = await selectDepart({
+          username: userStore.getUserInfo.username,
+          orgCode: unref(departSelected),
+        });
         if (result.userInfo) {
           const userInfo = result.userInfo;
           userStore.setUserInfo(userInfo);
diff --git a/src/layouts/default/header/components/user-dropdown/index.vue b/src/layouts/default/header/components/user-dropdown/index.vue
index 8e568f7..3e4581b 100644
--- a/src/layouts/default/header/components/user-dropdown/index.vue
+++ b/src/layouts/default/header/components/user-dropdown/index.vue
@@ -85,7 +85,14 @@
         return { realname, avatar: avatar || headerImg, desc };
       });
 
-      const getAvatarUrl = computed(() => getFileAccessHttpUrl(getUserInfo.value?.avatar));
+      const getAvatarUrl = computed(() => {
+        let { avatar } = getUserInfo.value;
+        if (avatar == headerImg) {
+          return avatar;
+        } else {
+          return getFileAccessHttpUrl(avatar);
+        }
+      });
 
       const [register, { openModal }] = useModal();
       /**
diff --git a/src/layouts/default/header/index.vue b/src/layouts/default/header/index.vue
index c6cb142..ab051e2 100644
--- a/src/layouts/default/header/index.vue
+++ b/src/layouts/default/header/index.vue
@@ -65,8 +65,6 @@
 
   import LoginSelect from '/@/views/sys/login/LoginSelect.vue';
   import { useUserStore } from '/@/store/modules/user';
-  import { getUserTenantId, setAuthCache } from '/@/utils/auth';
-  import { TENANT_ID } from '/@/enums/cacheEnum';
 
   export default defineComponent({
     name: 'LayoutHeader',
@@ -150,15 +148,10 @@
 
       function showLoginSelect() {
         //update-begin---author:liusq  Date:20220101  for：判断登录进来是否需要弹窗选择租户----
-        //判断当前用户的租户在缓存中是否存在
-        const userTenantId = getUserTenantId(userStore.getUserInfo.username);
-        if (!userTenantId && userTenantId != 0) {
-          //当前用户的租户不存在，弹窗选择
-          const loginInfo = toRaw(userStore.getLoginInfo) || {};
+        //判断是否是登陆进来
+        const loginInfo = toRaw(userStore.getLoginInfo) || {};
+        if (!!loginInfo.isLogin) {
           loginSelectRef.value.show(loginInfo);
-        } else {
-          //当前用户的租户存在，直接赋值
-          setAuthCache(TENANT_ID, userTenantId);
         }
         //update-end---author:liusq  Date:20220101  for：判断登录进来是否需要弹窗选择租户----
       }
diff --git a/src/layouts/default/menu/index.vue b/src/layouts/default/menu/index.vue
index c332e5a..0016935 100644
--- a/src/layouts/default/menu/index.vue
+++ b/src/layouts/default/menu/index.vue
@@ -19,6 +19,7 @@
   import { useRootSetting } from '/@/hooks/setting/useRootSetting';
   import { useAppInject } from '/@/hooks/web/useAppInject';
   import { useDesign } from '/@/hooks/web/useDesign';
+  import { useLocaleStore } from '/@/store/modules/locale';
 
   export default defineComponent({
     name: 'LayoutMenu',
@@ -92,10 +93,15 @@
        * click menu
        * @param menu
        */
-
-      function handleMenuClick(path: string) {
+      //update-begin-author:taoyan date:2022-6-1 for: VUEN-1144 online 配置成菜单后，打开菜单，显示名称未展示为菜单名称
+      const localeStore = useLocaleStore();
+      function handleMenuClick(path: string, item) {
+        if (item) {
+          localeStore.setPathTitle(path, item.title || '');
+        }
         go(path);
       }
+      //update-end-author:taoyan date:2022-6-1 for: VUEN-1144 online 配置成菜单后，打开菜单，显示名称未展示为菜单名称
 
       /**
        * before click menu
diff --git a/src/layouts/default/setting/components/SettingFooter.vue b/src/layouts/default/setting/components/SettingFooter.vue
index c9baefb..a4f4763 100644
--- a/src/layouts/default/setting/components/SettingFooter.vue
+++ b/src/layouts/default/setting/components/SettingFooter.vue
@@ -1,9 +1,9 @@
 <template>
   <div :class="prefixCls">
-    <!--    <a-button type="primary" block @click="handleCopy">-->
-    <!--      <CopyOutlined class="mr-2" />-->
-    <!--      {{ t('layout.setting.copyBtn') }}-->
-    <!--    </a-button>-->
+    <a-button type="primary" block @click="handleCopy">
+      <CopyOutlined class="mr-2" />
+      {{ t('layout.setting.copyBtn') }}
+    </a-button>
 
     <a-button color="warning" block @click="handleResetSetting" class="my-3">
       <RedoOutlined class="mr-2" />
diff --git a/src/layouts/default/tabs/components/TabContent.vue b/src/layouts/default/tabs/components/TabContent.vue
index 2bae6a4..eb263d3 100644
--- a/src/layouts/default/tabs/components/TabContent.vue
+++ b/src/layouts/default/tabs/components/TabContent.vue
@@ -27,6 +27,7 @@
   import { useI18n } from '/@/hooks/web/useI18n';
   import { useTabDropdown } from '../useTabDropdown';
   import { useMultipleTabSetting } from '/@/hooks/setting/useMultipleTabSetting';
+  import { useLocaleStore } from '/@/store/modules/locale';
 
   export default defineComponent({
     name: 'TabContent',
@@ -42,10 +43,17 @@
       const { prefixCls } = useDesign('multiple-tabs-content');
       const { t } = useI18n();
 
+      //update-begin-author:taoyan date:2022-6-1 for: VUEN-1144 online 配置成菜单后，打开菜单，显示名称未展示为菜单名称
+      const localeStore = useLocaleStore();
       const getTitle = computed(() => {
-        const { tabItem: { meta } = {} } = props;
+        const { tabItem: { meta, fullPath } = {} } = props;
+        let title = localeStore.getPathTitle(fullPath);
+        if (title) {
+          return title;
+        }
         return meta && t(meta.title as string);
       });
+      //update-end-author:taoyan date:2022-6-1 for: VUEN-1144 online 配置成菜单后，打开菜单，显示名称未展示为菜单名称
 
       const getIsTabs = computed(() => !props.isExtra);
 
diff --git a/src/locales/lang/zh-CN/sys.ts b/src/locales/lang/zh-CN/sys.ts
index 779028a..e21e471 100644
--- a/src/locales/lang/zh-CN/sys.ts
+++ b/src/locales/lang/zh-CN/sys.ts
@@ -68,7 +68,7 @@ export default {
     forgetFormTitle: '重置密码',
 
     signInTitle: 'Jeecg Boot',
-    signInDesc: '是中国最具影响力的 企业级 低代码平台！',
+    signInDesc: '是中国最具影响力的 企业级低代码平台！在线开发，可视化拖拽设计，零代码实现80%的基础功能~',
     policy: '我同意xxx隐私政策',
     scanSign: `扫码后，即可完成登录`,
     scanSuccess: `扫码成功，登录中`,
diff --git a/src/store/modules/locale.ts b/src/store/modules/locale.ts
index 8d72ffc..94fdb4d 100644
--- a/src/store/modules/locale.ts
+++ b/src/store/modules/locale.ts
@@ -13,12 +13,14 @@ const lsLocaleSetting = (ls.get(LOCALE_KEY) || localeSetting) as LocaleSetting;
 
 interface LocaleState {
   localInfo: LocaleSetting;
+  pathTitleMap: object;
 }
 
 export const useLocaleStore = defineStore({
   id: 'app-locale',
   state: (): LocaleState => ({
     localInfo: lsLocaleSetting,
+    pathTitleMap: {},
   }),
   getters: {
     getShowPicker(): boolean {
@@ -27,6 +29,11 @@ export const useLocaleStore = defineStore({
     getLocale(): LocaleType {
       return this.localInfo?.locale ?? 'zh_CN';
     },
+    //update-begin-author:taoyan date:2022-6-1 for: VUEN-1144 online 配置成菜单后，打开菜单，显示名称未展示为菜单名称
+    getPathTitle: (state) => {
+      return (path) => state.pathTitleMap[path];
+    },
+    //update-end-author:taoyan date:2022-6-1 for: VUEN-1144 online 配置成菜单后，打开菜单，显示名称未展示为菜单名称
   },
   actions: {
     /**
@@ -46,6 +53,11 @@ export const useLocaleStore = defineStore({
         ...this.localInfo,
       });
     },
+    //update-begin-author:taoyan date:2022-6-1 for: VUEN-1144 online 配置成菜单后，打开菜单，显示名称未展示为菜单名称
+    setPathTitle(path, title) {
+      this.pathTitleMap[path] = title;
+    },
+    //update-end-author:taoyan date:2022-6-1 for: VUEN-1144 online 配置成菜单后，打开菜单，显示名称未展示为菜单名称
   },
 });
 
diff --git a/src/store/modules/permission.ts b/src/store/modules/permission.ts
index d5e6fab..89cf9ab 100644
--- a/src/store/modules/permission.ts
+++ b/src/store/modules/permission.ts
@@ -53,6 +53,8 @@ interface PermissionState {
   allAuthList: AuthItem[];
   // 系统安全模式
   sysSafeMode: boolean;
+  // online子表按钮权限
+  onlineSubTableAuthMap: object;
 }
 export const usePermissionStore = defineStore({
   id: 'app-permission',
@@ -69,6 +71,7 @@ export const usePermissionStore = defineStore({
     authList: [],
     allAuthList: [],
     sysSafeMode: false,
+    onlineSubTableAuthMap: {},
   }),
   getters: {
     getPermCodeList(): string[] | number[] {
@@ -86,6 +89,12 @@ export const usePermissionStore = defineStore({
     getIsDynamicAddedRoute(): boolean {
       return this.isDynamicAddedRoute;
     },
+
+    //update-begin-author:taoyan date:2022-6-1 for: VUEN-1162 子表按钮没控制
+    getOnlineSubTableAuth: (state) => {
+      return (code) => state.onlineSubTableAuthMap[code];
+    },
+    //update-end-author:taoyan date:2022-6-1 for: VUEN-1162 子表按钮没控制
   },
   actions: {
     setPermCodeList(codeList: string[]) {
@@ -278,6 +287,12 @@ export const usePermissionStore = defineStore({
     setAllAuthList(authList: AuthItem[]) {
       this.allAuthList = authList;
     },
+
+    //update-begin-author:taoyan date:2022-6-1 for: VUEN-1162 子表按钮没控制
+    setOnlineSubTableAuth(code, hideBtnList) {
+      this.onlineSubTableAuthMap[code] = hideBtnList;
+    },
+    //update-end-author:taoyan date:2022-6-1 for: VUEN-1162 子表按钮没控制
   },
 });
 
diff --git a/src/store/modules/user.ts b/src/store/modules/user.ts
index c1894af..f7ba514 100644
--- a/src/store/modules/user.ts
+++ b/src/store/modules/user.ts
@@ -5,7 +5,7 @@ import { store } from '/@/store';
 import { RoleEnum } from '/@/enums/roleEnum';
 import { PageEnum } from '/@/enums/pageEnum';
 import { ROLES_KEY, TOKEN_KEY, USER_INFO_KEY, LOGIN_INFO_KEY, DB_DICT_DATA_KEY, TENANT_ID } from '/@/enums/cacheEnum';
-import { getAuthCache, setAuthCache } from '/@/utils/auth';
+import { getAuthCache, setAuthCache, removeAuthCache } from '/@/utils/auth';
 import { GetUserInfoModel, LoginParams, ThirdLoginParams } from '/@/api/sys/model/userModel';
 import { doLogout, getUserInfo, loginApi, phoneLoginApi, thirdLogin } from '/@/api/sys/user';
 import { useI18n } from '/@/hooks/web/useI18n';
@@ -16,6 +16,7 @@ import { RouteRecordRaw } from 'vue-router';
 import { PAGE_NOT_FOUND_ROUTE } from '/@/router/routes/basic';
 import { isArray } from '/@/utils/is';
 import { useGlobSetting } from '/@/hooks/setting';
+import { JDragConfigEnum } from '/@/enums/jeecgEnum';
 import { useSso } from '/@/hooks/web/useSso';
 interface UserState {
   userInfo: Nullable<UserInfo>;
@@ -99,10 +100,6 @@ export const useUserStore = defineStore({
     setTenant(id) {
       this.tenantid = id;
       setAuthCache(TENANT_ID, id);
-      //update-begin---author:liusq  Date:20220102  for：保存用户租户id----
-      // @ts-ignore
-      setAuthCache(this.userInfo.username, id);
-      //update-end---author:liusq  Date:20220102  for：保存用户租户id----
     },
     setSessionTimeout(flag: boolean) {
       this.sessionTimeout = flag;
@@ -167,7 +164,10 @@ export const useUserStore = defineStore({
           router.addRoute(PAGE_NOT_FOUND_ROUTE as unknown as RouteRecordRaw);
           permissionStore.setDynamicAddedRoute(true);
         }
-        await this.setLoginInfo(data);
+        await this.setLoginInfo({ ...data, isLogin: true });
+        //update-begin-author:liusq date:2022-5-5 for:登录成功后缓存拖拽模块的接口前缀
+        localStorage.setItem(JDragConfigEnum.DRAG_BASE_URL, useGlobSetting().domainUrl);
+        //update-end-author:liusq date:2022-5-5 for: 登录成功后缓存拖拽模块的接口前缀
         goHome && (await router.replace((userInfo && userInfo.homePath) || PageEnum.BASE_HOME));
       }
       return data;
@@ -233,11 +233,22 @@ export const useUserStore = defineStore({
           console.log('注销Token失败');
         }
       }
+
+      // //update-begin-author:taoyan date:2022-5-5 for: src/layouts/default/header/index.vue showLoginSelect方法 获取tenantId 退出登录后再次登录依然能获取到值，没有清空
+      // let username:any = this.userInfo && this.userInfo.username;
+      // if(username){
+      //   removeAuthCache(username)
+      // }
+      // //update-end-author:taoyan date:2022-5-5 for: src/layouts/default/header/index.vue showLoginSelect方法 获取tenantId 退出登录后再次登录依然能获取到值，没有清空
+
       this.setToken('');
       setAuthCache(TOKEN_KEY, null);
       this.setSessionTimeout(false);
       this.setUserInfo(null);
       this.setLoginInfo(null);
+      //update-begin-author:liusq date:2022-5-5 for:退出登录后清除拖拽模块的接口前缀
+      localStorage.removeItem(JDragConfigEnum.DRAG_BASE_URL);
+      //update-end-author:liusq date:2022-5-5 for: 退出登录后清除拖拽模块的接口前缀
 
       //如果开启单点登录,则跳转到单点统一登录中心
       const openSso = useGlobSetting().openSso;
diff --git a/src/utils/auth/index.ts b/src/utils/auth/index.ts
index b851aa3..83ae074 100644
--- a/src/utils/auth/index.ts
+++ b/src/utils/auth/index.ts
@@ -10,7 +10,7 @@ const isLocal = permissionCacheType === CacheTypeEnum.LOCAL;
  * 获取token
  */
 export function getToken() {
-  return getAuthCache(TOKEN_KEY);
+  return getAuthCache<string>(TOKEN_KEY);
 }
 /**
  * 获取登录信息
@@ -22,13 +22,7 @@ export function getLoginBackInfo() {
  * 获取租户id
  */
 export function getTenantId() {
-  return getAuthCache(TENANT_ID);
-}
-/**
- * 获取用户租户id
- */
-export function getUserTenantId(username) {
-  return getAuthCache(username);
+  return getAuthCache<string>(TENANT_ID);
 }
 
 export function getAuthCache<T>(key: BasicKeys) {
@@ -40,6 +34,25 @@ export function setAuthCache(key: BasicKeys, value) {
   const fn = isLocal ? Persistent.setLocal : Persistent.setSession;
   return fn(key, value, true);
 }
+
+/**
+ * 设置动态key
+ * @param key
+ * @param value
+ */
+export function setCacheByDynKey(key, value) {
+  const fn = isLocal ? Persistent.setLocal : Persistent.setSession;
+  return fn(key, value, true);
+}
+
+/**
+ * 获取动态key
+ * @param key
+ */
+export function getCacheByDynKey<T>(key) {
+  const fn = isLocal ? Persistent.getLocal : Persistent.getSession;
+  return fn(key) as T;
+}
 /**
  * 移除缓存中的某个属性
  * @param key
diff --git a/src/utils/common/compUtils.ts b/src/utils/common/compUtils.ts
index 38ec3b4..d740c73 100644
--- a/src/utils/common/compUtils.ts
+++ b/src/utils/common/compUtils.ts
@@ -315,3 +315,13 @@ export function bindMapFormSchema<T>(spanMap, spanTypeDef: T) {
     );
   };
 }
+
+/**
+ * 字符串是否为null或null字符串
+ * @param str
+ * @return {boolean}
+ */
+export function stringIsNull(str) {
+  // 两个 == 可以同时判断 null 和 undefined
+  return str == null || str === 'null' || str === 'undefined';
+}
diff --git a/src/utils/common/renderUtils.ts b/src/utils/common/renderUtils.ts
index 0fa193c..cf8d1d6 100644
--- a/src/utils/common/renderUtils.ts
+++ b/src/utils/common/renderUtils.ts
@@ -5,8 +5,9 @@ import { Tinymce } from '/@/components/Tinymce';
 import Icon from '/@/components/Icon';
 import { getDictItemsByCode } from '/@/utils/dict/index';
 import { filterMultiDictText } from '/@/utils/dict/JDictSelectUtil.js';
-import { loadCategoryData } from '/@/api/common/api';
 import { isEmpty } from '/@/utils/is';
+import { useMessage } from '/@/hooks/web/useMessage';
+const { createMessage } = useMessage();
 
 const render = {
   /**
@@ -18,7 +19,12 @@ const render = {
       return h(
         'span',
         avatarList.map((item) => {
-          return h(Avatar, { src: getFileAccessHttpUrl(item), shape: 'square', size: 'default', style: { marginRight: '5px' } });
+          return h(Avatar, {
+            src: getFileAccessHttpUrl(item),
+            shape: 'square',
+            size: 'default',
+            style: { marginRight: '5px' },
+          });
         })
       );
     } else {
@@ -39,7 +45,7 @@ const render = {
    */
   renderDict: (v, code, renderTag = false) => {
     let text = '';
-    let array = getDictItemsByCode(code);
+    let array = getDictItemsByCode(code) || [];
     let obj = array.filter((item) => {
       return item.value == v;
     });
@@ -54,11 +60,12 @@ const render = {
    */
   renderImage: ({ text }) => {
     if (!text) {
+      //update-begin-author:taoyan date:2022-5-24 for:  VUEN-1084 【vue3】online表单测试发现的新问题 41、生成的代码，树默认图大小未改
       return h(
         Avatar,
-        { shape: 'square', size: 'large' },
+        { shape: 'square', size: 25 },
         {
-          icon: () => h(Icon, { icon: 'ant-design:file-image-outlined', size: 30 }),
+          icon: () => h(Icon, { icon: 'ant-design:file-image-outlined', size: 25 }),
         }
       );
     }
@@ -66,9 +73,15 @@ const render = {
     return h(
       'span',
       avatarList.map((item) => {
-        return h(Avatar, { src: getFileAccessHttpUrl(item), shape: 'square', size: 'large', style: { marginRight: '5px' } });
+        return h(Avatar, {
+          src: getFileAccessHttpUrl(item),
+          shape: 'square',
+          size: 25,
+          style: { marginRight: '5px' },
+        });
       })
     );
+    //update-end-author:taoyan date:2022-5-24 for:  VUEN-1084 【vue3】online表单测试发现的新问题 41、生成的代码，树默认图大小未改
   },
   /**
    * 渲染 Tooltip
@@ -141,4 +154,22 @@ const render = {
     return isEmpty(text) ? h('span', text) : h(Tag, { color }, () => text);
   },
 };
-export { render };
+
+/**
+ * 文件下载
+ */
+function downloadFile(url) {
+  if (!url) {
+    createMessage.warning('未知的文件');
+    return;
+  }
+  if (url.indexOf(',') > 0) {
+    url = url.substring(0, url.indexOf(','));
+  }
+  url = getFileAccessHttpUrl(url.split(',')[0]);
+  if (url) {
+    window.open(url);
+  }
+}
+
+export { render, downloadFile };
diff --git a/src/utils/common/vxeUtils.ts b/src/utils/common/vxeUtils.ts
index cb164c1..45cb642 100644
--- a/src/utils/common/vxeUtils.ts
+++ b/src/utils/common/vxeUtils.ts
@@ -1,3 +1,5 @@
+import { getValueType } from '/@/utils';
+
 export const VALIDATE_FAILED = Symbol();
 /**
  * 一次性验证主表单和所有的次表单(新版本)
@@ -5,7 +7,7 @@ export const VALIDATE_FAILED = Symbol();
  * @param cases 接收一个数组，每项都是一个JEditableTable实例
  * @returns {Promise<any>}
  */
-export async function validateFormModelAndTables(validate, formData, cases, autoJumpTab?) {
+export async function validateFormModelAndTables(validate, formData, cases, props, autoJumpTab?) {
   if (!(validate && typeof validate === 'function')) {
     throw `validate 参数需要的是一个方法，而传入的却是${typeof validate}`;
   }
@@ -14,6 +16,18 @@ export async function validateFormModelAndTables(validate, formData, cases, auto
     // 验证主表表单
     validate()
       .then(() => {
+        //update-begin---author:wangshuai ---date:20220507  for：[VUEN-912]一对多用户组件（所有风格，单表和树没问题）保存报错------------
+        for (let data in formData) {
+          //如果该数据是数组
+          if (formData[data] instanceof Array) {
+            let valueType = getValueType(props, data);
+            //如果是字符串类型的需要变成以逗号分割的字符串
+            if (valueType === 'string') {
+              formData[data] = formData[data].join(',');
+            }
+          }
+        }
+        //update-end---author:wangshuai ---date:20220507  for：[VUEN-912]一对多用户组件（所有风格，单表和树没问题）保存报错--------------
         resolve(formData);
       })
       .catch(() => {
diff --git a/src/utils/dict/JDictSelectUtil.js b/src/utils/dict/JDictSelectUtil.js
index 4ca43ec..e09cd8b 100644
--- a/src/utils/dict/JDictSelectUtil.js
+++ b/src/utils/dict/JDictSelectUtil.js
@@ -9,9 +9,10 @@ import { ajaxGetDictItems, getDictItemsByCode } from './index';
 /**
  * 获取字典数组
  * @param dictCode 字典Code
+ * @param isTransformResponse 是否转换返回结果
  * @return List<Map>
  */
-export async function initDictOptions(dictCode) {
+export async function initDictOptions(dictCode, isTransformResponse = true) {
   if (!dictCode) {
     return '字典Code不能为空!';
   }
@@ -20,11 +21,14 @@ export async function initDictOptions(dictCode) {
     let res = {};
     res.result = getDictItemsByCode(dictCode);
     res.success = true;
-    return res;
+    if (isTransformResponse) {
+      return res.result;
+    } else {
+      return res;
+    }
   }
   //获取字典数组
-  let res = await ajaxGetDictItems(dictCode);
-  return res;
+  return await ajaxGetDictItems(dictCode, {}, { isTransformResponse });
 }
 
 /**
@@ -125,7 +129,10 @@ export function filterDictTextByCache(dictCode, key) {
 export async function getDictItems(dictCode, params) {
   //优先从缓存中读取字典配置
   if (getDictItemsByCode(dictCode)) {
-    let desformDictItems = getDictItemsByCode(dictCode).map((item) => ({ ...item, label: item.text }));
+    let desformDictItems = getDictItemsByCode(dictCode).map((item) => ({
+      ...item,
+      label: item.text,
+    }));
     return desformDictItems;
   }
 
diff --git a/src/utils/dict/index.ts b/src/utils/dict/index.ts
index 578e3d1..6a33f39 100644
--- a/src/utils/dict/index.ts
+++ b/src/utils/dict/index.ts
@@ -24,12 +24,19 @@ export const initDictOptions = (code) => {
     });
   }
   //2.获取字典数组
+  //update-begin-author:taoyan date:2022-6-21 for: 字典数据请求前将参数编码处理，但是不能直接编码，因为可能之前已经编码过了
+  if (code.indexOf(',') > 0 && code.indexOf(' ') > 0) {
+    // 编码后类似sys_user%20where%20username%20like%20xxx' 是不包含空格的,这里判断如果有空格和逗号说明需要编码处理
+    code = encodeURI(code);
+  }
+  //update-end-author:taoyan date:2022-6-21 for: 字典数据请求前将参数编码处理，但是不能直接编码，因为可能之前已经编码过了
   return defHttp.get({ url: `/sys/dict/getDictItems/${code}` });
 };
 /**
  * 获取字典数组
  * @param code 字典Code
  * @param params 查询参数
+ * @param options 查询配置
  * @return List<Map>
  */
-export const ajaxGetDictItems = (code, params) => defHttp.get({ url: `/sys/dict/getDictItems/${code}`, params });
+export const ajaxGetDictItems = (code, params, options?) => defHttp.get({ url: `/sys/dict/getDictItems/${code}`, params }, options);
diff --git a/src/utils/helper/validator.ts b/src/utils/helper/validator.ts
index 9deb52e..423b346 100644
--- a/src/utils/helper/validator.ts
+++ b/src/utils/helper/validator.ts
@@ -97,12 +97,11 @@ export const rules = {
       },
     ];
   },
-  duplicateCheckRule(tableName, fieldName, model, schema, required) {
+  duplicateCheckRule(tableName, fieldName, model, schema, required?) {
     return [
       {
-        required: required,
         validator: (_, value) => {
-          if (!value) {
+          if (!value && required) {
             return Promise.reject(`请输入${schema.label}`);
           }
           return new Promise<void>((resolve, reject) => {
@@ -124,3 +123,31 @@ export const rules = {
     ] as ArrayRule;
   },
 };
+
+//update-begin-author:taoyan date:2022-6-16 for: 代码生成-原生表单用
+/**
+ * 唯一校验函数，给原生<a-form>使用，vben的表单校验建议使用上述rules
+ * @param tableName 表名
+ * @param fieldName 字段名
+ * @param fieldVal 字段值
+ * @param dataId 数据ID
+ */
+export async function duplicateValidate(tableName, fieldName, fieldVal, dataId) {
+  try {
+    let params = {
+      tableName,
+      fieldName,
+      fieldVal,
+      dataId: dataId,
+    };
+    const res = await duplicateCheck(params);
+    if (res.success) {
+      return Promise.resolve();
+    } else {
+      return Promise.reject(res.message || '校验失败');
+    }
+  } catch (e) {
+    return Promise.reject('校验失败,可能是断网等问题导致的校验失败');
+  }
+}
+//update-end-author:taoyan date:2022-6-16 for: 代码生成-原生表单用
diff --git a/src/utils/index.ts b/src/utils/index.ts
index e83721a..88075dd 100644
--- a/src/utils/index.ts
+++ b/src/utils/index.ts
@@ -169,3 +169,126 @@ export function replaceAll(text, checker, replacer) {
   }
   return text;
 }
+
+/**
+ * 获取URL上参数
+ * @param url
+ */
+export function getQueryVariable(url) {
+  if (!url) return;
+
+  var t,
+    n,
+    r,
+    i = url.split('?')[1],
+    s = {};
+  (t = i.split('&')), (r = null), (n = null);
+  for (var o in t) {
+    var u = t[o].indexOf('=');
+    u !== -1 && ((r = t[o].substr(0, u)), (n = t[o].substr(u + 1)), (s[r] = n));
+  }
+  return s;
+}
+/**
+ * 判断是否显示办理按钮
+ * @param bpmStatus
+ * @returns {*}
+ */
+export function showDealBtn(bpmStatus) {
+  if (bpmStatus != '1' && bpmStatus != '3' && bpmStatus != '4') {
+    return true;
+  }
+  return false;
+}
+/**
+ * 数字转大写
+ * @param value
+ * @returns {*}
+ */
+export function numToUpper(value) {
+  if (value != '') {
+    let unit = new Array('仟', '佰', '拾', '', '仟', '佰', '拾', '', '角', '分');
+    const toDx = (n) => {
+      switch (n) {
+        case '0':
+          return '零';
+        case '1':
+          return '壹';
+        case '2':
+          return '贰';
+        case '3':
+          return '叁';
+        case '4':
+          return '肆';
+        case '5':
+          return '伍';
+        case '6':
+          return '陆';
+        case '7':
+          return '柒';
+        case '8':
+          return '捌';
+        case '9':
+          return '玖';
+      }
+    };
+    let lth = value.toString().length;
+    value *= 100;
+    value += '';
+    let length = value.length;
+    if (lth <= 8) {
+      let result = '';
+      for (let i = 0; i < length; i++) {
+        if (i == 2) {
+          result = '元' + result;
+        } else if (i == 6) {
+          result = '万' + result;
+        }
+        if (value.charAt(length - i - 1) == 0) {
+          if (i != 0 && i != 1) {
+            if (result.charAt(0) != '零' && result.charAt(0) != '元' && result.charAt(0) != '万') {
+              result = '零' + result;
+            }
+          }
+          continue;
+        }
+        result = toDx(value.charAt(length - i - 1)) + unit[unit.length - i - 1] + result;
+      }
+      result += result.charAt(result.length - 1) == '元' ? '整' : '';
+      return result;
+    } else {
+      return null;
+    }
+  }
+  return null;
+}
+
+//update-begin-author:taoyan date:2022-6-8 for:解决老的vue2动态导入文件语法 vite不支持的问题
+const allModules = import.meta.glob('../views/**/*.vue');
+export function importViewsFile(path): Promise<any> {
+  if (path.startsWith('/')) {
+    path = path.substring(1);
+  }
+  let page = '';
+  if (path.endsWith('.vue')) {
+    page = `../views/${path}`;
+  } else {
+    page = `../views/${path}.vue`;
+  }
+  return new Promise((resolve, reject) => {
+    let flag = true;
+    for (const path in allModules) {
+      if (path == page) {
+        flag = false;
+        allModules[path]().then((mod) => {
+          console.log(path, mod);
+          resolve(mod);
+        });
+      }
+    }
+    if (flag) {
+      reject('该文件不存在:' + page);
+    }
+  });
+}
+//update-end-author:taoyan date:2022-6-8 for:解决老的vue2动态导入文件语法 vite不支持的问题
diff --git a/src/views/demo/form/index.vue b/src/views/demo/form/index.vue
index 91b8f99..7c53e67 100644
--- a/src/views/demo/form/index.vue
+++ b/src/views/demo/form/index.vue
@@ -551,7 +551,14 @@
   ];
 
   export default defineComponent({
-    components: { BasicForm, CollapseContainer, PageWrapper, ApiSelect, JAreaLinkage, ASelect: Select },
+    components: {
+      BasicForm,
+      CollapseContainer,
+      PageWrapper,
+      ApiSelect,
+      JAreaLinkage,
+      ASelect: Select,
+    },
     setup() {
       const check = ref(null);
       const { createMessage } = useMessage();
diff --git a/src/views/demo/jeecg/JVxeTableDemo/JVxeDemo5.vue b/src/views/demo/jeecg/JVxeTableDemo/JVxeDemo5.vue
index 4a92e7e..7371e7a 100644
--- a/src/views/demo/jeecg/JVxeTableDemo/JVxeDemo5.vue
+++ b/src/views/demo/jeecg/JVxeTableDemo/JVxeDemo5.vue
@@ -118,7 +118,9 @@
         console.log(tableRef.value);
         await nextTick();
         // 默认添加五行数据
-        tableRef.value!.addRows([{ input: 'input_1' }, { input: 'input_2' }, { input: 'input_3' }, { input: 'input_4' }, { input: 'input_5' }], { setActive: false });
+        tableRef.value!.addRows([{ input: 'input_1' }, { input: 'input_2' }, { input: 'input_3' }, { input: 'input_4' }, { input: 'input_5' }], {
+          setActive: false,
+        });
       });
 
       return { tableRef, columns, dataSource, handleView, handleDelete };
diff --git a/src/views/demo/jeecg/JVxeTableDemo/func-demo/JSBCDemo.vue b/src/views/demo/jeecg/JVxeTableDemo/func-demo/JSBCDemo.vue
index e633a9d..7fa4bff 100644
--- a/src/views/demo/jeecg/JVxeTableDemo/func-demo/JSBCDemo.vue
+++ b/src/views/demo/jeecg/JVxeTableDemo/func-demo/JSBCDemo.vue
@@ -132,13 +132,13 @@
       // 校验通过
       if (!errMap) {
         // 获取所有数据
-        let tableData = target.getTableData();
+        let tableData = target.ctx.getTableData();
         console.log('当前保存的数据是：', tableData);
         // 获取新增的数据
-        let newData = target.getNewData();
+        let newData = target.ctx.getNewData();
         console.log('-- 新增的数据：', newData);
         // 获取删除的数据
-        let deleteData = target.getDeleteData();
+        let deleteData = target.ctx.getDeleteData();
         console.log('-- 删除的数据：', deleteData);
         // 【模拟保存】
         loading.value = true;
diff --git a/src/views/demo/jeecg/JVxeTableDemo/func-demo/SocketReload.vue b/src/views/demo/jeecg/JVxeTableDemo/func-demo/SocketReload.vue
index 8245619..1ee4c9d 100644
--- a/src/views/demo/jeecg/JVxeTableDemo/func-demo/SocketReload.vue
+++ b/src/views/demo/jeecg/JVxeTableDemo/func-demo/SocketReload.vue
@@ -26,6 +26,7 @@
       :loading="loading"
       :columns="columns"
       :dataSource="dataSource"
+      @valueChange="onValueChange"
       @edit-closed="handleEditClosed"
     />
   </a-card>
@@ -33,7 +34,7 @@
 
 <script lang="ts" setup>
   // 无痕刷新示例
-  import { reactive, ref } from 'vue';
+  import { ref } from 'vue';
   import { defHttp } from '/@/utils/http/axios';
   import { JVxeColumn, JVxeTableInstance, JVxeTypes } from '/@/components/jeecg/JVxeTable/types';
   import { useMessage } from '/@/hooks/web/useMessage';
@@ -46,6 +47,7 @@
   const dataSource = ref<Recordable[]>([]);
   const columns = ref<JVxeColumn[]>([
     { key: 'num', title: '序号', width: 80 },
+    { key: 'enabled', title: '启用', width: 80, type: JVxeTypes.checkbox },
     { key: 'ship_name', title: '船名', width: 180, type: JVxeTypes.input },
     { key: 'call', title: '呼叫', width: 80, type: JVxeTypes.input },
     { key: 'len', title: '长', width: 80, type: JVxeTypes.input },
@@ -79,8 +81,24 @@
       });
   }
 
+  /** 单元格值变化时触发的事件 */
+  function onValueChange(event) {
+    switch (event.type) {
+      // 所有不能触发 editClosed 事件的组件，都需要定义在这里，可以安装你自己的业务需求来完善此处的case
+      case JVxeTypes.radio:
+      case JVxeTypes.checkbox:
+        doSendUpdateRow(event);
+        break;
+    }
+  }
+
   // 单元格编辑完成之后触发的事件
   function handleEditClosed(event) {
+    doSendUpdateRow(event);
+  }
+
+  // 发送变更行请求
+  function doSendUpdateRow(event) {
     let { $table, row, column } = event;
     let field = column.property;
     // 判断单元格值是否被修改
diff --git a/src/views/demo/jeecg/Native/less/TableExpand.less b/src/views/demo/jeecg/Native/less/TableExpand.less
new file mode 100644
index 0000000..407ff14
--- /dev/null
+++ b/src/views/demo/jeecg/Native/less/TableExpand.less
@@ -0,0 +1,102 @@
+/** [表格主题样式一] 表格强制列不换行 */
+.j-table-force-nowrap {
+  td,
+  th {
+    white-space: nowrap;
+  }
+
+  .ant-table-selection-column {
+    padding: 12px 22px !important;
+  }
+
+  /** 列自适应，弊端会导致列宽失效 */
+
+  &.ant-table-wrapper .ant-table-content {
+    overflow-x: auto;
+  }
+}
+
+/** 查询区域通用样式*/
+.table-page-search-wrapper {
+  .ant-form-inline {
+    .ant-form-item {
+      display: flex;
+      margin-bottom: 24px;
+      margin-right: 0;
+
+      .ant-form-item-control-wrapper {
+        flex: 1 1;
+        display: inline-block;
+        vertical-align: middle;
+      }
+
+      > .ant-form-item-label {
+        line-height: 32px;
+        padding-right: 8px;
+        width: auto;
+      }
+
+      .ant-form-item-control {
+        height: 32px;
+        line-height: 32px;
+      }
+    }
+  }
+
+  .table-page-search-submitButtons {
+    display: block;
+    margin-bottom: 24px;
+    white-space: nowrap;
+  }
+}
+
+/*列表上方操作按钮区域*/
+.ant-card-body .table-operator {
+  margin-bottom: 8px;
+}
+
+/** Button按钮间距 */
+.table-operator .ant-btn {
+  margin: 0 8px 8px 0;
+}
+
+.table-operator .ant-btn-group .ant-btn {
+  margin: 0;
+}
+
+.table-operator .ant-btn-group .ant-btn:last-child {
+  margin: 0 8px 8px 0;
+}
+
+/*列表td的padding设置 可以控制列表大小*/
+.ant-table-tbody .ant-table-row td {
+  padding-top: 15px;
+  padding-bottom: 15px;
+}
+
+/*列表页面弹出modal*/
+.ant-modal-cust-warp {
+  height: 100%;
+}
+
+/*弹出modal Y轴滚动条*/
+.ant-modal-cust-warp .ant-modal-body {
+  height: calc(100% - 110px) !important;
+  overflow-y: auto;
+}
+
+/*弹出modal 先有content后有body 故滚动条控制在body上*/
+.ant-modal-cust-warp .ant-modal-content {
+  height: 90% !important;
+  overflow-y: hidden;
+}
+
+/*列表中有图片的加这个样式 参考用户管理*/
+.anty-img-wrap {
+  height: 25px;
+  position: relative;
+}
+
+.antd-more a {
+  color: #000000;
+}
diff --git a/src/views/demo/jeecg/Native/one/OneNativeList.vue b/src/views/demo/jeecg/Native/one/OneNativeList.vue
new file mode 100644
index 0000000..2896398
--- /dev/null
+++ b/src/views/demo/jeecg/Native/one/OneNativeList.vue
@@ -0,0 +1,418 @@
+<template>
+  <a-card :bordered="false">
+    <!-- 操作按钮区域 -->
+    <div class="table-operator">
+      <a-button @click="handleAdd" type="primary" preIcon="ant-design:plus">新增</a-button>
+      <!--      <a-button type="primary" preIcon="ant-design:download" @click="handleExportExcel('单表原生列表')">导出</a-button>-->
+      <!--      <j-upload-button type="primary" preIcon="ant-design:import-outlined" @click="handleImportExcel">导入</j-upload-button>-->
+      <a-dropdown v-if="selectedRowKeys.length > 0">
+        <template #overlay>
+          <a-menu>
+            <a-menu-item key="1" @click="batchDel">
+              <Icon icon="ant-design:delete-outlined"></Icon>
+              删除
+            </a-menu-item>
+          </a-menu>
+        </template>
+        <a-button
+          >批量操作
+          <Icon icon="mdi:chevron-down"></Icon>
+        </a-button>
+      </a-dropdown>
+    </div>
+
+    <!-- table区域-begin -->
+    <div>
+      <div class="ant-alert ant-alert-info" style="margin-bottom: 16px">
+        <i class="anticon anticon-info-circle ant-alert-icon"></i> 已选择 <a style="font-weight: 600">{{ selectedRowKeys.length }}</a
+        >项
+        <a style="margin-left: 24px" @click="onClearSelected">清空</a>
+      </div>
+
+      <a-table
+        ref="table"
+        size="middle"
+        :scroll="{ x: true }"
+        bordered
+        rowKey="id"
+        class="j-table-force-nowrap"
+        :columns="columns"
+        :dataSource="dataSource"
+        :pagination="ipagination"
+        :loading="loading"
+        :rowSelection="{ selectedRowKeys: selectedRowKeys, onChange: onSelectChange }"
+        @change="handleTableChange"
+      >
+        <template slot="htmlSlot" slot-scope="text">
+          <div v-html="text"></div>
+        </template>
+        <template #imgSlot="{ text, record }">
+          <span v-if="!text" style="font-size: 12px; font-style: italic">无图片</span>
+          <img v-else :src="getImgView(text)" :preview="record.id" alt="" class="anty-img-wrap" />
+        </template>
+        <template #pcaSlot="{ text }">
+          <div>{{ getAreaTextByCode(text) }}</div>
+        </template>
+        <template #fileSlot="{ text }">
+          <span v-if="!text" style="font-size: 12px; font-style: italic">无文件</span>
+          <a-button v-else :ghost="true" type="primary" preIcon="ant-design:download" size="small" @click="downloadFile(text)"> 下载 </a-button>
+        </template>
+
+        <template #action="{ text, record }">
+          <a @click="handleEdit(record)">编辑</a>
+          <a-divider type="vertical" />
+          <a-dropdown>
+            <a class="ant-dropdown-link">更多 <a-icon type="down" /></a>
+            <template #overlay>
+              <a-menu class="antd-more">
+                <a-menu-item>
+                  <a @click="handleDetail(record)">详情</a>
+                </a-menu-item>
+                <a-menu-item>
+                  <Popconfirm title="确定删除吗?" @confirm="() => handleDelete(record.id)">
+                    <a>删除</a>
+                  </Popconfirm>
+                </a-menu-item>
+              </a-menu>
+            </template>
+          </a-dropdown>
+        </template>
+      </a-table>
+    </div>
+    <OneNativeModal ref="oneProtogenesisModal" @ok="handleSuccess"></OneNativeModal>
+  </a-card>
+</template>
+
+<script lang="ts" setup>
+  import '../less/TableExpand.less';
+  import { onMounted, ref, reactive } from 'vue';
+  import { defHttp } from '/@/utils/http/axios';
+  import { useMessage } from '/@/hooks/web/useMessage';
+  import { filterMultiDictText } from '/@/utils/dict/JDictSelectUtil.js';
+  import { getAreaTextByCode } from '/@/components/Form/src/utils/Area';
+  import OneNativeModal from './components/OneNativeModal.vue';
+  import { Modal, Popconfirm } from 'ant-design-vue';
+  import { JSelectUserByDept, JDictSelectTag, JSelectDept, JSearchSelect } from '/@/components/Form';
+  import { filterObj, getFileAccessHttpUrl } from '/@/utils/common/compUtils';
+  import { loadCategoryData } from '/@/api/common/api';
+  import { getToken } from '/@/utils/auth';
+  import { useMethods } from '/@/hooks/system/useMethods';
+  import { downloadFile } from '/@/utils/common/renderUtils';
+  import { initDictOptions } from '/@/utils/dict';
+
+  const { handleExportXls, handleImportXls } = useMethods();
+  const modalVisible = ref<boolean>(false);
+  const queryParam = ref<any>({});
+  const loading = ref<boolean>(false);
+  const dictOptions = ref<any>([]);
+  const oneProtogenesisModal = ref();
+  const tokenHeader = { 'X-Access-Token': getToken() };
+  //表头
+  const columns = ref<any>([
+    {
+      title: '文本',
+      align: 'center',
+      dataIndex: 'name',
+    },
+    {
+      title: '字典下拉',
+      align: 'center',
+      dataIndex: 'xiala',
+      customRender: ({ text }) => (text ? filterMultiDictText(dictOptions.value['xiala'], text) : ''),
+    },
+    {
+      title: '字典单选',
+      align: 'center',
+      dataIndex: 'danxuan',
+      customRender: ({ text }) => (text ? filterMultiDictText(dictOptions.value['danxuan'], text) : ''),
+    },
+    {
+      title: '字典多选',
+      align: 'center',
+      dataIndex: 'duoxuan',
+      customRender: ({ text }) => (text ? filterMultiDictText(dictOptions.value['duoxuan'], text) : ''),
+    },
+    {
+      title: '开关',
+      align: 'center',
+      dataIndex: 'kaiguan',
+      customRender: ({ text }) => (text ? filterMultiDictText(dictOptions.value['kaiguan'], text) : ''),
+    },
+    {
+      title: '日期',
+      align: 'center',
+      dataIndex: 'riqi',
+      customRender: function ({ text }) {
+        return !text ? '' : text.length > 10 ? text.substr(0, 10) : text;
+      },
+    },
+    {
+      title: '年月日时分秒',
+      align: 'center',
+      dataIndex: 'nyrsfm',
+    },
+    {
+      title: '时间',
+      align: 'center',
+      dataIndex: 'shijian',
+    },
+    {
+      title: '文件',
+      align: 'center',
+      dataIndex: 'wenjian',
+      slots: { customRender: 'fileSlot' },
+    },
+    {
+      title: '图片',
+      align: 'center',
+      dataIndex: 'tupian',
+      slots: { customRender: 'imgSlot' },
+    },
+    {
+      title: '操作',
+      dataIndex: 'action',
+      align: 'center',
+      fixed: 'right',
+      width: 147,
+      slots: { customRender: 'action' },
+    },
+  ]);
+
+  const Api = reactive<any>({
+    list: '/test/jeecgDemo/oneNative/list',
+    delete: '/test/jeecgDemo/oneNative/delete',
+    exportXls: '/test/jeecgDemo/oneNative/exportXls',
+    importExcel: 'test/jeecgDemo/oneNative/importExcel',
+  });
+
+  const dataSource = ref<any>([]);
+  const toggleSearchStatus = ref<boolean>(false);
+  const ipagination = ref<any>({
+    current: 1,
+    pageSize: 10,
+    pageSizeOptions: ['10', '20', '30'],
+    showTotal: (total, range) => {
+      return range[0] + '-' + range[1] + ' 共' + total + '条';
+    },
+    showQuickJumper: true,
+    showSizeChanger: true,
+    total: 0,
+  });
+
+  const selectedRowKeys = ref<any>([]);
+  const selectionRows = ref<any>([]);
+  const iSorter = ref<any>({ column: 'createTime', order: 'desc' });
+  const iFilters = ref<any>({});
+  const { createMessage } = useMessage();
+
+  /**
+   * 复选框选中事件
+   * @param rowKeys
+   * @param rows
+   */
+  function onSelectChange(rowKeys, rows) {
+    selectedRowKeys.value = rowKeys;
+    selectionRows.value = rows;
+  }
+
+  /**
+   * 表格改变事件
+   */
+  function handleTableChange({ pagination, filters, sorter }) {
+    ipagination.value = pagination;
+    iSorter.value = sorter;
+    iFilters.value = { ...filters };
+  }
+
+  /**
+   * 新增
+   */
+  function handleAdd() {
+    oneProtogenesisModal.value.disableSubmit = false;
+    oneProtogenesisModal.value.add();
+  }
+
+  /**
+   * 清除选中行
+   */
+  function onClearSelected() {
+    selectedRowKeys.value = [];
+    selectionRows.value = [];
+  }
+
+  /**
+   * 批量删除
+   */
+  function batchDel() {
+    Modal.confirm({
+      title: '确认删除',
+      content: '是否删除选中数据',
+      okText: '确认',
+      cancelText: '取消',
+      onOk: () => {
+        defHttp.delete({ url: Api.delete, data: { ids: selectedRowKeys.value } }, { joinParamsToUrl: true }).then(() => {
+          handleSuccess();
+        });
+      },
+    });
+  }
+
+  /**
+   * 导出excel
+   */
+  function handleExportExcel(title) {
+    let paramsForm = getQueryParams();
+    if (selectedRowKeys.value && selectedRowKeys.value.length > 0) {
+      paramsForm['selections'] = selectedRowKeys.join(',');
+    }
+    handleExportXls(title, Api.exportXls, filterObj(paramsForm));
+  }
+
+  /**
+   * 导入excel
+   */
+  function handleImportExcel(file) {
+    handleImportXls(file, Api.importExcel, '').then(() => {
+      handleSuccess();
+    });
+  }
+
+  /**
+   * 获取查询参数
+   */
+  function getQueryParams() {
+    let params = Object.assign(queryParam.value, iSorter.value, iFilters.value);
+    params.field = getQueryField();
+    params.pageNo = ipagination.value.current;
+    params.pageSize = ipagination.value.pageSize;
+    return filterObj(params);
+  }
+
+  /**
+   * 字段权限控制
+   */
+  function getQueryField() {
+    let str = 'id,';
+    columns.value.forEach(function (value) {
+      str += ',' + value.dataIndex;
+    });
+    return str;
+  }
+
+  /**
+   * 初始化数据
+   */
+  function loadData(arg?) {
+    if (arg === 1) {
+      ipagination.value.current = 1;
+    }
+    loading.value = true;
+    let params = getQueryParams();
+    defHttp
+      .get({ url: Api.list, params }, { isTransformResponse: false })
+      .then((res) => {
+        if (res.success) {
+          dataSource.value = res.result.records;
+          if (res.result && res.result.total) {
+            ipagination.value.total = res.result.total;
+          } else {
+            ipagination.value.total = 0;
+          }
+        } else {
+          createMessage.warning(res.message);
+        }
+      })
+      .finally(() => {
+        loading.value = false;
+      });
+  }
+
+  //查询
+  function searchQuery() {
+    loadData(1);
+    selectedRowKeys.value = [];
+    selectionRows.value = [];
+  }
+
+  /**
+   * 查询区域展开关闭
+   */
+  function handleToggleSearch() {
+    toggleSearchStatus.value = !toggleSearchStatus.value;
+  }
+
+  /**
+   * 重置按钮
+   */
+  function searchReset() {
+    queryParam.value = {};
+    loadData(1);
+  }
+
+  /**
+   * 获取预览图片
+   */
+  function getImgView(text) {
+    if (text && text.indexOf(',') > 0) {
+      text = text.substring(0, text.indexOf(','));
+    }
+    return getFileAccessHttpUrl(text);
+  }
+
+  /**
+   * 编辑
+   * @param record
+   */
+  function handleEdit(record) {
+    oneProtogenesisModal.value.disableSubmit = false;
+    oneProtogenesisModal.value.edit(record);
+  }
+
+  /**
+   * 详情
+   * @param record
+   */
+  function handleDetail(record) {
+    oneProtogenesisModal.value.disableSubmit = true;
+    oneProtogenesisModal.value.edit(record);
+  }
+
+  /**
+   * 删除
+   * @param id
+   */
+  function handleDelete(id) {
+    defHttp.delete({ url: Api.delete, data: { ids: id } }, { joinParamsToUrl: true }).then((res) => {
+      handleSuccess();
+    });
+  }
+
+  /**
+   * 初始化字典选项
+   */
+  async function initDictConfig() {
+    dictOptions.value['flzds'] = await loadCategoryData({ code: 'B01' });
+    dictOptions.value['xiala'] = await initDictOptions('sex');
+    dictOptions.value['danxuan'] = await initDictOptions('sex');
+    dictOptions.value['duoxuan'] = await initDictOptions('urgent_level');
+  }
+
+  /**
+   * 保存表单后回调事件
+   */
+  function handleSuccess() {
+    selectedRowKeys.value = [];
+    selectionRows.value = [];
+    loadData(1);
+  }
+  onMounted(() => {
+    dictOptions.value['kaiguan'] = [
+      { text: '是', value: '1' },
+      { text: '否', value: '2' },
+    ];
+    //初始加载页面
+    loadData();
+    //初始化字典选项
+    initDictConfig();
+  });
+</script>
diff --git a/src/views/demo/jeecg/Native/one/components/OneNativeForm.vue b/src/views/demo/jeecg/Native/one/components/OneNativeForm.vue
new file mode 100644
index 0000000..d6485e8
--- /dev/null
+++ b/src/views/demo/jeecg/Native/one/components/OneNativeForm.vue
@@ -0,0 +1,423 @@
+<template>
+  <a-spin :spinning="confirmLoading">
+    <a-form class="antd-modal-form" ref="formRef" :model="formState" :rules="validatorRules">
+      <a-row>
+        <a-col :span="24">
+          <a-form-item label="文本" :labelCol="labelCol" :wrapperCol="wrapperCol" v-bind="validateInfos.name">
+            <a-input v-model:value="formState.name" placeholder="请输入文本"></a-input>
+          </a-form-item>
+        </a-col>
+        <a-col :span="24">
+          <a-form-item label="密码" :labelCol="labelCol" :wrapperCol="wrapperCol" v-bind="validateInfos.miMa">
+            <a-input-password v-model:value="formState.miMa" placeholder="请输入密码" />
+          </a-form-item>
+        </a-col>
+        <a-col :span="24">
+          <a-form-item label="字典下拉" :labelCol="labelCol" :wrapperCol="wrapperCol" v-bind="validateInfos.xiala">
+            <JDictSelectTag type="select" v-model:value="formState.xiala" dictCode="sex" placeholder="请选择字典下拉" />
+          </a-form-item>
+        </a-col>
+        <a-col :span="24">
+          <a-form-item label="字典单选" :labelCol="labelCol" :wrapperCol="wrapperCol" v-bind="validateInfos.danxuan">
+            <JDictSelectTag type="radio" v-model:value="formState.danxuan" dictCode="sex" placeholder="请选择字典单选" />
+          </a-form-item>
+        </a-col>
+        <a-col :span="24">
+          <a-form-item label="字典多选" :labelCol="labelCol" :wrapperCol="wrapperCol" v-bind="validateInfos.duoxuan">
+            <JCheckbox v-model:value="formState.duoxuan" dictCode="urgent_level" placeholder="请选择字典多选" />
+          </a-form-item>
+        </a-col>
+        <a-col :span="24">
+          <a-form-item label="开关" :labelCol="labelCol" :wrapperCol="wrapperCol" v-bind="validateInfos.kaiguan">
+            <JSwitch v-model:value="formState.kaiguan" :options="['1', '0']"></JSwitch>
+          </a-form-item>
+        </a-col>
+        <a-col :span="24">
+          <a-form-item label="日期" :labelCol="labelCol" :wrapperCol="wrapperCol" v-bind="validateInfos.riqi">
+            <a-date-picker placeholder="请选择日期" format="YYYY-MM-DD" valueFormat="YYYY-MM-DD" v-model:value="formState.riqi" style="width: 100%" />
+          </a-form-item>
+        </a-col>
+        <a-col :span="24">
+          <a-form-item label="年月日时分秒" :labelCol="labelCol" :wrapperCol="wrapperCol" v-bind="validateInfos.nyrsfm">
+            <a-date-picker show-time v-model:value="formState.nyrsfm" style="width: 100%" valueFormat="YYYY-MM-DD HH:mm:ss" />
+          </a-form-item>
+        </a-col>
+        <a-col :span="24">
+          <a-form-item label="时间" :labelCol="labelCol" :wrapperCol="wrapperCol" v-bind="validateInfos.shijian">
+            <TimePicker placeholder="请选择时间" v-model:value="formState.shijian" style="width: 100%" />
+          </a-form-item>
+        </a-col>
+        <a-col :span="24">
+          <a-form-item label="文件" :labelCol="labelCol" :wrapperCol="wrapperCol" v-bind="validateInfos.wenjian">
+            <JUpload v-model:value="formState.wenjian"></JUpload>
+          </a-form-item>
+        </a-col>
+        <a-col :span="24">
+          <a-form-item label="图片" :labelCol="labelCol" :wrapperCol="wrapperCol" v-bind="validateInfos.tupian">
+            <JImageUpload :fileMax="2" v-model:value="formState.tupian"></JImageUpload>
+          </a-form-item>
+        </a-col>
+        <a-col :span="24">
+          <a-form-item label="多行文本框" :labelCol="labelCol" :wrapperCol="wrapperCol" v-bind="validateInfos.dhwb">
+            <a-textarea v-model:value="formState.dhwb" rows="4" placeholder="请输入多行文本框" />
+          </a-form-item>
+        </a-col>
+        <a-col :span="24">
+          <a-form-item label="字典表下拉搜索框" :labelCol="labelCol" :wrapperCol="wrapperCol" v-bind="validateInfos.xlss">
+            <JSearchSelect v-model:value="formState.xlss" dict="sys_user,realname,username" />
+          </a-form-item>
+        </a-col>
+        <a-col :span="24">
+          <a-form-item label="popup弹窗" :labelCol="labelCol" :wrapperCol="wrapperCol" v-bind="validateInfos.popup">
+            <JPopup
+              v-model:value="formState.popup"
+              :fieldConfig="[
+                { source: 'name', target: 'popup' },
+                { source: 'id', target: 'popback' },
+              ]"
+              code="report_user"
+              :multi="true"
+              :setFieldsValue="setFieldsValue"
+            />
+          </a-form-item>
+        </a-col>
+        <a-col :span="24">
+          <a-form-item label="popback" :labelCol="labelCol" :wrapperCol="wrapperCol" v-bind="validateInfos.popback">
+            <a-input v-model:value="formState.popback" />
+          </a-form-item>
+        </a-col>
+        <a-col :span="24">
+          <a-form-item label="分类字典树" :labelCol="labelCol" :wrapperCol="wrapperCol" v-bind="validateInfos.flzds">
+            <JCategorySelect @change="(value) => handleFormChange('flzds', value)" v-model:value="formState.flzds" pcode="B02" placeholder="请选择分类字典树" />
+          </a-form-item>
+        </a-col>
+        <a-col :span="24">
+          <a-form-item label="部门选择" :labelCol="labelCol" :wrapperCol="wrapperCol" v-bind="validateInfos.bmxz">
+            <JSelectDept v-model:value="formState.bmxz" :multi="true" type="array" />
+          </a-form-item>
+        </a-col>
+        <a-col :span="24">
+          <a-form-item label="用户选择" :labelCol="labelCol" :wrapperCol="wrapperCol" v-bind="validateInfos.yhxz">
+            <JSelectUserByDept v-model:value="formState.yhxz" :multi="true" />
+          </a-form-item>
+        </a-col>
+        <a-col :span="24">
+          <a-form-item label="富文本" :labelCol="labelCol" :wrapperCol="wrapperCol" v-bind="validateInfos.fwb">
+            <JEditor v-model:value="formState.fwb" />
+          </a-form-item>
+        </a-col>
+        <a-col :span="24">
+          <a-form-item label="markdown" :labelCol="labelCol" :wrapperCol="wrapperCol" v-bind="validateInfos.markdownString">
+            <JMarkdownEditor v-model:value="formState.markdownString"></JMarkdownEditor>
+          </a-form-item>
+        </a-col>
+        <a-col :span="24">
+          <a-form-item label="省市区JAreaSelect" :labelCol="labelCol" :wrapperCol="wrapperCol" v-bind="validateInfos.shq">
+            <JAreaSelect v-model:value="formState.shq" placeholder="请输入省市区" />
+          </a-form-item>
+        </a-col>
+
+        <a-col :span="24">
+          <a-form-item label="省市区JAreaLinkage" :labelCol="labelCol" :wrapperCol="wrapperCol" v-bind="validateInfos.jssq">
+            <JAreaLinkage v-model:value="formState.jssq" placeholder="请输入省市区" />
+          </a-form-item>
+        </a-col>
+
+        <a-col :span="24">
+          <a-form-item label="JInputPop" :labelCol="labelCol" :wrapperCol="wrapperCol" v-bind="validateInfos.ldzje">
+            <JInputPop v-model:value="formState.ldzje" placeholder="请输入JInputPop" @change="(value) => handleFormChange('ldzje', value)"></JInputPop>
+          </a-form-item>
+        </a-col>
+        <a-col :span="24">
+          <a-form-item label="JSelectInput" :labelCol="labelCol" :wrapperCol="wrapperCol" v-bind="validateInfos.ldzjs">
+            <JSelectInput v-model:value="formState.ldzjs" placeholder="请选择JSelectInput" :options="ldzjsOptions" @change="(value) => handleFormChange('ldzjs', value)"></JSelectInput>
+          </a-form-item>
+        </a-col>
+        <a-col :span="24">
+          <a-form-item label="下拉多选" :labelCol="labelCol" :wrapperCol="wrapperCol" v-bind="validateInfos.zddtjxl">
+            <JSelectMultiple v-model:value="formState.zddtjxl" placeholder="请选择下拉多选" dictCode="sex"></JSelectMultiple>
+          </a-form-item>
+        </a-col>
+        <a-col :span="24">
+          <a-form-item label="用户" :labelCol="labelCol" :wrapperCol="wrapperCol" v-bind="validateInfos.yongHu">
+            <JSelectUser v-model:value="formState.yongHu" placeholder="请选择用户"></JSelectUser>
+          </a-form-item>
+        </a-col>
+        <a-col :span="24">
+          <a-form-item label="职务" :labelCol="labelCol" :wrapperCol="wrapperCol" v-bind="validateInfos.zhiWu">
+            <JSelectPosition v-model:value="formState.zhiWu" placeholder="请选择职务" @change="(value) => handleFormChange('zhiWu', value)"></JSelectPosition>
+          </a-form-item>
+        </a-col>
+        <a-col :span="24">
+          <a-form-item label="角色" :labelCol="labelCol" :wrapperCol="wrapperCol" v-bind="validateInfos.jueSe">
+            <JSelectRole v-model:value="formState.jueSe" placeholder="请选择角色" @change="(value) => handleFormChange('jueSe', value)"></JSelectRole>
+          </a-form-item>
+        </a-col>
+        <a-col :span="24">
+          <a-form-item label="自定义树" :labelCol="labelCol" :wrapperCol="wrapperCol" v-bind="validateInfos.zdys">
+            <JTreeSelect ref="treeSelect" placeholder="请选择自定义树" v-model:value="formState.zdys" dict="sys_category,name,id" pidValue="0" loadTriggleChange> </JTreeSelect>
+          </a-form-item>
+        </a-col>
+
+        <a-col :span="24">
+          <a-form-item label="数值" :labelCol="labelCol" :wrapperCol="wrapperCol" v-bind="validateInfos.yuanjia">
+            <a-input-number v-model:value="formState.yuanjia" placeholder="请输入double类型" style="width: 100%" />
+          </a-form-item>
+        </a-col>
+        <a-col :span="24">
+          <a-form-item label="输入2到10位的字母" :labelCol="labelCol" :wrapperCol="wrapperCol" v-bind="validateInfos.ywzz">
+            <a-input v-model:value="formState.ywzz" placeholder="请输入2到10位的字母"></a-input>
+          </a-form-item>
+        </a-col>
+        <a-col :span="24">
+          <a-form-item label="JTreeDict" :labelCol="labelCol" :wrapperCol="wrapperCol" v-bind="validateInfos.zdbxl">
+            <JTreeDict v-model:value="formState.zdbxl" placeholder="请选择JTreeDict" @change="(value) => handleFormChange('zdbxl', value)"></JTreeDict>
+          </a-form-item>
+        </a-col>
+        <a-col :span="24">
+          <a-form-item label="JCodeEditor" :labelCol="labelCol" :wrapperCol="wrapperCol" v-bind="validateInfos.zdmrz">
+            <JCodeEditor v-model:value="formState.zdmrz" placeholder="请输入JCodeEditor" @change="(value) => handleFormChange('zdmrz', value)"></JCodeEditor>
+          </a-form-item>
+        </a-col>
+        <a-col :span="24">
+          <a-form-item label="参数" :labelCol="labelCol" :wrapperCol="wrapperCol" v-bind="validateInfos.jsonParam">
+            <JAddInput v-model:value="formState.jsonParam" placeholder="参数"></JAddInput>
+          </a-form-item>
+        </a-col>
+      </a-row>
+    </a-form>
+  </a-spin>
+</template>
+
+<script lang="ts" setup>
+  import { ref, reactive, defineExpose, nextTick } from 'vue';
+  import { defHttp } from '/@/utils/http/axios';
+  import { useMessage } from '/@/hooks/web/useMessage';
+  import moment from 'moment';
+  import { TimePicker, Form } from 'ant-design-vue';
+  import JCheckbox from '/@/components/Form/src/jeecg/components/JCheckbox.vue';
+  import JDictSelectTag from '/@/components/Form/src/jeecg/components/JDictSelectTag.vue';
+  import JSwitch from '/@/components/Form/src/jeecg/components/JSwitch.vue';
+  import JUpload from '/@/components/Form/src/jeecg/components/JUpload/JUpload.vue';
+  import JImageUpload from '/@/components/Form/src/jeecg/components/JImageUpload.vue';
+  import JSearchSelect from '/@/components/Form/src/jeecg/components/JSearchSelect.vue';
+  import JPopup from '/@/components/Form/src/jeecg/components/JPopup.vue';
+  import JCategorySelect from '/@/components/Form/src/jeecg/components/JCategorySelect.vue';
+  import JSelectUserByDept from '/@/components/Form/src/jeecg/components/JSelectUserByDept.vue';
+  import JEditor from '/@/components/Form/src/jeecg/components/JEditor.vue';
+  import JMarkdownEditor from '/@/components/Form/src/jeecg/components/JMarkdownEditor.vue';
+  import JTreeSelect from '/@/components/Form/src/jeecg/components/JTreeSelect.vue';
+  import JInputPop from '/@/components/Form/src/jeecg/components/JInputPop.vue';
+  import JSelectInput from '/@/components/Form/src/jeecg/components/JSelectInput.vue';
+  import JSelectPosition from '/@/components/Form/src/jeecg/components/JSelectPosition.vue';
+  import JSelectMultiple from '/@/components/Form/src/jeecg/components/JSelectMultiple.vue';
+  import JInput from '/@/components/Form/src/jeecg/components/JInput.vue';
+  import JSelectDept from '/@/components/Form/src/jeecg/components/JSelectDept.vue';
+  import JSelectUser from '/@/components/Form/src/jeecg/components/JSelectUser.vue';
+  import JAreaSelect from '/@/components/Form/src/jeecg/components/JAreaSelect.vue';
+  import JAreaLinkage from '/@/components/Form/src/jeecg/components/JAreaLinkage.vue';
+  import JSelectRole from '/@/components/Form/src/jeecg/components/JSelectRole.vue';
+  import JTreeDict from '/@/components/Form/src/jeecg/components/JTreeDict.vue';
+  import JCodeEditor from '/@/components/Form/src/jeecg/components/JCodeEditor.vue';
+  import JAddInput from '/@/components/Form/src/jeecg/components/JAddInput.vue';
+  import { getValueType } from '/@/utils';
+
+  const emit = defineEmits(['register', 'ok']);
+  //update-begin---author:wangshuai ---date:20220616  for：报表示例验证修改--------------
+  const formState = reactive<Record<string, any>>({
+    name: '',
+    miMa: '',
+    ywzz: '',
+    xiala: '',
+    danxuan: '',
+    duoxuan: '',
+    riqi: '',
+    shijian: '',
+    wenjian: '',
+    tupian: '',
+    dhwb: '',
+    xlss: '',
+    popup: '',
+    flzds: '',
+    yhxz: '',
+    fwb: '',
+    shq: '',
+    ldzje: '',
+    ldzjs: '',
+    zddtjxl: '',
+    yongHu: '',
+    zhiWu: '',
+    jueSe: '',
+    zdys: '',
+    jssq: '',
+    zdbxl: '',
+    zdmrz: '',
+    jsonParam: '',
+    bmxz: '',
+    yuanjia: '',
+    nyrsfm: '',
+  });
+  //update-end---author:wangshuai ---date:20220616  for：报表示例验证修改--------------
+  const { createMessage } = useMessage();
+  const formRef = ref();
+  const useForm = Form.useForm;
+  const url = reactive<any>({
+    duplicateCheck: '/sys/duplicate/check',
+    add: '/test/jeecgDemo/oneNative/add',
+    edit: '/test/jeecgDemo/oneNative/edit',
+  });
+  const labelCol = ref<any>({ xs: { span: 24 }, sm: { span: 5 } });
+  const wrapperCol = ref<any>({ xs: { span: 24 }, sm: { span: 16 } });
+  const confirmLoading = ref<boolean>(false);
+  //表单验证
+  const validatorRules = {
+    name: [{ required: true, message: '请输入文本!' }],
+    miMa: [{ required: true, message: '请输入密码!' }],
+    ywzz: [{ required: false }, { pattern: '^[a-z|A-Z]{2,10}$', message: '不符合校验规则!' }],
+    xiala: [{ required: true, message: '请选择下拉组件!' }],
+    danxuan: [{ required: true, message: '请选择单选组件!' }],
+    duoxuan: [{ required: true, message: '请选择多选组件!' }],
+    riqi: [{ required: true, message: '请选择日期!' }],
+    shijian: [{ required: true, message: '请选择时间!' }],
+    wenjian: [{ required: true, message: '请上传文件!' }],
+    tupian: [{ required: true, message: '请上传图片!' }],
+    dhwb: [{ required: true, message: '请填写多行文本!' }],
+    xlss: [{ required: true, message: '请选择字典下拉搜索!' }],
+    popup: [{ required: true, message: '请选择popup弹窗!' }],
+    flzds: [{ required: true, message: '请选择分类字典树!' }],
+    yhxz: [{ required: true, message: '请选择用户!' }],
+    fwb: [{ required: true, message: '请填写富文本!' }],
+    shq: [{ required: true, message: '请选择省市级!' }],
+    ldzje: [{ required: true, message: '请输入JInputPop!' }],
+    ldzjs: [{ required: true, message: '请选择下拉输入框!' }],
+    zddtjxl: [{ required: true, message: '请选择多选输入框!' }],
+    yongHu: [{ required: true, message: '请选择用户!' }],
+    zhiWu: [{ required: true, message: '请选择职务!' }],
+    jueSe: [{ required: true, message: '请选择角色!' }],
+    zdys: [{ required: true, message: '请选择自定义树!' }],
+    jssq: [{ required: true, message: '请选择三级联动!' }],
+    zdbxl: [{ required: true, message: '请选择JTreeDict!' }],
+    zdmrz: [{ required: true, message: '请输入JCodeEditor!' }],
+    jsonParam: [{ required: true, message: '请输入参数!' }],
+    bmxz: [{ required: true, message: '请选择部门!' }],
+    yuanjia: [{ required: true, message: '请输入数值!' }],
+    nyrsfm: [{ required: true, message: '请选择年月日时分秒!' }],
+  };
+  //update-begin---author:wangshuai ---date:20220616  for：报表示例验证修改------------
+  const { resetFields, validate, validateInfos } = useForm(formState, validatorRules, { immediate: false });
+  //update-end---author:wangshuai ---date:20220616  for：报表示例验证修改------------
+  const ldzjsOptions = ref([
+    { label: '男', value: '1' },
+    { label: '女', value: '2' },
+  ]);
+
+  /**
+   * 新增
+   */
+  function add() {
+    edit({});
+  }
+
+  /**
+   * 编辑
+   */
+  function edit(record) {
+    nextTick(() => {
+      resetFields();
+      //赋值
+      Object.assign(formState, record);
+    });
+  }
+
+  /**
+   * 提交数据
+   */
+  async function submitForm() {
+    // 触发表单验证
+    //update-begin---author:wangshuai ---date:20220616  for：报表示例验证修改------------
+    await validate();
+    confirmLoading.value = true;
+    let httpurl = '';
+    let method = '';
+    //时间格式化
+    let model = formState;
+    if (!model.id) {
+      httpurl += url.add;
+      method = 'post';
+    } else {
+      httpurl += url.edit;
+      method = 'put';
+    }
+    //循环数据如果是数组
+    for (let data in formState) {
+      //如果该数据是数组并且是字符串类型
+      if (formState[data] instanceof Array) {
+        let valueType = getValueType(formRef.value.getProps, data);
+        //如果是字符串类型的需要变成以逗号分割的字符串
+        if (valueType === 'string') {
+          formState[data] = formState[data].join(',');
+        }
+      }
+    }
+    defHttp
+      .request(
+        {
+          url: httpurl,
+          params: model,
+          method: method,
+        },
+        { isTransformResponse: false }
+      )
+      .then((res) => {
+        if (res.success) {
+          createMessage.success(res.message);
+          emit('ok');
+        } else {
+          createMessage.warning(res.message);
+        }
+      })
+      .finally(() => {
+        confirmLoading.value = false;
+      });
+    //update-end---author:wangshuai ---date:20220616  for：报表示例验证修改--------------
+  }
+
+  /**
+   * popup成功回调事件
+   */
+  function popupHandleSuccess(values) {
+    Object.assign(formState, values);
+  }
+
+  /**
+   *  popup组件值改变事件
+   */
+  function setFieldsValue(map) {
+    Object.keys(map).map((key) => {
+      formState[key] = map[key];
+    });
+  }
+
+  /**
+   * 值改变事件触发
+   * @param key
+   * @param value
+   */
+  function handleFormChange(key, value) {
+    formState[key] = value;
+  }
+
+  defineExpose({
+    add,
+    edit,
+    submitForm,
+  });
+</script>
+
+<style lang="less" scoped>
+  .antd-modal-form {
+    height: 500px !important;
+    overflow-y: auto;
+    padding: 24px 24px 24px 24px;
+  }
+</style>
diff --git a/src/views/demo/jeecg/Native/one/components/OneNativeModal.vue b/src/views/demo/jeecg/Native/one/components/OneNativeModal.vue
new file mode 100644
index 0000000..770bec2
--- /dev/null
+++ b/src/views/demo/jeecg/Native/one/components/OneNativeModal.vue
@@ -0,0 +1,59 @@
+<template>
+  <a-modal :title="title" :width="width" :visible="visible" @ok="handleOk" :okButtonProps="{ class: { 'jee-hidden': disableSubmit } }" @cancel="handleCancel" cancelText="关闭">
+    <OneNativeForm ref="realForm" @ok="submitCallback" :disabled="disableSubmit"></OneNativeForm>
+  </a-modal>
+</template>
+
+<script lang="ts" setup>
+  import { ref, nextTick, defineExpose } from 'vue';
+  import OneNativeForm from './OneNativeForm.vue';
+
+  const title = ref<string>('');
+  const width = ref<number>(800);
+  const visible = ref<boolean>(false);
+  const disableSubmit = ref<boolean>(false);
+  const realForm = ref();
+  const emit = defineEmits(['register', 'ok']);
+
+  function add() {
+    title.value = '新增';
+    visible.value = true;
+    nextTick(() => {
+      realForm.value.add();
+    });
+  }
+
+  function edit(record) {
+    title.value = disableSubmit.value ? '详情' : '编辑';
+    visible.value = true;
+    nextTick(() => {
+      realForm.value.edit(record);
+    });
+  }
+
+  function handleOk() {
+    realForm.value.submitForm();
+  }
+
+  function submitCallback() {
+    handleCancel();
+    emit('ok');
+  }
+
+  function handleCancel() {
+    visible.value = false;
+  }
+
+  defineExpose({
+    add,
+    edit,
+    disableSubmit,
+  });
+</script>
+
+<style>
+  /**隐藏样式-modal确定按钮 */
+  .jee-hidden {
+    display: none !important;
+  }
+</style>
diff --git a/src/views/demo/page/form/high/index.vue b/src/views/demo/page/form/high/index.vue
index 364e012..f8709a3 100644
--- a/src/views/demo/page/form/high/index.vue
+++ b/src/views/demo/page/form/high/index.vue
@@ -64,4 +64,10 @@
   .high-form {
     padding-bottom: 48px;
   }
+
+  /** update-begin-author:taoyan date:2022-5-16 for:/issues/63 下拉框z-index问题 */
+  ::v-deep(.ant-select-dropdown) {
+    z-index: 98 !important;
+  }
+  /** update-end-author:taoyan date:2022-5-16 for:/issues/63 下拉框z-index问题 */
 </style>
diff --git a/src/views/demo/vextable/VexTableModal.vue b/src/views/demo/vextable/VexTableModal.vue
index 64573be..f15586b 100644
--- a/src/views/demo/vextable/VexTableModal.vue
+++ b/src/views/demo/vextable/VexTableModal.vue
@@ -151,7 +151,20 @@
           });
       }
 
-      return { xTable, tableData, sexList, formRef, validatorRules, orderMainModel, registerModal, getTitle, labelCol, wrapperCol, insertEvent, handleSubmit };
+      return {
+        xTable,
+        tableData,
+        sexList,
+        formRef,
+        validatorRules,
+        orderMainModel,
+        registerModal,
+        getTitle,
+        labelCol,
+        wrapperCol,
+        insertEvent,
+        handleSubmit,
+      };
     },
   });
 </script>
diff --git a/src/views/demo/vextable/jvxetable/JVxeTableModal.vue b/src/views/demo/vextable/jvxetable/JVxeTableModal.vue
index 61de391..73e3fce 100644
--- a/src/views/demo/vextable/jvxetable/JVxeTableModal.vue
+++ b/src/views/demo/vextable/jvxetable/JVxeTableModal.vue
@@ -153,6 +153,8 @@
         orderMainModel.content = '';
         orderMainModel.jeecgOrderCustomerList = [];
         orderMainModel.jeecgOrderTicketList = [];
+        table1.dataSource = [];
+        table2.dataSource = [];
       }
       async function requestAddOrEdit(values) {
         setModalProps({ confirmLoading: true });
@@ -163,7 +165,22 @@
         //刷新列表
         emit('success');
       }
-      return { formRef, activeKey, table1, table2, tableRef1, tableRef2, getTitle, labelCol, wrapperCol, validatorRules, orderMainModel, registerModal, handleChangeTabs, handleSubmit };
+      return {
+        formRef,
+        activeKey,
+        table1,
+        table2,
+        tableRef1,
+        tableRef2,
+        getTitle,
+        labelCol,
+        wrapperCol,
+        validatorRules,
+        orderMainModel,
+        registerModal,
+        handleChangeTabs,
+        handleSubmit,
+      };
     },
   });
 </script>
diff --git a/src/views/demo/vextable/modal.vue b/src/views/demo/vextable/modal.vue
index 4eb22f2..c3cd600 100644
--- a/src/views/demo/vextable/modal.vue
+++ b/src/views/demo/vextable/modal.vue
@@ -222,7 +222,20 @@
           });
       }
 
-      return { formRef, validatorRules, orderMainModel, registerModal, getTitle, labelCol, wrapperCol, addRowCustom, delRowCustom, addRowTicket, delRowTicket, handleSubmit };
+      return {
+        formRef,
+        validatorRules,
+        orderMainModel,
+        registerModal,
+        getTitle,
+        labelCol,
+        wrapperCol,
+        addRowCustom,
+        delRowCustom,
+        addRowTicket,
+        delRowTicket,
+        handleSubmit,
+      };
     },
   });
 </script>
diff --git a/src/views/monitor/datalog/DataLogCompareModal.vue b/src/views/monitor/datalog/DataLogCompareModal.vue
index 2959398..2911c92 100644
--- a/src/views/monitor/datalog/DataLogCompareModal.vue
+++ b/src/views/monitor/datalog/DataLogCompareModal.vue
@@ -50,7 +50,7 @@
   import { useMessage } from '/@/hooks/web/useMessage';
 
   export default defineComponent({
-    name: 'UserSelectModal',
+    name: 'DataLogCompareModal',
     components: {
       //此处需要异步加载BasicTable
       BasicModal,
diff --git a/src/views/monitor/datasource/datasource.data.ts b/src/views/monitor/datasource/datasource.data.ts
index 7069613..3345232 100644
--- a/src/views/monitor/datasource/datasource.data.ts
+++ b/src/views/monitor/datasource/datasource.data.ts
@@ -36,7 +36,9 @@ const dbUrlMap = {
   // MySQL 数据库
   '1': { dbUrl: 'jdbc:mysql://127.0.0.1:3306/jeecg-boot?characterEncoding=UTF-8&useUnicode=true&useSSL=false' },
   //MySQL5.7+ 数据库
-  '4': { dbUrl: 'jdbc:mysql://127.0.0.1:3306/jeecg-boot?characterEncoding=UTF-8&useUnicode=true&useSSL=false&tinyInt1isBit=false&allowPublicKeyRetrieval=true&serverTimezone=Asia/Shanghai' },
+  '4': {
+    dbUrl: 'jdbc:mysql://127.0.0.1:3306/jeecg-boot?characterEncoding=UTF-8&useUnicode=true&useSSL=false&tinyInt1isBit=false&allowPublicKeyRetrieval=true&serverTimezone=Asia/Shanghai',
+  },
   // Oracle
   '2': { dbUrl: 'jdbc:oracle:thin:@127.0.0.1:1521:ORCL' },
   // SQLServer 数据库
diff --git a/src/views/monitor/log/index.vue b/src/views/monitor/log/index.vue
index 08a2c74..9c7bd1a 100644
--- a/src/views/monitor/log/index.vue
+++ b/src/views/monitor/log/index.vue
@@ -1,5 +1,5 @@
 <template>
-  <BasicTable @register="registerTable" :searchInfo="searchInfo">
+  <BasicTable @register="registerTable" :searchInfo="searchInfo" :columns="logColumns">
     <template #tableTitle>
       <a-tabs defaultActiveKey="1" @change="tabChange" size="small">
         <a-tab-pane tab="登录日志" key="1"></a-tab-pane>
@@ -24,12 +24,13 @@
   import { ref } from 'vue';
   import { BasicTable, useTable, TableAction } from '/@/components/Table';
   import { getLogList } from './log.api';
-  import { columns, searchFormSchema } from './log.data';
+  import { columns, searchFormSchema, operationLogColumn } from './log.data';
   import { useMessage } from '/@/hooks/web/useMessage';
   import { useListPage } from '/@/hooks/system/useListPage';
   const { createMessage } = useMessage();
   const checkedKeys = ref<Array<string | number>>([]);
 
+  const logColumns = ref<any>(columns);
   const searchInfo = { logType: '1' };
   // 列表页面公共参数、方法
   const { prefixCls, tableContext } = useListPage({
@@ -37,8 +38,8 @@
     tableProps: {
       title: '日志列表',
       api: getLogList,
-      columns: columns,
       expandRowByClick: true,
+      showActionColumn: false,
       rowSelection: {
         columnWidth: 20,
       },
@@ -54,6 +55,13 @@
   // 日志类型
   function tabChange(key) {
     searchInfo.logType = key;
+    //update-begin---author:wangshuai ---date:20220506  for：[VUEN-943]vue3日志管理列表翻译不对------------
+    if (key == '1') {
+      logColumns.value = columns;
+    } else {
+      logColumns.value = operationLogColumn;
+    }
+    //update-end---author:wangshuai ---date:20220506  for：[VUEN-943]vue3日志管理列表翻译不对--------------
     reload();
   }
 
diff --git a/src/views/monitor/log/log.data.ts b/src/views/monitor/log/log.data.ts
index c508c89..ce1ec4a 100644
--- a/src/views/monitor/log/log.data.ts
+++ b/src/views/monitor/log/log.data.ts
@@ -33,6 +33,18 @@ export const columns: BasicColumn[] = [
     sorter: true,
     width: 80,
   },
+  {
+    title: '日志类型',
+    dataIndex: 'logType_dictText',
+    width: 60,
+  },
+];
+
+/**
+ * 操作日志需要操作类型
+ */
+export const operationLogColumn: BasicColumn[] = [
+  ...columns,
   {
     title: '操作类型',
     dataIndex: 'operateType_dictText',
diff --git a/src/views/monitor/mynews/DynamicNotice.vue b/src/views/monitor/mynews/DynamicNotice.vue
index e287b71..7ff8c4e 100644
--- a/src/views/monitor/mynews/DynamicNotice.vue
+++ b/src/views/monitor/mynews/DynamicNotice.vue
@@ -1,32 +1,35 @@
 <template>
-  <component :is="comp" :formData="formData" ref="compModel" v-if="comp"></component>
+  <component :is="currentModal" :formData="formData" v-model:visible="modalVisible"></component>
 </template>
-<script>
-  const modules = import.meta.glob('/@/views/monitor/mynews/*.vue');
-  export default {
-    name: 'DynamicNotice',
-    data() {
-      return {
-        compName: this.path,
-      };
-    },
-    computed: {
-      comp: function () {
-        if (!this.path) {
-          return null;
-        }
-        return () => modules[`/@/views/monitor/mynews/${this.path}`];
-      },
-    },
-    props: ['path', 'formData'],
-    methods: {
-      detail() {
-        setTimeout(() => {
-          if (this.path) {
-            this.$refs.compModel.view(this.formData);
-          }
-        }, 200);
-      },
-    },
+<script setup lang="ts" name="dynamic-notice">
+  import { ref, defineExpose, shallowRef, ComponentOptions, nextTick, defineAsyncComponent } from 'vue';
+  const props = defineProps({
+    path: { type: String, default: '' },
+    formData: { type: Object, default: {} },
+  });
+  const modalVisible = ref<Boolean>(false);
+  const currentModal = shallowRef<Nullable<ComponentOptions>>(null);
+  const formData = ref<any>(props.formData);
+
+  const componentType = {
   };
+
+  /**
+   * 跟换组件和传值事件
+   */
+  function detail() {
+    setTimeout(() => {
+      if (props.path) {
+        nextTick(() => {
+          currentModal.value = componentType[props.path];
+          formData.value = props.formData;
+          modalVisible.value = true;
+        });
+      }
+    }, 200);
+  }
+
+  defineExpose({
+    detail,
+  });
 </script>
diff --git a/src/views/monitor/quartz/quartz.data.ts b/src/views/monitor/quartz/quartz.data.ts
index f756db9..10d94f7 100644
--- a/src/views/monitor/quartz/quartz.data.ts
+++ b/src/views/monitor/quartz/quartz.data.ts
@@ -29,7 +29,7 @@ export const columns: BasicColumn[] = [
     dataIndex: 'status',
     width: 100,
     customRender: ({ text }) => {
-      const color = text == '0' ? 'red' : text == '-1' ? 'green' : 'gray';
+      const color = text == '0' ? 'green' : text == '-1' ? 'red' : 'gray';
       return render.renderTag(render.renderDict(text, 'quartz_status'), color);
     },
   },
diff --git a/src/views/sys/login/LoginForm.vue b/src/views/sys/login/LoginForm.vue
index 706af37..05573a4 100644
--- a/src/views/sys/login/LoginForm.vue
+++ b/src/views/sys/login/LoginForm.vue
@@ -161,6 +161,10 @@
         duration: 3,
       });
       loading.value = false;
+
+      //update-begin-author:taoyan date:2022-5-3 for: issues/41 登录页面，当输入验证码错误时，验证码图片要刷新一下，而不是保持旧的验证码图片不变
+      handleChangeCheckCode();
+      //update-end-author:taoyan date:2022-5-3 for: issues/41 登录页面，当输入验证码错误时，验证码图片要刷新一下，而不是保持旧的验证码图片不变
     }
   }
   function handleChangeCheckCode() {
diff --git a/src/views/sys/login/LoginSelect.vue b/src/views/sys/login/LoginSelect.vue
index ed7b241..039d2db 100644
--- a/src/views/sys/login/LoginSelect.vue
+++ b/src/views/sys/login/LoginSelect.vue
@@ -251,6 +251,9 @@
             visible.value = true;
           }
         }
+        //登录弹窗完成后，将登录的标识设置成false
+        loginResult.isLogin = false;
+        userStore.setLoginInfo(loginResult);
       }
 
       /**
diff --git a/src/views/system/category/components/CategoryModal.vue b/src/views/system/category/components/CategoryModal.vue
index 3a3ffb9..8526482 100644
--- a/src/views/system/category/components/CategoryModal.vue
+++ b/src/views/system/category/components/CategoryModal.vue
@@ -1,5 +1,5 @@
 <template>
-  <BasicModal v-bind="$attrs" @register="registerModal" :title="getTitle" @ok="handleSubmit">
+  <BasicModal v-bind="$attrs" @register="registerModal" destroyOnClose :title="getTitle" @ok="handleSubmit">
     <BasicForm @register="registerForm" />
   </BasicModal>
 </template>
diff --git a/src/views/system/category/index.vue b/src/views/system/category/index.vue
index 0986017..927ae47 100644
--- a/src/views/system/category/index.vue
+++ b/src/views/system/category/index.vue
@@ -122,7 +122,9 @@
    * 导入
    */
   function importSuccess() {
-    reload() && (expandedRowKeys.value = []);
+    //update-begin---author:wangshuai ---date:20220530  for：[issues/54]树字典，勾选，然后批量删除，系统错误------------
+    (selectedRowKeys.value = []) && reload();
+    //update-end---author:wangshuai ---date:20220530  for：[issues/54]树字典，勾选，然后批量删除，系统错误--------------
   }
   /**
    * 添加下级
diff --git a/src/views/system/dict/dict.data.ts b/src/views/system/dict/dict.data.ts
index 97c9b58..56b90aa 100644
--- a/src/views/system/dict/dict.data.ts
+++ b/src/views/system/dict/dict.data.ts
@@ -137,7 +137,7 @@ export const itemFormSchema: FormSchema[] = [
             if (!value) {
               return Promise.reject('请输入数据值');
             }
-            if (new RegExp("[`_~!@#$^&*()=|{}'.<>《》/?！￥（）—【】‘；：”“。，、？]").test(value)) {
+            if (new RegExp("[`~!@#$^&*()=|{}'.<>《》/?！￥（）—【】‘；：”“。，、？]").test(value)) {
               return Promise.reject('数据值不能包含特殊字符！');
             }
             return new Promise<void>((resolve, reject) => {
diff --git a/src/views/system/dict/index.vue b/src/views/system/dict/index.vue
index 05e060a..bd932d1 100644
--- a/src/views/system/dict/index.vue
+++ b/src/views/system/dict/index.vue
@@ -75,14 +75,16 @@
       actionColumn: {
         width: 240,
       },
-      exportConfig: {
-        name: '数据字典列表',
-        url: getExportUrl,
-      },
-      importConfig: {
-        url: getImportUrl,
-      },
     },
+    //update-begin---author:wangshuai ---date:20220616  for：[issues/I5AMDD]导入/导出功能，操作后提示没有传递 export.url/import.url 参数------------
+    exportConfig: {
+      name: '数据字典列表',
+      url: getExportUrl,
+    },
+    importConfig: {
+      url: getImportUrl,
+    },
+    //update-end---author:wangshuai ---date:20220616  for：[issues/I5AMDD]导入/导出功能，操作后提示没有传递 export.url/import.url 参数--------------
   });
 
   //注册table数据
diff --git a/src/views/system/fillRule/fill.rule.data.ts b/src/views/system/fillRule/fill.rule.data.ts
index 4e07fd1..05676d6 100644
--- a/src/views/system/fillRule/fill.rule.data.ts
+++ b/src/views/system/fillRule/fill.rule.data.ts
@@ -105,5 +105,8 @@ export const formSchema: FormSchema[] = [
     label: '规则参数',
     colProps: { span: 24 },
     component: 'JAddInput',
+    componentProps: {
+      min: 0,
+    },
   },
 ];
diff --git a/src/views/system/menu/DataRuleList.vue b/src/views/system/menu/DataRuleList.vue
index e3731fb..9ccc1a4 100644
--- a/src/views/system/menu/DataRuleList.vue
+++ b/src/views/system/menu/DataRuleList.vue
@@ -1,5 +1,5 @@
 <template>
-  <BasicDrawer v-bind="$attrs" @register="registerDrawer" title="数据权限规则" :width="width">
+  <BasicDrawer v-bind="$attrs" @register="registerDrawer" title="数据权限规则" :width="adaptiveWidth">
     <BasicTable @register="registerTable">
       <template #tableTitle>
         <a-button type="primary" @click="handleCreate"> 新增</a-button>
@@ -20,9 +20,9 @@
   import { dataRuleColumns, dataRuleSearchFormSchema } from './menu.data';
   import { dataRuleList, deleteRule } from './menu.api';
   import { ColEx } from '/@/components/Form/src/types';
-  import { useAdapt } from '/@/hooks/system/useAutoAdapt.ts';
+  import { useDrawerAdaptiveWidth } from '/@/hooks/jeecg/useAdaptiveWidth';
   const permissionId = ref('');
-  const { width } = useAdapt({ def: '650px', xl: '650px', lg: '650px' });
+  const { adaptiveWidth } = useDrawerAdaptiveWidth();
   //权限规则model
   const [registerModal, { openModal }] = useModal();
   const [registerDrawer] = useDrawerInner(async (data) => {
@@ -63,6 +63,7 @@
     useSearchForm: true,
     bordered: true,
     showIndexColumn: false,
+    showTableSetting: false,
     canResize: false,
     immediate: false,
     actionColumn: {
diff --git a/src/views/system/menu/MenuDrawer.vue b/src/views/system/menu/MenuDrawer.vue
index 412cb8c..d2c9e6d 100644
--- a/src/views/system/menu/MenuDrawer.vue
+++ b/src/views/system/menu/MenuDrawer.vue
@@ -1,5 +1,5 @@
 <template>
-  <BasicDrawer v-bind="$attrs" @register="registerDrawer" showFooter :width="width" :title="getTitle" @ok="handleSubmit">
+  <BasicDrawer v-bind="$attrs" @register="registerDrawer" showFooter :width="adaptiveWidth" :title="getTitle" @ok="handleSubmit">
     <BasicForm @register="registerForm" class="menuForm" />
   </BasicDrawer>
 </template>
@@ -9,10 +9,10 @@
   import { formSchema, ComponentTypes } from './menu.data';
   import { BasicDrawer, useDrawerInner } from '/@/components/Drawer';
   import { list, saveOrUpdateMenu } from './menu.api';
-  import { useAdapt } from '/@/hooks/system/useAutoAdapt.ts';
+  import { useDrawerAdaptiveWidth } from '/@/hooks/jeecg/useAdaptiveWidth';
   // 声明Emits
   const emit = defineEmits(['success', 'register']);
-  const { width } = useAdapt();
+  const { adaptiveWidth } = useDrawerAdaptiveWidth();
   const attrs = useAttrs();
   const isUpdate = ref(true);
   const menuType = ref(0);
diff --git a/src/views/system/notice/index.vue b/src/views/system/notice/index.vue
index 88a6cfe..e324a64 100644
--- a/src/views/system/notice/index.vue
+++ b/src/views/system/notice/index.vue
@@ -46,7 +46,7 @@
   const iframeUrl = ref('');
 
   // 列表页面公共参数、方法
-  const { prefixCls, onExportXls, onImportXls, tableContext } = useListPage({
+  const { prefixCls, onExportXls, onImportXls, tableContext, doRequest } = useListPage({
     designScope: 'notice-template',
     tableProps: {
       title: '消息通知',
@@ -97,7 +97,7 @@
    * 批量删除事件
    */
   async function batchHandleDelete() {
-    await batchDeleteNotice({ ids: selectedRowKeys.value }, reload);
+    doRequest(() => batchDeleteNotice({ ids: selectedRowKeys.value }));
   }
   /**
    * 发布
diff --git a/src/views/system/notice/notice.api.ts b/src/views/system/notice/notice.api.ts
index 12eae4d..3e9fdc8 100644
--- a/src/views/system/notice/notice.api.ts
+++ b/src/views/system/notice/notice.api.ts
@@ -1,5 +1,4 @@
 import { defHttp } from '/@/utils/http/axios';
-import { Modal } from 'ant-design-vue';
 
 enum Api {
   list = '/sys/annountCement/list',
@@ -49,22 +48,10 @@ export const deleteNotice = (params, handleSuccess) => {
 };
 
 /**
- * 批量删除租户
+ * 批量消息公告
  * @param params
  */
-export const batchDeleteNotice = (params, handleSuccess) => {
-  Modal.confirm({
-    title: '确认删除',
-    content: '是否删除选中数据',
-    okText: '确认',
-    cancelText: '取消',
-    onOk: () => {
-      return defHttp.delete({ url: Api.deleteBatch, data: params }, { joinParamsToUrl: true }).then(() => {
-        handleSuccess();
-      });
-    },
-  });
-};
+export const batchDeleteNotice = (params) => defHttp.delete({ url: Api.deleteBatch, data: params }, { joinParamsToUrl: true });
 
 /**
  * 发布
diff --git a/src/views/system/role/components/RoleDesignModal.vue b/src/views/system/role/components/RoleDesignModal.vue
deleted file mode 100644
index fc504c0..0000000
--- a/src/views/system/role/components/RoleDesignModal.vue
+++ /dev/null
@@ -1,148 +0,0 @@
-<template>
-  <BasicModal v-bind="$attrs" @register="registerModal" title="工单授权" @ok="handleSubmit" width="1200px">
-    <!--工单授权部分-->
-    <template v-for="(item, index) of processTypeDictOptions">
-      <a-card :title="item.text" :style="{ marginTop: index == 0 ? '0px' : '12px', height: 'auto' }" :headStyle="{ backgroundColor: '#eaeaea' }">
-        <a-checkbox-group @change="designNameChange" v-model:value="designNameValue[index]" style="width: 100%">
-          <a-row>
-            <template v-for="des in designNameOption">
-              <a-col :span="6" v-if="des.procType == item.value">
-                <a-checkbox :value="des.value">{{ des.text }}</a-checkbox>
-              </a-col>
-            </template>
-          </a-row>
-        </a-checkbox-group>
-      </a-card>
-    </template>
-    <!--树操作部分-->
-    <template #insertFooter>
-      <a-dropdown placement="topCenter">
-        <template #overlay>
-          <a-menu>
-            <a-menu-item key="1" @click="checkALL">全部勾选</a-menu-item>
-            <a-menu-item key="2" @click="cancelCheckALL">取消全选</a-menu-item>
-          </a-menu>
-        </template>
-        <a-button style="float: left"> 树操作 <Icon icon="ant-design:up-outlined" /> </a-button>
-      </a-dropdown>
-    </template>
-  </BasicModal>
-</template>
-<script lang="ts" setup>
-  import { ref, computed, unref } from 'vue';
-  import { BasicModal, useModalInner } from '/src/components/Modal';
-  import { getParentDesignList, getRoleDegisnList, saveRoleDesign } from '../role.api';
-  import { initDictOptions } from '/@/utils/dict/index';
-  // 声明Emits
-  const emit = defineEmits(['success', 'register']);
-  //角色id
-  const roleId = ref('');
-  //原始工单id
-  const oldDesignId = ref('');
-  //新工单id
-  const newDesignId = ref('');
-  //工单字典类型
-  const processTypeDict = ref([]);
-  //工单字典类型项
-  const processTypeDictOptions = ref([]);
-  //工单集合
-  const desformList = ref([]);
-  //工单名称集合
-  const designNameOption = ref([]);
-  //工单数据集合
-  const designNameValue = ref([]);
-  //表单赋值
-  const [registerModal, { setModalProps, closeModal }] = useModalInner(async (data) => {
-    setModalProps({ confirmLoading: false });
-    roleId.value = data.roleId;
-    //初始化数据
-    initData();
-  });
-
-  /**
-   * 初始化数据
-   */
-  async function initData() {
-    //获取字典配置
-    let dictRes = await initDictOptions('bpm_process_type');
-    if (dictRes) {
-      processTypeDict.value = dictRes;
-    }
-    //获取表单设计信息
-    let designList = await getParentDesignList();
-    if (designList) {
-      desformList.value = designList;
-      //获取指定属性的数据集合
-      let procTypeArr = [...new Set(Array.from(unref(designList), ({ procType }) => procType))];
-      //工单类型字典项
-      processTypeDictOptions.value = processTypeDict.value.filter((item) => procTypeArr.indexOf(item.value) != -1);
-      //工单名称集合
-      designNameOption.value = designList.map((design) => {
-        return { value: design.id, text: design.desformName, procType: design.procType };
-      });
-    }
-    //获取角色表单信息
-    let roleDegisnList = await getRoleDegisnList({ roleId: unref(roleId) });
-    if (roleDegisnList.length > 0) {
-      let { designName, designValues } = selectedDesign(roleDegisnList);
-      oldDesignId.value = designName.join(',');
-      newDesignId.value = designName.join(',');
-      designNameValue.value = designValues;
-    }
-  }
-  /**
-   * 点击修改
-   */
-  function designNameChange(selectedValue) {
-    newDesignId.value = unref(designNameValue).join(',');
-  }
-  /**
-   * 全选
-   */
-  function checkALL() {
-    let { designName, designValues } = selectedDesign(unref(desformList));
-    designNameValue.value = designValues;
-    newDesignId.value = designName.join(',');
-  }
-  /**
-   * 取消全选
-   */
-  function cancelCheckALL() {
-    designNameValue.value = [];
-    newDesignId.value = '';
-  }
-  /**
-   * 选中工单信息
-   */
-  function selectedDesign(selectedList) {
-    let designName = [];
-    let designValues = [];
-    for (let option of unref(processTypeDictOptions)) {
-      let values = [];
-      for (let value of selectedList) {
-        if (option.value == value.procType) {
-          designName.push(value.id);
-          values.push(value.id);
-        }
-      }
-      designValues.push(values);
-    }
-    return { designName, designValues };
-  }
-  /**
-   * 提交事件
-   */
-  async function handleSubmit() {
-    try {
-      setModalProps({ confirmLoading: true });
-      //提交表单
-      await saveRoleDesign({ roleId: unref(roleId), newDesignId: unref(newDesignId), oldDessignId: unref(oldDesignId) });
-      //关闭弹窗
-      closeModal();
-      //刷新列表
-      emit('success');
-    } finally {
-      setModalProps({ confirmLoading: false });
-    }
-  }
-</script>
diff --git a/src/views/system/role/components/RoleIndexModal.vue b/src/views/system/role/components/RoleIndexModal.vue
deleted file mode 100644
index 07b35d3..0000000
--- a/src/views/system/role/components/RoleIndexModal.vue
+++ /dev/null
@@ -1,55 +0,0 @@
-<template>
-  <BasicModal v-bind="$attrs" @register="registerModal" title="首页配置" @ok="handleSubmit" width="40%">
-    <BasicForm @register="registerForm" />
-  </BasicModal>
-</template>
-
-<script lang="ts" setup>
-  import { ref, computed, unref } from 'vue';
-  import { BasicModal, useModalInner } from '/@/components/Modal';
-  import { BasicForm, useForm } from '/@/components/Form/index';
-  import { roleIndexFormSchema } from '../role.data';
-  import { saveOrUpdateRoleIndex, queryIndexByCode } from '../role.api';
-  // Emits声明
-  const emit = defineEmits(['register', 'success']);
-  const isUpdate = ref(true);
-  //表单配置
-  const [registerForm, { resetFields, setFieldsValue, validate }] = useForm({
-    labelWidth: 150,
-    schemas: roleIndexFormSchema,
-    showActionButtonGroup: false,
-  });
-  //表单赋值
-  const [registerModal, { setModalProps, closeModal }] = useModalInner(async (data) => {
-    //重置表单
-    await resetFields();
-    setModalProps({ confirmLoading: false });
-    setFieldsValue({ roleCode: data.roleCode });
-    let res = await queryIndexByCode({ roleCode: data.roleCode });
-    isUpdate.value = !!res.result?.id;
-    if (unref(isUpdate)) {
-      //表单赋值
-      await setFieldsValue({
-        ...res.result,
-      });
-    }
-  });
-
-  //表单提交事件
-  async function handleSubmit(v) {
-    try {
-      let values = await validate();
-      setModalProps({ confirmLoading: true });
-      //提交表单
-      await saveOrUpdateRoleIndex(values, isUpdate.value);
-      //关闭弹窗
-      closeModal();
-      //刷新列表
-      emit('success', { isUpdate: isUpdate.value, values });
-    } finally {
-      setModalProps({ confirmLoading: false });
-    }
-  }
-</script>
-
-<style lang="less" scoped></style>
diff --git a/src/views/system/role/components/RolePermissionDrawer.vue b/src/views/system/role/components/RolePermissionDrawer.vue
index c28f8e3..4d2d831 100644
--- a/src/views/system/role/components/RolePermissionDrawer.vue
+++ b/src/views/system/role/components/RolePermissionDrawer.vue
@@ -116,3 +116,11 @@
     exit && closeDrawer();
   }
 </script>
+
+<style lang="less" scoped>
+  /** 固定操作按钮 */
+  .jeecg-basic-tree {
+    position: absolute;
+    width: 618px;
+  }
+</style>
diff --git a/src/views/system/role/index.vue b/src/views/system/role/index.vue
index c625d67..97558ff 100644
--- a/src/views/system/role/index.vue
+++ b/src/views/system/role/index.vue
@@ -32,8 +32,6 @@
   <RolePermissionDrawer @register="rolePermissionDrawer" />
   <!--角色工单授权-->
   <RoleDesignModal @register="registerModal" />
-  <!--角色工单授权-->
-  <RoleIndexModal @register="registerIndexModal" />
 </template>
 <script lang="ts" name="system-role" setup>
   import { ref } from 'vue';
@@ -43,8 +41,6 @@
   import RoleDrawer from './components/RoleDrawer.vue';
   import RoleDesc from './components/RoleDesc.vue';
   import RolePermissionDrawer from './components/RolePermissionDrawer.vue';
-  import RoleDesignModal from './components/RoleDesignModal.vue';
-  import RoleIndexModal from './components/RoleIndexModal.vue';
   import RoleUserTable from './components/RoleUserTable.vue';
   import { columns, searchFormSchema } from './role.data';
   import { list, deleteRole, batchDeleteRole, getExportUrl, getImportUrl } from './role.api';
@@ -53,7 +49,6 @@
   const [roleUserDrawer, { openDrawer: openRoleUserDrawer }] = useDrawer();
   const [registerDrawer, { openDrawer }] = useDrawer();
   const [registerModal, { openModal }] = useModal();
-  const [registerIndexModal, { openModal: openIndexModal }] = useModal();
   const [rolePermissionDrawer, { openDrawer: openRolePermissionDrawer }] = useDrawer();
   const [registerDesc, { openDrawer: openRoleDesc }] = useDrawer();
 
@@ -129,18 +124,6 @@
   function handlePerssion(record) {
     openRolePermissionDrawer(true, { roleId: record.id });
   }
-  /**
-   * 工单授权弹窗
-   */
-  function handleDesign(id) {
-    openModal(true, { roleId: id });
-  }
-  /**
-   * 首页配置弹窗
-   */
-  function handleIndexConfig(roleCode) {
-    openIndexModal(true, { roleCode });
-  }
   /**
    * 角色用户
    */
@@ -184,14 +167,6 @@
           confirm: handleDelete.bind(null, record),
         },
       },
-      {
-        label: '首页配置',
-        onClick: handleIndexConfig.bind(null, record.roleCode),
-      },
-      {
-        label: '工单?',
-        onClick: handleDesign.bind(null, record.id),
-      },
     ];
   }
 </script>
diff --git a/src/views/system/user/UserDrawer.vue b/src/views/system/user/UserDrawer.vue
index 089a387..f0c2d51 100644
--- a/src/views/system/user/UserDrawer.vue
+++ b/src/views/system/user/UserDrawer.vue
@@ -36,8 +36,10 @@
       if (data.record.relTenantIds && !Array.isArray(data.record.relTenantIds)) {
         data.record.relTenantIds = data.record.relTenantIds.split(',');
       } else {
-        data.record.relTenantIds = [];
+        //【issues/I56C5I】用户管理中连续点两次编辑租户配置就丢失了
+        //data.record.relTenantIds = [];
       }
+
       //查角色/赋值/try catch 处理，不然编辑有问题
       try {
         const userRoles = await getUserRoles({ userid: data.record.id });
@@ -94,7 +96,9 @@
       });
     }
     // 隐藏底部时禁用整个表单
-    setProps({ disabled: !showFooter });
+    //update-begin-author:taoyan date:2022-5-24 for: VUEN-1117【issue】0523周开源问题
+    setProps({ disabled: !showFooter.value });
+    //update-end-author:taoyan date:2022-5-24 for: VUEN-1117【issue】0523周开源问题
   });
   //获取标题
   const getTitle = computed(() => (!unref(isUpdate) ? '新增用户' : '编辑用户'));
@@ -111,7 +115,7 @@
       //关闭弹窗
       closeDrawer();
       //刷新列表
-      emit('success', { isUpdate: unref(isUpdate), values: { ...values, id: rowId.value } });
+      emit('success');
     } finally {
       setDrawerProps({ confirmLoading: false });
     }
diff --git a/src/views/system/user/index.vue b/src/views/system/user/index.vue
index 048ccfc..08180c6 100644
--- a/src/views/system/user/index.vue
+++ b/src/views/system/user/index.vue
@@ -167,12 +167,8 @@
   /**
    * 成功回调
    */
-  function handleSuccess({ isUpdate, values }) {
-    if (isUpdate) {
-      updateTableDataRecord(values.id, values);
-    } else {
-      reload();
-    }
+  function handleSuccess() {
+    reload();
   }
 
   /**
diff --git a/types/store.d.ts b/types/store.d.ts
index be2f2ea..7b9349a 100644
--- a/types/store.d.ts
+++ b/types/store.d.ts
@@ -48,6 +48,7 @@ export interface LoginInfo {
   userInfo?: object;
   departs?: [];
   tenantList?: [];
+  isLogin?: boolean;
 }
 
 export interface BeforeMiniState {
diff --git a/vite.config.ts b/vite.config.ts
index 64f220e..182c87d 100644
--- a/vite.config.ts
+++ b/vite.config.ts
@@ -62,6 +62,7 @@ export default ({ command, mode }: ConfigEnv): UserConfig => {
     },
     build: {
       target: 'es2015',
+      // 【VUEN-872】css编译兼容低版本chrome内核（例如360浏览器）
       cssTarget: 'chrome80',
       outDir: OUTPUT_DIR,
       terserOptions: {