diff --git a/package.json b/package.json
index 58fd6abc776a3f9c0974db04deef76a60f1b7f65..29c74b7c38c91eb1344c4ce492e3e43e75a2e367 100644
--- a/package.json
+++ b/package.json
@@ -9,8 +9,8 @@
   },
   "dependencies": {
     "@arco-design/color": "^0.4.0",
-    "@arco-design/web-vue": "^2.37.4",
-    "@arco-themes/vue-mine-admin": "^0.0.8",
+    "@arco-design/web-vue": "^2.38.3",
+    "@arco-themes/vue-mine-admin": "^0.0.9",
     "@tinymce/tinymce-vue": "^5.0.0",
     "autoprefixer": "^10.4.0",
     "axios": "^0.27.2",
@@ -37,7 +37,7 @@
     "vue-router": "^4.1.2"
   },
   "devDependencies": {
-    "@vitejs/plugin-vue": "^3.0.0",
+    "@vitejs/plugin-vue": "^3.1.2",
     "@vitejs/plugin-vue-jsx": "^2.0.0",
     "less": "^4.1.3",
     "less-loader": "^11.0.0",
diff --git a/src/api/common.js b/src/api/common.js
index 9698436473849087de63bb27402341a885d82d46..c6bb20bd6005836aa088ec1463bba493792c4bea 100644
--- a/src/api/common.js
+++ b/src/api/common.js
@@ -211,5 +211,33 @@ export default {
       url: 'setting/common/getModuleList',
       method: 'get'
     })
+  },
+
+  downloadById(id) {
+    return request({
+      url: 'system/downloadById?id=' + id,
+      method: 'get',
+    })
+  },
+
+  downloadByHash(hash) {
+    return request({
+      url: 'system/downloadByHash?hash=' + hash,
+      method: 'get',
+    })
+  },
+
+  getFileInfoById(id) {
+    return request({
+      url: 'system/getFileInfoById?id=' + id,
+      method: 'get',
+    })
+  },
+
+  getFileInfoByHash(hash) {
+    return request({
+      url: 'system/getFileInfoByHash?hash=' + hash,
+      method: 'get',
+    })
   }
 }
diff --git a/src/assets/ma-icons/Workflow.vue b/src/assets/ma-icons/Workflow.vue
new file mode 100644
index 0000000000000000000000000000000000000000..cd16557d3f0961f8a8fecd817e33aaecdcd3533a
--- /dev/null
+++ b/src/assets/ma-icons/Workflow.vue
@@ -0,0 +1,12 @@
+<!--
+ - MineAdmin is committed to providing solutions for quickly building web applications
+ - Please view the LICENSE file that was distributed with this source code,
+ - For the full copyright and license information.
+ - Thank you very much for using MineAdmin.
+ -
+ - @Author X.Mo<root@imoi.cn>
+ - @Link   https://gitee.com/xmo/mineadmin-vue
+-->
+<template>
+    <svg class="icon" viewBox="0 0 1024 1024" xmlns="http://www.w3.org/2000/svg"><path d="M480 384h320a96.11 96.11 0 0 0 96-96V160a96.11 96.11 0 0 0-96-96H480a96.11 96.11 0 0 0-96 96v32H224a96.11 96.11 0 0 0-96 96v160a96.11 96.11 0 0 0 96 96h576a32 32 0 0 1 32 32v160a32 32 0 0 1-32 32H640v-32a96.11 96.11 0 0 0-96-96H224a96.11 96.11 0 0 0-96 96v128a96.11 96.11 0 0 0 96 96h320a96.11 96.11 0 0 0 96-96v-32h160a96.11 96.11 0 0 0 96-96V576a96.11 96.11 0 0 0-96-96H224a32 32 0 0 1-32-32V288a32 32 0 0 1 32-32h160v32a96.11 96.11 0 0 0 96 96z m96 480a32 32 0 0 1-32 32H224a32 32 0 0 1-32-32V736a32 32 0 0 1 32-32h320a32 32 0 0 1 32 32zM448 160a32 32 0 0 1 32-32h320a32 32 0 0 1 32 32v128a32 32 0 0 1-32 32H480a32 32 0 0 1-32-32z" p-id="2451" fill="#515151"></path></svg>
+</template>
\ No newline at end of file
diff --git a/src/assets/ma-icons/index.js b/src/assets/ma-icons/index.js
index 60413f25ae75bf33ab10b70e6f0c0726bed66d2d..5b8d57c8d735537436fac76eb8666a9ff8343b1d 100644
--- a/src/assets/ma-icons/index.js
+++ b/src/assets/ma-icons/index.js
@@ -12,4 +12,5 @@ export { default as Db } from './Db.vue'
 export { default as Group } from './Group.vue'
 export { default as Rely } from './Rely.vue'
 export { default as Code } from './Code.vue'
-export { default as Online } from './Online.vue'
\ No newline at end of file
+export { default as Online } from './Online.vue'
+export { default as Workflow } from './Workflow.vue'
\ No newline at end of file
diff --git a/src/components/ma-crud/components/column.vue b/src/components/ma-crud/components/column.vue
index d485fc5400ebe4b1e534a1ee73f8bf50edf5d931..e80d17d7759687ffc9d23352c47cf9dc98e7e224 100644
--- a/src/components/ma-crud/components/column.vue
+++ b/src/components/ma-crud/components/column.vue
@@ -46,7 +46,7 @@
                 ><icon-eye /> {{ props.options.see.text || '查看' }}</a-link> -->
 
                 <a-link
-                  v-if="props.options.edit.show && !props.isRecovery"
+                  v-if="(isFunction(props.options.edit.show) ? props.options.edit.show(record):props.options.edit.show) && !props.isRecovery"
                   v-auth="props.options.edit.auth || []"
                   v-role="props.options.edit.role || []"
                   type="primary"
@@ -59,7 +59,7 @@
                   content="确定要恢复该数据吗?"
                   position="bottom"
                   @ok="recoveryAction(record)"
-                  v-if="props.options.recovery.show && props.isRecovery"
+                  v-if="(isFunction(props.options.recovery.show) ? props.options.recovery.show(record):props.options.recovery.show) && props.isRecovery"
                   v-auth="props.options.recovery.auth || []"
                   v-role="props.options.recovery.role || []"
                 >
@@ -70,7 +70,7 @@
                   content="确定要删除该数据吗?"
                   position="bottom"
                   @ok="deleteAction(record)"
-                  v-if="props.options.delete.show"
+                  v-if="(isFunction(props.options.delete.show) ? props.options.delete.show(record):props.options.delete.show)"
                 >
                   <a-link
                     type="primary"
@@ -97,6 +97,7 @@
           </template>
           <slot :name="row.dataIndex" v-bind="{ record, column, rowIndex }" v-else>
             <template v-if="row.dataIndex === '__index'">{{ getIndex(rowIndex) }}</template>
+            
             <template v-if="row.dict && row.dict.translation">
               <a-tag v-if="row.dict.tagColors" :color="getTagColor(row, record)">
                 {{ getDataIndex(row, record) }}
@@ -107,6 +108,9 @@
             <template v-else-if="row.dataIndex && row.dataIndex.indexOf('.') !== -1">
               {{ get(record, row.dataIndex) }}
             </template>
+            <template v-else-if="row.formType === 'upload'">
+              <a-link @click="imageSee(row, record)"><icon-image /> 查看图片</a-link>
+            </template>
             <template v-else>{{ record[row.dataIndex] }}</template>
           </slot>
         </template>
@@ -120,8 +124,10 @@ import { Message } from '@arco-design/web-vue'
 import config from '@/config/crud'
 import { isFunction, get } from 'lodash'
 import CustomRender from '../js/custom-render'
+import tool from '@/utils/tool'
+import commonApi from '@/api/common'
 
-const emit = defineEmits(['refresh'])
+const emit = defineEmits(['refresh', 'showImage'])
 const props = defineProps({
   options: Object,
   searchRef: Object,
@@ -131,6 +137,48 @@ const props = defineProps({
   isRecovery: Boolean,
 })
 
+const storageMode = {
+  '1': 'LOCAL',
+  '2': 'OSS',
+  '3': 'COS',
+  '4': 'QINIU'
+}
+
+const imageSee = async (row, record) => {
+  if (row.returnType) {
+
+    if (row.returnType == 'url') {
+      emit('showImage', record.url)
+      return
+    }
+
+    if (! ['id', 'hash'].includes(row.returnType)) {
+      Message.info('该图片无法查看')
+      return
+    }
+    Message.info('获取图片中，请稍等...')
+    const res = row.returnType == 'id' ? await commonApi.getFileInfoById({ id: record.id }) : await commonApi.getFileInfoByHash({ hash: record.hash })
+    const result  = res?.success ?? false
+    if (! result) {
+      Message.info('图片信息无法获取')
+      return
+    }
+
+    const isImage = res.data.mime_type.indexOf('image') > -1
+    result && emit(
+      'showImage',
+      isImage ? tool.attachUrl(res.data.url, storageMode[res.data.storage_mode]) : 'not-image.png'
+    )
+
+  } else {
+    if (! record[row.dataIndex]) {
+      Message.info('无图片')
+      return
+    }
+    emit('showImage', record[row.dataIndex] ?? 'not-image.png')
+  }
+}
+
 const getTagColor = (row, record) => {
   return props.searchRef.dictColors( row.dataIndex, (row.dataIndex.indexOf('.') > -1 ) ? get(record, row.dataIndex) : record[row.dataIndex] )
 }
@@ -180,3 +228,10 @@ const refresh = () => {
   emit('refresh')
 }
 </script>
+
+<style scoped>
+:deep(.arco-image-img) {
+  object-fit: contain;
+  background-color: var(--color-fill-4);
+}
+</style>
\ No newline at end of file
diff --git a/src/components/ma-crud/components/form.vue b/src/components/ma-crud/components/form.vue
index 8d61fddc7a19859bda7bed8eccb145fe42c1831d..dad5a6b15a1110d853e7a6213a436f5f69cee7a0 100644
--- a/src/components/ma-crud/components/form.vue
+++ b/src/components/ma-crud/components/form.vue
@@ -24,13 +24,12 @@
       <a-form
         ref="crudForm"
         :model="form"
-        :class="`grid grid-cols-1 lg:grid-cols-${ (! setting.layout || setting.layout === 'auto') ? ( setting.cols || 1 ) : 1} `"
         :label-align="setting.labelAlign || 'right'"
         @submit="submit"
       >
-        <a-row>
-          <template v-for="(item, index) in columns" :key="index">
-            <a-col :span="parseInt(setting.layout === 'customer' ? ( item.span || 24 ) : 24)">
+        <div :class="`w-full grid grid-cols-1 lg:grid-cols-${ (! setting.layout || setting.layout === 'auto') ? ( setting.cols || 1 ) : 1}`">
+          <template v-if="(! setting.layout || setting.layout === 'auto')">
+            <template v-for="(item, index) in columns" :key="index">
               <a-form-item
                 v-if="
                   formItemShow(item) &&
@@ -58,7 +57,7 @@
                     :readonly="formItemReadonly(item) || item.readonly"
                     :options="formDictData[item.dataIndex]"
                     :multiple="item.multiple"
-                    @change="handlerCascader($event, { form, item, currentAction, index })"
+                    @change="handlerCascader($event, item)"
                   />
 
                   <a-checkbox-group
@@ -66,7 +65,7 @@
                     v-model="form[item.dataIndex]"
                     :disabled="formItemDisabled(item) || item.disabled"
                     :readonly="formItemReadonly(item) || item.readonly"
-                    @change="handlerCascader($event, { form, item, currentAction, index })"
+                    @change="handlerCascader($event, item)"
                   >
                     <a-checkbox
                       v-for="option in formDictData[item.dataIndex]"
@@ -80,7 +79,7 @@
                     :disabled="formItemDisabled(item) || item.disabled"
                     :readonly="formItemReadonly(item) || item.readonly"
                     :type="item.type"
-                    @change="handlerCascader($event, { form, item, currentAction, index })"
+                    @change="handlerCascader($event, item)"
                   >
                     <a-radio
                       v-for="option in formDictData[item.dataIndex]"
@@ -187,6 +186,13 @@
                     @blur="item.blur && item.blur($event, { form, item, currentAction, index })"
                   />
 
+                  <component
+                    v-else-if="item.formType === 'component'"
+                    :is="item.dataIndex"
+                    :columns="columns"
+                    :item="item"
+                  />
+
                   <a-button
                     v-else-if="item.formType === 'button'"
                     :disabled="formItemDisabled(item) || item.disabled"
@@ -230,12 +236,13 @@
                     :title="item.title || '点击上传'"
                     :icon="item.icon || 'icon-plus'"
                     :chunk="item.chunk || false"
-                    :only-url="item?.onlyUrl ?? true"
+                    :only-data="item?.onlyData ?? true"
+                    :return-type="item?.returnType ?? 'url'"
                     :only-id="item?.onlyId ?? true"
                     :file-type="item.fileType || 'button'"
                     :show-word-limit="['input', 'textarea'].includes(item.formType) ? true : false"
                     :is-echo="item.isEcho"
-                    :mode="item.formType === 'input-number' ? 'button' : item.mode"
+                    :mode="item.mode"
                     :height="item.height || undefined"
                     :language="item.language || 'javascript'"
                     :isBind="item.language || false"
@@ -252,6 +259,7 @@
                   v-model="form[item.dataIndex]"
                   :options="item.childrenOptions"
                   :columns="item.children"
+                  :dataIndex="item.dataIndex"
                 >
                   <template
                     v-for="(groupItem, groupIndex) in item.children"
@@ -267,23 +275,276 @@
 
                 <template #extra v-if="item.formExtra">{{ item.formExtra }}</template>
               </a-form-item>
-            </a-col>
+            </template>
           </template>
-        </a-row>
+
+          <a-row v-else>
+            <template v-for="(item, index) in columns" :key="index">
+              <a-col :span="parseInt(setting.layout === 'customer' ? ( item.span || 24 ) : 24)">
+                <a-form-item
+                  v-if="
+                    formItemShow(item) &&
+                    ! ['__index', '__operation'].includes(item.dataIndex)
+                  "
+                  v-show="(typeof item.display == 'undefined' || item.display === true)"
+                  :label="item.title"
+                  :field="item.dataIndex"
+                  label-col-flex="auto"
+                  :label-col-style="{ width: item.labelWidth ? item.labelWidth : setting.labelWidth || '100px' }"
+                  :rules="getRules(item)"
+                  :validate-trigger="item.validateTrigger"
+                  :validate-status="item.validateStatus"
+                >
+                  <template v-if="item.formType !== 'form-group'">
+                    <a-select
+                      v-if="item.formType === 'select'"
+                      v-model="form[item.dataIndex]"
+                      :virtual-list-props="item.virtualList ? { height: 200 } : undefined"
+                      :placeholder="item.placeholder || `请选择${item.title}`"
+                      allow-clear
+                      allow-search
+                      :max-tag-count="item.maxTagCount || 1"
+                      :disabled="formItemDisabled(item) || item.disabled"
+                      :readonly="formItemReadonly(item) || item.readonly"
+                      :options="formDictData[item.dataIndex]"
+                      :multiple="item.multiple"
+                      @change="handlerCascader($event, item)"
+                    />
+
+                    <a-checkbox-group
+                      v-else-if="item.formType === 'checkbox'"
+                      v-model="form[item.dataIndex]"
+                      :disabled="formItemDisabled(item) || item.disabled"
+                      :readonly="formItemReadonly(item) || item.readonly"
+                      @change="handlerCascader($event, item)"
+                    >
+                      <a-checkbox
+                        v-for="option in formDictData[item.dataIndex]"
+                        :key="option" :value="Number.isInteger(form[item.dataIndex]) ? parseInt(option.value) : option.value"
+                      >{{ option.label }}</a-checkbox>
+                    </a-checkbox-group>
+
+                    <a-radio-group
+                      v-else-if="item.formType === 'radio'"
+                      v-model="form[item.dataIndex]"
+                      :disabled="formItemDisabled(item) || item.disabled"
+                      :readonly="formItemReadonly(item) || item.readonly"
+                      :type="item.type"
+                      @change="handlerCascader($event, item)"
+                    >
+                      <a-radio
+                        v-for="option in formDictData[item.dataIndex]"
+                        :key="option" :value="Number.isInteger(form[item.dataIndex]) ? parseInt(option.value) : option.value"
+                      >{{ option.label }}</a-radio>
+                    </a-radio-group>
+
+                    <a-transfer
+                      v-else-if="item.formType === 'transfer'"
+                      :title="['源数据', '目标数据']"
+                      v-model="form[item.dataIndex]"
+                      :show-search="item.showSearch"
+                      :disabled="formItemDisabled(item) || item.disabled"
+                      :readonly="formItemReadonly(item) || item.readonly"
+                      :data="formDictData[item.dataIndex]"
+                      @change="item.change && item.change($event, { form, item, currentAction, index })"
+                      @click="item.click && item.click($event, { form, item, currentAction, index })"
+                      @blur="item.blur && item.blur($event, { form, item, currentAction, index })"
+                    />
+
+                    <a-cascader
+                      v-else-if="item.formType === 'cascader'"
+                      v-model="form[item.dataIndex]"
+                      :placeholder="item.placeholder || `请选择${item.title}`"
+                      allow-clear
+                      allow-search
+                      :disabled="formItemDisabled(item) || item.disabled"
+                      :readonly="formItemReadonly(item) || item.readonly"
+                      :expand-trigger="item.trigger || 'click'"
+                      :options="formDictData[item.dataIndex]"
+                      :multiple="item.multiple"
+                      @change="item.change && item.change($event, { form, item, currentAction, index })"
+                      @click="item.click && item.click($event, { form, item, currentAction, index })"
+                      @blur="item.blur && item.blur($event, { form, item, currentAction, index })"
+                    />
+
+                    <a-tree-select
+                      v-else-if="item.formType === 'treeSelect' || item.formType === 'tree-select'"
+                      v-model="form[item.dataIndex]"
+                      :treeProps="{ virtualListProps: item.virtualList ? { height: 240 } : undefined }"
+                      :placeholder="item.placeholder || `请选择${item.title}，可通过 key 搜索`"
+                      :disabled="formItemDisabled(item) || item.disabled"
+                      :readonly="formItemReadonly(item) || item.readonly"
+                      allow-clear
+                      allow-search
+                      :field-names="(item.dict && item.dict.props) ? item.dict.props : { key: 'value', title: 'label' }"
+                      :tree-checkable="item.treeCheckable"
+                      :multiple="item.multiple"
+                      :data="formDictData[item.dataIndex]"
+                      @change="item.change && item.change($event, { form, item, currentAction, index })"
+                      @click="item.click && item.click($event, { form, item, currentAction, index })"
+                      @blur="item.blur && item.blur($event, { form, item, currentAction, index })"
+                    />
+
+                    <component
+                      v-else-if="['date', 'range', 'time'].includes(item.formType)"
+                      :is="getComponent(item)"
+                      v-model="form[item.dataIndex]"
+                      :placeholder="item.formType === 'range'
+                        ? ['请选择开始时间', '请选择结束时间']
+                        : item.placeholder ? item.placeholder : `请选择${item.title}`
+                      "
+                      :format="item.format || ''"
+                      :disabled="item.disabled"
+                      :readonly="item.readonly"
+                      :show-time="item.showTime"
+                      :type="item.type"
+                      :mode="item.mode"
+                      allow-clear
+                      style="width: 100%;"
+                      @change="item.change && item.change($event, { form, item, index })"
+                      @click="item.click && item.click($event, { form, item, index })"
+                      @blur="item.blur && item.blur($event, { form, item, index })"
+                    />
+
+                    <component
+                      v-else-if="['month', 'year', 'week', 'quarter'].includes(item.formType)"
+                      :is="getComponent(item)"
+                      v-model="form[item.dataIndex]"
+                      :placeholder="item.placeholder || `请选择${item.title}`"
+                      :format="item.format || ''"
+                      :disabled="item.disabled"
+                      :readonly="item.readonly"
+                      allow-clear
+                      style="width: 100%;"
+                      @change="item.change && item.change($event, { form, item, index })"
+                      @click="item.click && item.click($event, { form, item, index })"
+                      @blur="item.blur && item.blur($event, { form, item, index })"
+                    />
+
+                    <component
+                      v-else-if="item.formType === 'mention'"
+                      :is="getComponent(item)"
+                      v-model="form[item.dataIndex]"
+                      :placeholder="item.placeholder || `请输入${item.title}`"
+                      :disabled="formItemDisabled(item) || item.disabled"
+                      :readonly="formItemReadonly(item) || item.readonly"
+                      :split="item.split"
+                      :type="item.type"
+                      allow-clear
+                      :prefix="item.prefix"
+                      @change="item.change && item.change($event, { form, item, currentAction, index })"
+                      @click="item.click && item.click($event, { form, item, currentAction, index })"
+                      @blur="item.blur && item.blur($event, { form, item, currentAction, index })"
+                    />
+
+                    <component
+                      v-else-if="item.formType === 'component'"
+                      :is="item.dataIndex"
+                      :columns="columns"
+                      :item="item"
+                    />
+
+                    <a-button
+                      v-else-if="item.formType === 'button'"
+                      :disabled="formItemDisabled(item) || item.disabled"
+                      :type="item.type"
+                      :status="item.status"
+                      :style="item.style"
+                      @click="item.click && item.click($event, { form, item, currentAction, index })"
+                      @blur="item.blur && item.blur($event, { form, item, currentAction, index })"
+                    >
+                      <template #icon v-if="item.icon" >
+                        <component :is="item.icon" />
+                      </template>
+                      {{ item.text || ''}}
+                    </a-button>
+
+                    <component
+                      v-else
+                      :is="getComponent(item)"
+                      v-model="form[item.dataIndex]"
+                      :placeholder="item.placeholder || `请输入${item.title}`"
+                      :disabled="formItemDisabled(item) || item.disabled"
+                      :readonly="formItemReadonly(item) || item.readonly"
+                      :max-length="item.maxLength || 0"
+                      :max="item.max"
+                      :min="item.min"
+                      :step="item.step"
+                      :precision="item.precision"
+                      :checked-value="item.checkedValue"
+                      :unchecked-value="item.uncheckedValue"
+                      :show-ticks="item.showTicks"
+                      :allow-half="item.half"
+                      :type="item.type"
+                      :autocomplete="
+                        (item.formType === 'input-password' || item.type == 'password') ? 'off' : item.autocomplete
+                      "
+                      :limit="item.limit || 0"
+                      :accept="item.accept || '*'"
+                      :tip="item.tip"
+                      :multiple="item.multiple || false"
+                      :rounded="item.rounded || false"
+                      :title="item.title || '点击上传'"
+                      :icon="item.icon || 'icon-plus'"
+                      :chunk="item.chunk || false"
+                      :only-data="item?.onlyData ?? true"
+                      :return-type="item?.returnType ?? 'url'"
+                      :only-id="item?.onlyId ?? true"
+                      :file-type="item.fileType || 'button'"
+                      :show-word-limit="['input', 'textarea'].includes(item.formType) ? true : false"
+                      :is-echo="item.isEcho"
+                      :mode="item.mode"
+                      :height="item.height || undefined"
+                      :language="item.language || 'javascript'"
+                      :isBind="item.language || false"
+                      allow-clear
+                      @change="item.change && item.change($event, { form, item, currentAction, index })"
+                      @click="item.click && item.click($event, { form, item, currentAction, index })"
+                      @blur="item.blur && item.blur($event, { form, item, currentAction, index })"
+                      :style="item.style"
+                    />
+                  </template>
+
+                  <ma-form-group
+                    v-else
+                    v-model="form[item.dataIndex]"
+                    :options="item.childrenOptions"
+                    :columns="item.children"
+                    :dataIndex="item.dataIndex"
+                  >
+                    <template
+                      v-for="(groupItem, groupIndex) in item.children"
+                      :key="groupIndex"
+                      #[groupItem.dataIndex]="{ data }"
+                    >
+                      <slot
+                        :name="`${item.dataIndex}-${groupItem.dataIndex}`"
+                        v-bind="{ data, groupItem, groupIndex }"
+                      />
+                    </template>
+                  </ma-form-group>
+
+                  <template #extra v-if="item.formExtra">{{ item.formExtra }}</template>
+                </a-form-item>
+              </a-col>
+            </template>
+          </a-row>
+        </div>
       </a-form>
     </a-spin>
   </component>
 </template>
 
 <script setup>
-import { ref, nextTick, watch } from 'vue'
+import { ref, nextTick, watch, toRaw, getCurrentInstance, provide } from 'vue'
 import { request } from '@/utils/request'
 import { Message } from '@arco-design/web-vue'
 import commonApi from '@/api/common'
 import { handlerProps } from '../js/common'
-import { isArray, isFunction } from 'lodash'
+import { isArray, isFunction, concat } from 'lodash'
 import MaFormGroup from '@/components/ma-form/formGroup.vue'
 
+const app = getCurrentInstance().appContext.app
 const componentName = ref('a-modal')
 const columns = ref([])
 const currentAction = ref('')
@@ -299,6 +560,9 @@ const props = defineProps({
   modelValue: Array,
   crud: { type: Object }
 })
+
+provide('form', toRaw(form))
+
 setting.value = props.crud.viewLayoutSetting
 watch(
   () => props.crud.viewLayoutSetting,
@@ -388,6 +652,16 @@ const init = () => {
   const allowCoverFormType = ['radio', 'checkbox', 'select', 'transfer']
   const arrayDefault = ['checkbox', 'user-select', 'form-group']
   if (columns.value.length > 0) {
+    let cascaders = []
+    columns.value.map(item => {
+      if (item.cascaderItem && item.cascaderItem.length > 0) {
+        cascaders = concat(cascaders, item.cascaderItem)
+      }
+
+      if (item.formType === 'component' && item.component && !app._context.components[item.dataIndex]) {
+        app.component(item.dataIndex, item.component)
+      }
+    })
     columns.value.map(async item => {
       if (! formItemShow(item) || ['__index', '__operation'].includes(item.dataIndex)) return
       // add 默认值处理
@@ -408,8 +682,13 @@ const init = () => {
         } else if (typeof item.editDefaultValue != 'undefined') {
           form.value[item.dataIndex] = item.editDefaultValue
         }
+
+        // 针对联动数据加载回显
+        if (item.cascaderItem && item.cascaderItem.length > 0) {
+          handlerCascader(form.value[item.dataIndex], item)
+        }
       }
-      if (allowRequestFormType.includes(item.formType) && item.dict) {
+      if (allowRequestFormType.includes(item.formType) && item.dict && ! cascaders.includes(item.dataIndex)) {
         if (item.dict.name) {
           const response = await commonApi.getDict(item.dict.name)
           if (response.data) {
@@ -455,6 +734,7 @@ const handlerCascader = (val, column) => {
     dataLoading.value = true
     column.cascaderItem.map(async name => {
       const dict = columns.value.filter(col => col.dataIndex === name && col.dict )[0].dict
+      if (currentAction.value === 'add') form.value[name] = undefined
       if (dict && dict.url && dict.props) {
         let response
         if (dict && dict.url.indexOf('{{key}}') > 0) {
@@ -468,7 +748,7 @@ const handlerCascader = (val, column) => {
         if (response.data && response.code === 200) {
           formDictData.value[name] = response.data.map(dicItem => {
             return {
-              'label': dicItem[ (dict.props && dict.props.label) || 'code'  ],
+              'label': dicItem[ (dict.props && dict.props.label) || 'label'  ],
               'value': dicItem[ (dict.props && dict.props.value) || 'value' ]
             } 
           })
@@ -508,14 +788,29 @@ const formItemReadonly = (item) => {
   }
   return false
 }
+
+const toRules = (rules) => {
+
+  if (!rules) {
+    return []
+  }
+
+  if (Array.isArray(rules)) {
+    return rules.map(v => ({...v}))
+  }
+
+  return {...rules}
+}
+
 const getRules = (item) => {
   if (currentAction.value === 'add') {
-    return item.addRules ? item.addRules : item.rules || []
+    return toRules(item.addRules ? item.addRules : item.rules || [])
   }
   if (currentAction.value === 'edit') {
-    return item.editRules ? item.editRules : item.rules || []
+    return toRules(item.editRules ? item.editRules : item.rules || [])
   }
 }
+
 const getComponent = (item) => {
   if (! item.formType) {
     return `a-input`
@@ -537,4 +832,4 @@ const getComponent = (item) => {
   }
 }
 defineExpose({ add, edit })
-</script>
\ No newline at end of file
+</script>
diff --git a/src/components/ma-crud/components/search.vue b/src/components/ma-crud/components/search.vue
index d781e6390e73b75cb89b2d978d0eaf4e1072fa29..3a3c409c7a6683ed7070ff63d1a83db90568dabf 100644
--- a/src/components/ma-crud/components/search.vue
+++ b/src/components/ma-crud/components/search.vue
@@ -186,7 +186,7 @@
 <script setup>
 import { ref, reactive, watch } from 'vue'
 import { request } from '@/utils/request'
-import { isFunction, isArray, get } from 'lodash'
+import { isFunction, isArray, concat } from 'lodash'
 import { Message } from '@arco-design/web-vue'
 import commonApi from '@/api/common'
 import { handlerProps } from '../js/common'
@@ -216,13 +216,19 @@ const init = async () => {
   const allowCoverFormType = ['radio', 'checkbox', 'select', 'transfer']
   if (props.columns.length > 0) {
     isShowSearch.value = columns.value.length > 0 ? true : false
+    let cascaders = []
+    props.columns.map(item => {
+      if (item.cascaderItem && item.cascaderItem.length > 0) {
+        cascaders = concat(cascaders, item.cascaderItem)
+      }
+    })
     props.columns.map(async item => {
       if (item.search || item.dict) {
         if (item.dataIndex && item.search) {
           searchForm[item.dataIndex] = item.searchDefaultValue || undefined
         }
 
-        if (allowRequestFormType.includes(item.formType) && item.dict) {
+        if (allowRequestFormType.includes(item.formType) && item.dict && ! cascaders.includes(item.dataIndex)) {
           if (item.dict.name) {
             const response = await commonApi.getDict(item.dict.name)
             if (response.data) {
@@ -276,6 +282,7 @@ const handlerCascader = (val, column) => {
     searchLoading.value = true
     column.cascaderItem.map(async name => {
       const dict = columns.value.filter(col => col.dataIndex === name && col.dict )[0].dict
+      searchForm[name] = undefined
       if (dict && dict.url && dict.props) {
         let response
         if (dict && dict.url.indexOf('{{key}}') > 0) {
@@ -289,7 +296,7 @@ const handlerCascader = (val, column) => {
         if (response.data && response.code === 200) {
           formDictData.value[name] = response.data.map(dicItem => {
             return {
-              'label': dicItem[ (dict.props && dict.props.label) || 'code'  ],
+              'label': dicItem[ (dict.props && dict.props.label) || 'label'  ],
               'value': dicItem[ (dict.props && dict.props.value) || 'value' ]
             } 
           })
diff --git a/src/components/ma-crud/index.vue b/src/components/ma-crud/index.vue
index 3a44199718eeebf0bd9877b7b8ed8c0a051a380f..f1fe832101c5f8bc0e77f1c2a8135cbbfc5227c5 100644
--- a/src/components/ma-crud/index.vue
+++ b/src/components/ma-crud/index.vue
@@ -157,6 +157,7 @@
                 :isRecovery="isRecovery"
                 :params="requestParams"
                 @refresh="() => refresh()"
+                @showImage="showImage"
               >
                 <template #operationBeforeExtend="{ record, column, rowIndex }">
                   <slot name="operationBeforeExtend" v-bind="{ record, column, rowIndex }"></slot>
@@ -217,6 +218,7 @@
       v-model="defaultCrud.import"
     />
 
+    <a-image-preview :src="imgUrl" v-model:visible="imgVisible" />
   </a-layout-content>
 </template>
 
@@ -240,6 +242,8 @@ import _ from 'lodash'
 const loading = ref(true)
 const reloadColumn = ref(true)
 const openPagination = ref(false)
+const imgVisible = ref(false)
+const imgUrl = ref('not-image.png')
 const pageSizeOption = ref([10, 20, 30, 50, 100])
 const total = ref(0)
 const requestParams = ref({})
@@ -280,6 +284,8 @@ const defaultCrud = ref({
   hideExpandButtonOnEmpty: true,
   // 默认展开所有行
   expandAllRows: false,
+  // 默认展开搜索
+  expandSearch: true,
   // 斑马线
   stripe: true,
   // 新增、编辑、删除完成后是否刷新表格
@@ -302,6 +308,8 @@ const defaultCrud = ref({
   stickyHeader: true,
   // 页面布局方式，支持 normal（标准）和 fixed（固定）两种
   pageLayout: 'normal',
+  // 默认统一设置列宽度
+  columnWidth: 100,
   // 新增和编辑显示设置
   viewLayoutSetting: {
     // 布局方式, 支持 auto（自动） 和 customer（自定义）两种
@@ -457,10 +465,6 @@ watch(() => settingProps.crud.requestParams, (val) => {
   requestParams.value = val
 }, { deep: true })
 
-watch(() => settingProps.columns, () => {
-  requestData()
-}, { deep: true })
-
 watch(() => settingProps.api, () => {
   requestData()
 }, { deep: true })
@@ -478,6 +482,11 @@ const getSlot = (cls = []) => {
   return sls
 }
 
+const showImage = url => {
+  imgUrl.value = url
+  imgVisible.value = true
+}
+
 const getSearchSlot = () => {
   let sls = []
   settingProps.columns.map(item => {
@@ -494,13 +503,16 @@ searchSlots.value = getSearchSlot(settingProps.columns)
 const requestData = async () => {
   defaultCrud.value = Object.assign(defaultCrud.value, settingProps.crud)
   columns.value = Object.assign(settingProps.columns, {})
+  columns.value.map(item => {
+    !item.width && (item.width = defaultCrud.value.columnWidth)
+  })
   if (defaultCrud.value.showIndex && columns.value.length > 0 && columns.value[0].dataIndex !== '__index') {
     columns.value.unshift({ title: defaultCrud.value.indexLabel, dataIndex: '__index', width: 70, fixed: 'left' })
   }
   if (defaultCrud.value.operationColumn && columns.value.length > 0 && columns.value[columns.value.length - 1].dataIndex !== '__operation') {
     columns.value.push({ title: defaultCrud.value.operationColumnText, dataIndex: '__operation', width: defaultCrud.value.operationWidth, align: 'right', fixed: 'right' })
   }
-  showSearch.value = true
+  showSearch.value = !defaultCrud.value.expandSearch
   initRequestParams()
   await refresh()
 }
@@ -797,6 +809,7 @@ if (typeof settingProps.crud.autoRequest == 'undefined' || settingProps.crud.aut
 
 onMounted(() => {
   document.querySelector('.arco-table-body').className += ' customer-scrollbar'
+  toggleSearch()
 })
 
 const settingFixedPage = (openPage = false) => {
@@ -816,7 +829,7 @@ defineExpose({
 
 <style scoped lang="less">
 .__search-panel {
-  transition: display 1s; overflow: hidden;
+  transition: display 1s; overflow: hidden; width: 100%;
 }
 ._crud-footer {
   z-index: 10;
diff --git a/src/components/ma-crud/js/common.js b/src/components/ma-crud/js/common.js
index 8e892a044377b1bad3d5d938f17c8c38a549db8a..8f27993b11b21c3ec263b5785f77df58291907bc 100644
--- a/src/components/ma-crud/js/common.js
+++ b/src/components/ma-crud/js/common.js
@@ -5,7 +5,7 @@ export const handlerProps = (allowType, item, tmpArr) => {
   if (allowType.includes(item.formType)) {
     data = tmpArr.map(dicItem => {
       const label = dicItem[ (item.dict.props && item.dict.props.label) || 'label'  ]
-      let tmp = dicItem[ (item.dict.props && item.dict.props.value) || 'code' ]
+      let tmp = dicItem[ (item.dict.props && item.dict.props.value) || 'value' ]
       const value = typeof tmp == 'boolean' ? tmp + '' : tmp
       colors[value] = item.dict.tagColors && item.dict.tagColors[value] || undefined
       tran[value] = label
diff --git a/src/components/ma-editor/index.vue b/src/components/ma-editor/index.vue
index 202a667db2ece1354642a5ac64d6fb0d0147a698..d0f0740cfb0153719d97b00321ef95327e8823b0 100644
--- a/src/components/ma-editor/index.vue
+++ b/src/components/ma-editor/index.vue
@@ -104,6 +104,7 @@
     plugins: props.plugins,
     toolbar: props.toolbar,
     branding: false,
+    content_css: '/tinymce/skins/content/default/content.css',
     setup: (editor) => {
       editor.on('init', () => {
         editor.getBody().style.fontSize = '14px';
diff --git a/src/components/ma-form/formGroup.vue b/src/components/ma-form/formGroup.vue
index 9828564cefa1263e48486320c91c23d46461d2d7..cae849d6ef93ccb11b62e81c93d697b6ad515c02 100644
--- a/src/components/ma-form/formGroup.vue
+++ b/src/components/ma-form/formGroup.vue
@@ -18,14 +18,232 @@
           <icon-stop /> 清空
         </a-button>
       </a-space>
-      <a-card v-for="(data, index) in form.datas" :key="index"
-        :class="`mt-3 grid grid-cols-1 lg:grid-cols-${(!props.options.layout || props.options.layout === 'auto') ? (props.options.cols || 1) : 1} `">
+      <a-card v-for="(data, index) in form[props.dataIndex]" :key="index"
+        :class="`mt-3 grid grid-cols-1 lg:grid-cols-${ (props.options.layout === 'auto') ? ( props.options?.cols ?? 1 ) : 1}`">
         <a-space class="mb-2">
           <a-button status="danger" size="small" @click="deleteCurrent(index)">
-            <icon-close /> 删除
+            <icon-close /> 删除   
           </a-button>
         </a-space>
-        <a-row>
+        <template v-if="props.options.layout === 'auto'">
+          <template v-for="(item, idx) in rows[index]" :key="idx">
+            <a-form-item
+              v-show="formItemShow"
+              :label="item.title"
+              :field="`${props.dataIndex}.${index}.${item.dataIndex}`"
+              label-col-flex="auto"
+              :label-col-style="{ width: item.labelWidth ? item.labelWidth : props.options.labelWidth || '100px' }"
+              :rules="item.rules || []"
+              :validate-trigger="item.validateTrigger"
+              :validate-status="item.validateStatus"
+            >
+              <slot :name="`${item.dataIndex}`" v-bind="{ data, item }">
+                <a-select
+                  v-if="item.formType === 'select'"
+                  v-model="data[item.dataIndex]"
+                  :virtual-list-props="item.virtualList ? { height: 200 } : undefined"
+                  :placeholder="item.placeholder || `请选择${item.title}`"
+                  allow-clear
+                  allow-search
+                  :max-tag-count="item.maxTagCount || 1"
+                  :disabled="item.disabled"
+                  :readonly="item.readonly"
+                  :options="formDictData[item.dataIndex]"
+                  :multiple="item.multiple"
+                  @change="handlerCascader($event, item)"
+                />
+
+                <a-checkbox-group
+                  v-else-if="item.formType === 'checkbox'"
+                  v-model="data[item.dataIndex]"
+                  :disabled="item.disabled"
+                  :readonly="item.readonly"
+                  @change="handlerCascader($event, item)"
+                >
+                  <a-checkbox
+                    v-for="option in formDictData[item.dataIndex]"
+                    :key="option" :value="Number.isInteger(data[item.dataIndex]) ? parseInt(option.value) : option.value"
+                  >{{ option.label }}</a-checkbox>
+                </a-checkbox-group>
+
+                <a-radio-group
+                  v-else-if="item.formType === 'radio'"
+                  v-model="data[item.dataIndex]"
+                  :disabled="item.disabled"
+                  :readonly="item.readonly"
+                  :type="item.type"
+                  @change="handlerCascader($event, item)"
+                >
+                  <a-radio
+                    v-for="option in formDictData[item.dataIndex]"
+                    :key="option" :value="Number.isInteger(data[item.dataIndex]) ? parseInt(option.value) : option.value"
+                  >{{ option.label }}</a-radio>
+                </a-radio-group>
+
+                <a-transfer
+                  v-else-if="item.formType === 'transfer'"
+                  :title="['源数据', '目标数据']"
+                  v-model="data[item.dataIndex]"
+                  :show-search="item.showSearch"
+                  :disabled="item.disabled"
+                  :readonly="item.readonly"
+                  :data="formDictData[item.dataIndex]"
+                  @change="item.change && item.change($event, { data, item, index })"
+                  @click="item.click && item.click($event, { data, item, index })"
+                  @blur="item.blur && item.blur($event, { data, item, index })"
+                />
+
+                <a-cascader
+                  v-else-if="item.formType === 'cascader'"
+                  v-model="data[item.dataIndex]"
+                  :placeholder="item.placeholder || `请选择${item.title}`"
+                  allow-clear
+                  allow-search
+                  :disabled="item.disabled"
+                  :readonly="item.readonly"
+                  :expand-trigger="item.trigger || 'click'"
+                  :options="formDictData[item.dataIndex]"
+                  :multiple="item.multiple"
+                  @change="item.change && item.change($event, { data, item, index })"
+                  @click="item.click && item.click($event, { data, item, index })"
+                  @blur="item.blur && item.blur($event, { data, item, index })"
+                />
+
+                <a-tree-select
+                  v-else-if="item.formType === 'treeSelect' || item.formType === 'tree-select'"
+                  v-model="data[item.dataIndex]"
+                  :treeProps="{ virtualListProps: item.virtualList ? { height: 240 } : undefined }"
+                  :placeholder="item.placeholder || `请选择${item.title}，可通过 key 搜索`"
+                  :disabled="item.disabled"
+                  :readonly="item.readonly"
+                  allow-clear
+                  allow-search
+                  :field-names="(item.dict && item.dict.props) ? item.dict.props : { key: 'value', title: 'label' }"
+                  :tree-checkable="item.multiple"
+                  :multiple="item.multiple"
+                  :data="formDictData[item.dataIndex]"
+                  @change="item.change && item.change($event, { data, item, index })"
+                  @click="item.click && item.click($event, { data, item, index })"
+                  @blur="item.blur && item.blur($event, { data, item, index })"
+                />
+
+                <component
+                  v-else-if="['date', 'range', 'time'].includes(item.formType)"
+                  :is="getComponent(item)"
+                  v-model="form[item.dataIndex]"
+                  :placeholder="item.formType === 'range'
+                    ? ['请选择开始时间', '请选择结束时间']
+                    : item.placeholder ? item.placeholder : `请选择${item.title}`
+                  "
+                  :format="item.format || ''"
+                  :disabled="item.disabled"
+                  :readonly="item.readonly"
+                  :show-time="item.showTime"
+                  :type="item.type"
+                  :mode="item.mode"
+                  allow-clear
+                  style="width: 100%;"
+                  @change="item.change && item.change($event, { form, item, index })"
+                  @click="item.click && item.click($event, { form, item, index })"
+                  @blur="item.blur && item.blur($event, { form, item, index })"
+                />
+
+                <component
+                  v-else-if="['month', 'year', 'week', 'quarter'].includes(item.formType)"
+                  :is="getComponent(item)"
+                  v-model="form[item.dataIndex]"
+                  :placeholder="item.placeholder || `请选择${item.title}`"
+                  :format="item.format || ''"
+                  :disabled="item.disabled"
+                  :readonly="item.readonly"
+                  allow-clear
+                  style="width: 100%;"
+                  @change="item.change && item.change($event, { form, item, index })"
+                  @click="item.click && item.click($event, { form, item, index })"
+                  @blur="item.blur && item.blur($event, { form, item, index })"
+                />
+
+                <component
+                  v-else-if="item.formType === 'mention'"
+                  :is="getComponent(item)"
+                  v-model="data[item.dataIndex]"
+                  :placeholder="item.placeholder || `请输入${item.title}`"
+                  :disabled="item.disabled"
+                  :readonly="item.readonly"
+                  :split="item.split"
+                  :type="item.type"
+                  allow-clear
+                  :prefix="item.prefix"
+                  @change="item.change && item.change($event, { data, item, index })"
+                  @click="item.click && item.click($event, { data, item, index })"
+                  @blur="item.blur && item.blur($event, { data, item, index })"
+                />
+
+                <a-button
+                  v-else-if="item.formType === 'button'"
+                  :disabled="item.disabled"
+                  :type="item.type"
+                  :status="item.status"
+                  :style="item.style"
+                  @click="item.click && item.click($event, { data, item, index })"
+                  @blur="item.blur && item.blur($event, { data, item, index })"
+                >
+                  <template #icon v-if="item.icon" >
+                    <component :is="item.icon" />
+                  </template>
+                  {{ item.text || ''}}
+                </a-button>
+
+                <component
+                  v-else
+                  :is="getComponent(item)"
+                  v-model="data[item.dataIndex]"
+                  :placeholder="item.placeholder || `请输入${item.title}`"
+                  :disabled="item.disabled"
+                  :readonly="item.readonly"
+                  :max-length="item.maxLength || 0"
+                  :max="item.max"
+                  :min="item.min"
+                  :step="item.step"
+                  :precision="item.precision"
+                  :checked-value="item.checkedValue"
+                  :unchecked-value="item.uncheckedValue"
+                  :show-ticks="item.showTicks"
+                  :allow-half="item.half"
+                  :type="item.type"
+                  :autocomplete="
+                    (item.formType === 'input-password' || item.type == 'password') ? 'off' : item.autocomplete
+                  "
+                  :limit="item.limit || 0"
+                  :accept="item.accept || '*'"
+                  :tip="item.tip"
+                  :multiple="item.multiple || false"
+                  :rounded="item.rounded || false"
+                  :title="item.title || '点击上传'"
+                  :icon="item.icon || 'icon-plus'"
+                  :chunk="item.chunk || false"
+                  :only-data="item?.onlyData ?? true"
+                  :return-type="item?.returnType ?? 'url'"
+                  :only-id="item?.onlyId ?? true"
+                  :file-type="item.fileType || 'button'"
+                  :show-word-limit="['input', 'textarea'].includes(item.formType) ? true : false"
+                  :is-echo="item.isEcho"
+                  :mode="item.mode"
+                  :height="item.height || undefined"
+                  :language="item.language || 'javascript'"
+                  :isBind="item.language || false"
+                  allow-clear
+                  @change="item.change && item.change($event, { data, item, index })"
+                  @click="item.click && item.click($event, { data, item, index })"
+                  @blur="item.blur && item.blur($event, { data, item, index })"
+                  :style="item.style"
+                />
+              </slot>
+              <template #extra v-if="item.formExtra">{{ item.formExtra }}</template>
+            </a-form-item>
+          </template>
+        </template>
+        <a-row v-else :gutter="props.options?.gutter ?? 24">
           <template v-for="(item, idx) in rows[index]" :key="idx">
             <a-col :span="parseInt(props.options.layout === 'customer' ? (item.span || 24) : 24)">
               <a-form-item
@@ -51,7 +269,7 @@
                     :readonly="item.readonly"
                     :options="formDictData[item.dataIndex]"
                     :multiple="item.multiple"
-                    @change="handlerCascader($event, { data, item, index })"
+                    @change="handlerCascader($event, item)"
                   />
 
                   <a-checkbox-group
@@ -59,7 +277,7 @@
                     v-model="data[item.dataIndex]"
                     :disabled="item.disabled"
                     :readonly="item.readonly"
-                    @change="handlerCascader($event, { data, item, index })"
+                    @change="handlerCascader($event, item)"
                   >
                     <a-checkbox
                       v-for="option in formDictData[item.dataIndex]"
@@ -73,7 +291,7 @@
                     :disabled="item.disabled"
                     :readonly="item.readonly"
                     :type="item.type"
-                    @change="handlerCascader($event, { data, item, index })"
+                    @change="handlerCascader($event, item)"
                   >
                     <a-radio
                       v-for="option in formDictData[item.dataIndex]"
@@ -223,12 +441,13 @@
                     :title="item.title || '点击上传'"
                     :icon="item.icon || 'icon-plus'"
                     :chunk="item.chunk || false"
-                    :only-url="item?.onlyUrl ?? true"
+                    :only-data="item?.onlyData ?? true"
+                    :return-type="item?.returnType ?? 'url'"
                     :only-id="item?.onlyId ?? true"
                     :file-type="item.fileType || 'button'"
                     :show-word-limit="['input', 'textarea'].includes(item.formType) ? true : false"
                     :is-echo="item.isEcho"
-                    :mode="item.formType === 'input-number' ? 'button' : item.mode"
+                    :mode="item.mode"
                     :height="item.height || undefined"
                     :language="item.language || 'javascript'"
                     :isBind="item.language || false"
@@ -252,21 +471,23 @@
 <script setup>
 import { reactive, ref, watch } from 'vue'
 import { request } from '@/utils/request'
-import { isFunction } from 'lodash'
+import { isFunction, concat } from 'lodash'
 import commonApi from '@/api/common'
 
 const loading = ref(true)
-const form = reactive({ datas: [] })
+const form = reactive({})
 const rows = ref([])
 const formDictData = ref({})
 
 const props = defineProps({
   modelValue: { type: Object },
   options: { type: Object, default: { layout: 'auto' } },
-  columns: { type: Array }
+  columns: { type: Array },
+  dataIndex: { type: String, default: 'datas' },
 })
 
 const emit = defineEmits(['update:modelValue'])
+form[props.dataIndex] = []
 
 watch(
   () => props.modelValue,
@@ -274,7 +495,7 @@ watch(
 )
 
 watch(
-  () => form.datas,
+  () => form[props.dataIndex],
   vl => emit('update:modelValue', vl),
   { deep: true }
 )
@@ -290,19 +511,19 @@ const add = () => {
   }
   rows.value.push(props.columns)
   props.columns.map(item => tmp[item.dataIndex] = undefined)
-  form.datas.push(tmp)
+  form[props.dataIndex].push(tmp)
 }
 
 const deleteCurrent = (index) => {
   if (props.deleteRow && isFunction(props.deleteRow)) {
     props.deleteRow()
   }
-  form.datas.splice(index, 1)
+  form[props.dataIndex].splice(index, 1)
   rows.value.splice(index, 1)
 }
 
 const flush = () => {
-  form.datas = []
+  form[props.dataIndex] = []
   rows.value = []
 }
 
@@ -312,12 +533,19 @@ const init = () => {
   loading.value = true
   const allowRequestFormType = ['radio', 'checkbox', 'select', 'transfer', 'treeSelect', 'tree-select', 'cascader']
   const allowCoverFormType = ['radio', 'checkbox', 'select', 'transfer']
-  const arrayDefault = ['checkbox', 'user-select']
+
   if (props.columns.length > 0) {
+    let cascaders = []
+    props.columns.map(item => {
+      if (item.cascaderItem && item.cascaderItem.length > 0) {
+        cascaders = concat(cascaders, item.cascaderItem)
+      }
+    })
+
     props.columns.map(async item => {
       if (! formItemShow(item)) return
       
-      if (allowRequestFormType.includes(item.formType) && item.dict) {
+      if (allowRequestFormType.includes(item.formType) && item.dict && ! cascaders.includes(item.dataIndex)) {
         if (item.dict.name) {
           const response = await commonApi.getDict(item.dict.name)
           if (response.data) {
@@ -348,7 +576,7 @@ const handlerProps = (allowType, item, tmpArr) => {
   if (allowType.includes(item.formType)) {
     data = tmpArr.map(dicItem => {
       const label = dicItem[ (item.dict.props && item.dict.props.label) || 'label'  ]
-      let tmp = dicItem[ (item.dict.props && item.dict.props.value) || 'code' ]
+      let tmp = dicItem[ (item.dict.props && item.dict.props.value) || 'value' ]
       const value = typeof tmp == 'boolean' ? tmp + '' : tmp
       tran[value] = label
       return { label, value } 
@@ -378,7 +606,7 @@ const handlerCascader = (val, column) => {
         if (response.data && response.code === 200) {
           formDictData.value[name] = response.data.map(dicItem => {
             return {
-              'label': dicItem[ (dict.props && dict.props.label) || 'code'  ],
+              'label': dicItem[ (dict.props && dict.props.label) || 'label'  ],
               'value': dicItem[ (dict.props && dict.props.value) || 'value' ]
             } 
           })
diff --git a/src/components/ma-form/index.vue b/src/components/ma-form/index.vue
index a5b007a3306dd22f6773378a4bf1275a13379b9d..7e5bfd52f2feeab77c6009154f037451a9c9bea8 100644
--- a/src/components/ma-form/index.vue
+++ b/src/components/ma-form/index.vue
@@ -12,14 +12,14 @@
     <a-spin :loading="formLoading" tip="加载中..." class="w-full">
       <a-form
         ref="formRef"
+        v-bind="$attrs"
         :model="form"
-        :class="`grid grid-cols-1 lg:grid-cols-${ (props.options.layout ||  props.options.layout === 'auto') ? ( props.options.cols || 1 ) : 1}`"
-        :label-align="props.options.labelAlign || 'right'"
+        :label-align="props.options?.labelAlign ?? 'right'"
         @submit="submit"
       >
-        <a-row>
-          <template v-for="(item, index) in columns" :key="index">
-            <a-col :span="parseInt(props.options.layout === 'customer' ? ( item.span || 24 ) : 24)">
+        <div :class="`grid grid-cols-1 lg:grid-cols-${ (props.options.layout === 'auto') ? ( props.options?.cols ?? 1 ) : 1}`">
+          <template v-if="props.options.layout === 'auto'">
+            <template v-for="(item, index) in columns" :key="index">
               <a-form-item
                 v-show="(typeof item.display == 'undefined' || item.display === true)"
                 :label="item.title"
@@ -47,7 +47,7 @@
                     :readonly="item.readonly"
                     :options="formDictData[item.dataIndex]"
                     :multiple="item.multiple"
-                    @change="handlerCascader($event, { form, item, index })"
+                    @change="handlerCascader($event, item)"
                   />
 
                   <a-checkbox-group
@@ -55,7 +55,7 @@
                     v-model="form[item.dataIndex]"
                     :disabled="item.disabled"
                     :readonly="item.readonly"
-                    @change="handlerCascader($event, { form, item, index })"
+                    @change="handlerCascader($event, item)"
                   >
                     <a-checkbox
                       v-for="option in formDictData[item.dataIndex]"
@@ -69,7 +69,7 @@
                     :disabled="item.disabled"
                     :readonly="item.readonly"
                     :type="item.type"
-                    @change="handlerCascader($event, { form, item, index })"
+                    @change="handlerCascader($event, item)"
                   >
                     <a-radio
                       v-for="option in formDictData[item.dataIndex]"
@@ -176,6 +176,13 @@
                     @blur="item.blur && item.blur($event, { form, item, index })"
                   />
 
+                  <component
+                    v-else-if="item.formType === 'component'"
+                    :is="item.dataIndex"
+                    :columns="columns"
+                    :item="item"
+                  />
+
                   <component
                     v-else
                     :is="getComponent(item)"
@@ -204,12 +211,13 @@
                     :title="item.title || '点击上传'"
                     :icon="item.icon || 'icon-plus'"
                     :chunk="item.chunk || false"
-                    :only-url="item?.onlyUrl ?? true"
+                    :only-data="item?.onlyData ?? true"
+                    :return-type="item?.returnType ?? 'url'"
                     :only-id="item?.onlyId ?? true"
                     :file-type="item.fileType || 'button'"
                     :show-word-limit="['input', 'textarea'].includes(item.formType) ? true : false"
                     :is-echo="item.isEcho"
-                    :mode="item.formType === 'input-number' ? 'button' : item.mode"
+                    :mode="item.mode"
                     :height="item.height || undefined"
                     :language="item.language || 'javascript'"
                     :isBind="item.language || false"
@@ -226,6 +234,7 @@
                   v-model="form[item.dataIndex]"
                   :options="item.childrenOptions"
                   :columns="item.children"
+                  :dataIndex="item.dataIndex"
                 >
                   <template
                     v-for="(groupItem, groupIndex) in item.children"
@@ -240,10 +249,245 @@
                 </ma-form-group>
                 <template #extra v-if="item.formExtra">{{ item.formExtra }}</template>
               </a-form-item>
-            </a-col>
+            </template>
           </template>
-        </a-row>
-        <div class="text-center mt-5" v-if="props.options.showButtons">
+          <a-row v-else :gutter="props.options?.gutter ?? 24">
+            <template v-for="(item, index) in columns" :key="index">
+              <a-col :span="parseInt(props.options.layout === 'customer' ? ( item.span || 24 ) : 24)">
+                <a-form-item
+                  v-show="(typeof item.display == 'undefined' || item.display === true)"
+                  :label="item.title"
+                  :field="item.dataIndex"
+                  label-col-flex="auto"
+                  :label-col-style="{ width: item.labelWidth ? item.labelWidth : props.options.labelWidth || '100px' }"
+                  :rules="item.rules || []"
+                  :validate-trigger="item.validateTrigger"
+                  :validate-status="item.validateStatus"
+                >
+                  <slot
+                    :name="`form-${item.dataIndex}`"
+                    v-bind="{ form, item }"
+                    v-if="item.formType !== 'form-group'"
+                  >
+                    <a-select
+                      v-if="item.formType === 'select'"
+                      v-model="form[item.dataIndex]"
+                      :virtual-list-props="item.virtualList ? { height: 200 } : undefined"
+                      :placeholder="item.placeholder || `请选择${item.title}`"
+                      allow-clear
+                      allow-search
+                      :max-tag-count="item.maxTagCount || 1"
+                      :disabled="item.disabled"
+                      :readonly="item.readonly"
+                      :options="formDictData[item.dataIndex]"
+                      :multiple="item.multiple"
+                      @change="handlerCascader($event, item)"
+                    />
+
+                    <a-checkbox-group
+                      v-else-if="item.formType === 'checkbox'"
+                      v-model="form[item.dataIndex]"
+                      :disabled="item.disabled"
+                      :readonly="item.readonly"
+                      @change="handlerCascader($event, item)"
+                    >
+                      <a-checkbox
+                        v-for="option in formDictData[item.dataIndex]"
+                        :key="option" :value="Number.isInteger(form[item.dataIndex]) ? parseInt(option.value) : option.value"
+                      >{{ option.label }}</a-checkbox>
+                    </a-checkbox-group>
+
+                    <a-radio-group
+                      v-else-if="item.formType === 'radio'"
+                      v-model="form[item.dataIndex]"
+                      :disabled="item.disabled"
+                      :readonly="item.readonly"
+                      :type="item.type"
+                      @change="handlerCascader($event, item)"
+                    >
+                      <a-radio
+                        v-for="option in formDictData[item.dataIndex]"
+                        :key="option" :value="Number.isInteger(form[item.dataIndex]) ? parseInt(option.value) : option.value"
+                      >{{ option.label }}</a-radio>
+                    </a-radio-group>
+
+                    <a-transfer
+                      v-else-if="item.formType === 'transfer'"
+                      :title="['源数据', '目标数据']"
+                      v-model="form[item.dataIndex]"
+                      :show-search="item.showSearch"
+                      :disabled="item.disabled"
+                      :readonly="item.readonly"
+                      :data="formDictData[item.dataIndex]"
+                      @change="item.change && item.change($event, { form, item, index })"
+                      @click="item.click && item.click($event, { form, item, index })"
+                      @blur="item.blur && item.blur($event, { form, item, index })"
+                    />
+
+                    <a-cascader
+                      v-else-if="item.formType === 'cascader'"
+                      v-model="form[item.dataIndex]"
+                      :placeholder="item.placeholder || `请选择${item.title}`"
+                      allow-clear
+                      allow-search
+                      :disabled="item.disabled"
+                      :readonly="item.readonly"
+                      :expand-trigger="item.trigger || 'click'"
+                      :options="formDictData[item.dataIndex]"
+                      :multiple="item.multiple"
+                      @change="item.change && item.change($event, { form, item, index })"
+                      @click="item.click && item.click($event, { form, item, index })"
+                      @blur="item.blur && item.blur($event, { form, item, index })"
+                    />
+
+                    <a-tree-select
+                      v-else-if="item.formType === 'treeSelect' || item.formType === 'tree-select'"
+                      v-model="form[item.dataIndex]"
+                      :treeProps="{ virtualListProps: item.virtualList ? { height: 240 } : undefined }"
+                      :placeholder="item.placeholder || `请选择${item.title}，可通过 key 搜索`"
+                      :disabled="item.disabled"
+                      :readonly="item.readonly"
+                      allow-clear
+                      allow-search
+                      :field-names="(item.dict && item.dict.props) ? item.dict.props : { key: 'value', title: 'label' }"
+                      :tree-checkable="item.multiple"
+                      :multiple="item.multiple"
+                      :data="formDictData[item.dataIndex]"
+                      @change="item.change && item.change($event, { form, item, index })"
+                      @click="item.click && item.click($event, { form, item, index })"
+                      @blur="item.blur && item.blur($event, { form, item, index })"
+                    />
+
+                    <component
+                      v-else-if="['date', 'range', 'time'].includes(item.formType)"
+                      :is="getComponent(item)"
+                      v-model="form[item.dataIndex]"
+                      :placeholder="item.formType === 'range'
+                        ? ['请选择开始时间', '请选择结束时间']
+                        : item.placeholder ? item.placeholder : `请选择${item.title}`
+                      "
+                      :format="item.format || ''"
+                      :disabled="item.disabled"
+                      :readonly="item.readonly"
+                      :show-time="item.showTime"
+                      :type="item.type"
+                      :mode="item.mode"
+                      allow-clear
+                      style="width: 100%;"
+                      @change="item.change && item.change($event, { form, item, index })"
+                      @click="item.click && item.click($event, { form, item, index })"
+                      @blur="item.blur && item.blur($event, { form, item, index })"
+                    />
+
+                    <component
+                      v-else-if="['month', 'year', 'week', 'quarter'].includes(item.formType)"
+                      :is="getComponent(item)"
+                      v-model="form[item.dataIndex]"
+                      :placeholder="item.placeholder || `请选择${item.title}`"
+                      :format="item.format || ''"
+                      :disabled="item.disabled"
+                      :readonly="item.readonly"
+                      allow-clear
+                      style="width: 100%;"
+                      @change="item.change && item.change($event, { form, item, index })"
+                      @click="item.click && item.click($event, { form, item, index })"
+                      @blur="item.blur && item.blur($event, { form, item, index })"
+                    />
+
+                    <component
+                      v-else-if="item.formType === 'mention'"
+                      :is="getComponent(item)"
+                      v-model="form[item.dataIndex]"
+                      :placeholder="item.placeholder || `请输入${item.title}`"
+                      :disabled="item.disabled"
+                      :readonly="item.readonly"
+                      :split="item.split"
+                      :type="item.type"
+                      allow-clear
+                      :prefix="item.prefix"
+                      @change="item.change && item.change($event, { form, item, index })"
+                      @click="item.click && item.click($event, { form, item, index })"
+                      @blur="item.blur && item.blur($event, { form, item, index })"
+                    />
+
+                    <component
+                      v-else-if="item.formType === 'component'"
+                      :is="item.dataIndex"
+                      :columns="columns"
+                      :item="item"
+                    />
+
+                    <component
+                      v-else
+                      :is="getComponent(item)"
+                      v-model="form[item.dataIndex]"
+                      :placeholder="item.placeholder || `请输入${item.title}`"
+                      :disabled="item.disabled"
+                      :readonly="item.readonly"
+                      :max-length="item.maxLength || 0"
+                      :max="item.max"
+                      :min="item.min"
+                      :step="item.step"
+                      :precision="item.precision"
+                      :checked-value="item.checkedValue"
+                      :unchecked-value="item.uncheckedValue"
+                      :show-ticks="item.showTicks"
+                      :allow-half="item.half"
+                      :type="item.type"
+                      :autocomplete="
+                        (item.formType === 'input-password' || item.type == 'password') ? 'off' : item.autocomplete
+                      "
+                      :limit="item.limit || 0"
+                      :accept="item.accept || '*'"
+                      :tip="item.tip"
+                      :multiple="item.multiple || false"
+                      :rounded="item.rounded || false"
+                      :title="item.title || '点击上传'"
+                      :icon="item.icon || 'icon-plus'"
+                      :chunk="item.chunk || false"
+                      :only-data="item?.onlyData ?? true"
+                      :return-type="item?.returnType ?? 'url'"
+                      :only-id="item?.onlyId ?? true"
+                      :file-type="item.fileType || 'button'"
+                      :show-word-limit="['input', 'textarea'].includes(item.formType) ? true : false"
+                      :is-echo="item.isEcho"
+                      :mode="item.mode"
+                      :height="item.height || undefined"
+                      :language="item.language || 'javascript'"
+                      :isBind="item.language || false"
+                      allow-clear
+                      @change="item.change && item.change($event, { form, item, index })"
+                      @click="item.click && item.click($event, { form, item, index })"
+                      @blur="item.blur && item.blur($event, { form, item, index })"
+                      :style="item.style"
+                    />
+                  </slot>
+
+                  <ma-form-group
+                    v-else
+                    v-model="form[item.dataIndex]"
+                    :options="item.childrenOptions"
+                    :columns="item.children"
+                    :dataIndex="item.dataIndex"
+                  >
+                    <template
+                      v-for="(groupItem, groupIndex) in item.children"
+                      :key="groupIndex"
+                      #[groupItem.dataIndex]="{ data }"
+                    >
+                      <slot
+                        :name="`${item.dataIndex}-${groupItem.dataIndex}`"
+                        v-bind="{ data, groupItem, groupIndex }"
+                      />
+                    </template>
+                  </ma-form-group>
+                  <template #extra v-if="item.formExtra">{{ item.formExtra }}</template>
+                </a-form-item>
+              </a-col>
+            </template>
+          </a-row>
+        </div>
+        <div class="text-center mt-5" v-if="props.options?.showButtons ?? true">
           <a-space size="large">
             <a-button html-type="submit" type="primary">
               <icon-check /> {{ props.options.submitText || '提交' }}
@@ -260,14 +504,15 @@
 </template>
 
 <script setup>
-import { ref, watch } from 'vue'
+import { ref, watch, getCurrentInstance, provide } from 'vue'
 import { request } from '@/utils/request'
 import { Message } from '@arco-design/web-vue'
 import commonApi from '@/api/common'
-import { isArray, isFunction } from 'lodash'
+import { isArray, isFunction, concat } from 'lodash'
 
 import MaFormGroup from './formGroup.vue'
 
+const app = getCurrentInstance().appContext.app
 const columns = ref([])
 const form = ref({})
 const formRef = ref(null)
@@ -289,6 +534,8 @@ const props = defineProps({
   },
 })
 
+provide('form', form)
+
 columns.value = props.columns
 form.value = props.modelValue
 
@@ -351,6 +598,17 @@ const init = () => {
   const allowCoverFormType = ['radio', 'checkbox', 'select', 'transfer']
   const arrayDefault = ['checkbox', 'user-select', 'form-group']
   if (columns.value && columns.value.length > 0) {
+    let cascaders = []
+    columns.value.map(item => {
+      if (item.cascaderItem && item.cascaderItem.length > 0) {
+        cascaders = concat(cascaders, item.cascaderItem)
+      }
+
+      if (item.formType === 'component' && item.component && !app._context.components[item.dataIndex]) {
+        app.component(item.dataIndex, item.component)
+      }
+    })
+
     columns.value.map(async item => {
 
       if (! form.value[item.dataIndex] && typeof form.value[item.dataIndex] == 'undefined') {
@@ -359,8 +617,13 @@ const init = () => {
           form.value[item.dataIndex] = []
         }
       }
+
+      // 针对联动数据加载回显
+      if (item.cascaderItem && item.cascaderItem.length > 0) {
+        handlerCascader(form.value[item.dataIndex], item)
+      }
       
-      if (allowRequestFormType.includes(item.formType) && item.dict) {
+      if (allowRequestFormType.includes(item.formType) && item.dict && ! cascaders.includes(item.dataIndex)) {
         if (item.dict.name) {
           const response = await commonApi.getDict(item.dict.name)
           if (response.data) {
@@ -408,7 +671,7 @@ const handlerProps = (allowType, item, tmpArr) => {
   if (allowType.includes(item.formType)) {
     data = tmpArr.map(dicItem => {
       const label = dicItem[ (item.dict.props && item.dict.props.label) || 'label'  ]
-      let tmp = dicItem[ (item.dict.props && item.dict.props.value) || 'code' ]
+      let tmp = dicItem[ (item.dict.props && item.dict.props.value) || 'value' ]
       const value = typeof tmp == 'boolean' ? tmp + '' : tmp
       tran[value] = label
       return { label, value } 
@@ -438,7 +701,7 @@ const handlerCascader = (val, column) => {
         if (response.data && response.code === 200) {
           formDictData.value[name] = response.data.map(dicItem => {
             return {
-              'label': dicItem[ (dict.props && dict.props.label) || 'code'  ],
+              'label': dicItem[ (dict.props && dict.props.label) || 'label'  ],
               'value': dicItem[ (dict.props && dict.props.value) || 'value' ]
             } 
           })
@@ -475,5 +738,5 @@ const getComponent = (item) => {
 
 props.autoInit && init()
 
-defineExpose({ init, reset })
+defineExpose({ init, reset, formRef })
 </script>
\ No newline at end of file
diff --git a/src/components/ma-icon/index.vue b/src/components/ma-icon/index.vue
index cc945f69ba91d9665282bd800f6ce0e7b696061f..2d269ac0e1f250678d3300a1a7164686fd3e2218 100644
--- a/src/components/ma-icon/index.vue
+++ b/src/components/ma-icon/index.vue
@@ -16,6 +16,7 @@
         allow-clear
         v-model="currentIcon"
         @change="handlerChange"
+        v-if="props.type === 'select'"
       >
         <a-optgroup label="Arco Design">
           <a-option
@@ -44,7 +45,8 @@
           </a-option>
         </a-optgroup>
       </a-select>
-      <div class="icon-container">
+      <a-input v-else-if="props.type === 'input'" placeholder="请点击右侧按钮选择图标" allow-clear v-model="currentIcon" />
+      <div class="icon-container" v-if="props.preview">
         <component :is="currentIcon" v-if="currentIcon" />
       </div>
       <a-button type="primary" @click="() => visible = true">选择图标</a-button>
@@ -91,7 +93,9 @@
   const currentIcon = ref()
 
   const props = defineProps({
-    modelValue: { type: String }
+    modelValue: { type: String },
+    type: { type: String, default: 'select' },
+    preview: { type: Boolean, default: true },
   })
   
   const emit = defineEmits(['update:modelValue'])
diff --git a/src/components/ma-resource/button.vue b/src/components/ma-resource/button.vue
index a978fec43b3db2a9743502d5a876e1ca750cee5e..73edccf3ff5c996523ed9d27cf30745cdce62da7 100644
--- a/src/components/ma-resource/button.vue
+++ b/src/components/ma-resource/button.vue
@@ -30,7 +30,7 @@
     </a-input-group>
     <a-modal v-model:visible="visible" :width="props.width" :footer="false"  draggable>
       <template #title>资源选择器</template>
-      <ma-resource v-model="list" :multiple="props.multiple" :only-url="props.onlyUrl" />
+      <ma-resource v-model="list" :multiple="props.multiple" :only-data="props.onlyData" />
     </a-modal>
   </div>
 </template>
@@ -48,7 +48,7 @@
   const props = defineProps({
     modelValue: { type: [ String, Array ] },
     multiple: { type: Boolean, default: true },
-    onlyUrl: { type: Boolean, default: true },
+    onlyData: { type: Boolean, default: true },
     width: { type: Number, default: 1080 },
   })
 
diff --git a/src/components/ma-resource/index.vue b/src/components/ma-resource/index.vue
index cc19b9dd414a0a6d5941f0361cbea8f5fd7edafc..28a1ed0ab3ccef98d6d58b302d4ebe887446e60c 100644
--- a/src/components/ma-resource/index.vue
+++ b/src/components/ma-resource/index.vue
@@ -117,7 +117,8 @@
   const props = defineProps({
     modelValue: { type: [ String, Array ] },
     multiple: { type: Boolean, default: true },
-    onlyUrl: { type: Boolean, default: true }
+    onlyData: { type: Boolean, default: true },
+    returnType: { type: String, default: 'url'},
   })
   
   onMounted(async () => {
@@ -165,8 +166,8 @@
   const selectFile = (item, index) => {
 
     if ( ! props.multiple && selecteds.value ) {
-      if (props.onlyUrl && item.url != selecteds.value) return
-      if (! props.onlyUrl && item.id != selecteds.value.id) return
+      if (props.onlyData && item.url != selecteds.value) return
+      if (! props.onlyData && item.id != selecteds.value.id) return
     }
 
     const children = rl.value.children
@@ -178,8 +179,8 @@
       children[index].className = className
       if (props.multiple) {
         selecteds.value.map((file, idx) => {
-          if (props.onlyUrl && file == item.url) selecteds.value.splice(idx, 1)
-          if (! props.onlyUrl && file.id == item.id) selecteds.value.splice(idx, 1)
+          if (props.onlyData && file == item.url) selecteds.value.splice(idx, 1)
+          if (! props.onlyData && file.id == item.id) selecteds.value.splice(idx, 1)
         })
       } else {
         selecteds.value = ''
@@ -187,9 +188,9 @@
     } else {
       children[index].className = className + ' active'
       if (props.multiple) {
-        selecteds.value.push(props.onlyUrl ? item?.url : item)
+        selecteds.value.push(props.onlyData ? item[props.returnType] : item)
       } else {
-        selecteds.value = props.onlyUrl ? item?.url : item
+        selecteds.value = props.onlyData ? item[props.returnType] : item
       }
     }
   }
diff --git a/src/components/ma-upload/index.vue b/src/components/ma-upload/index.vue
index 16493f4f4d2ed4da6155d7b416c52cd3c94e69b3..e4858325cb9fd3f7b5dde3917e915a28342fa6b9 100644
--- a/src/components/ma-upload/index.vue
+++ b/src/components/ma-upload/index.vue
@@ -225,7 +225,8 @@ const props = defineProps({
   tip: { type: String, default: undefined },
   type: { type: String, default: 'image' },
   accept: { type: String, default: '*' },
-  onlyUrl: { type: Boolean, default: true },
+  onlyData: { type: Boolean, default: true },
+  returnType: { type: String, default: 'url' },
   fileType: { type: String, default: 'button' },
   showList: { type: Boolean, default: true },
 })
@@ -319,7 +320,7 @@ const uploadImageHandler = async (options) => {
   if (result) {
     result.url = tool.attachUrl(result.url, storageMode[result.storage_mode])
     if (! props.multiple) {
-      fileList.value = props.onlyUrl ? result.url : result
+      fileList.value = props.onlyData ? result[props.returnType] : result
       emit('update:modelValue', fileList.value)
       currentItem.value.percent = 99
       setTimeout(() => {
@@ -338,7 +339,7 @@ const uploadImageHandler = async (options) => {
       }, 1200)
       let files = []
       fileList.value.map(item => {
-        files.push(props.onlyUrl ? item.url : item)
+        files.push(props.onlyData ? item[props.returnType] : item)
       })
       emit('update:modelValue', files)
     }
@@ -360,12 +361,12 @@ const uploadFileHandler = async (options) => {
       let files = []
       fileList.value.push(res)
       fileList.value.map(item => {
-        files.push(props.onlyUrl && item.url ? item.url : item)
+        files.push(props.onlyData && item[props.returnType] ? item[props.returnType] : item)
       })
       emit('update:modelValue', files)
     } else {
       fileList.value = res
-      emit('update:modelValue', props.onlyUrl && res.url ? res.url : res)
+      emit('update:modelValue', props.onlyData && res[props.returnType] ? res[props.returnType] : res)
     }
   })
 }
@@ -410,12 +411,12 @@ const chunkUpload = async (options) => {
           fileList.value[idx].res = res.data
           const files = []
           fileList.value.map(item => {
-            item.percent === 1 && files.push(props.onlyUrl ? item.res.url : item.res)
+            item.percent === 1 && files.push(props.onlyData ? item.res[props.returnType] : item.res)
           })
           emit('update:modelValue', files)
         } else {
           fileList.value.percent = 1
-          emit('update:modelValue', props.onlyUrl ? res.data.url : res.data)
+          emit('update:modelValue', props.onlyData ? res.data[props.returnType] : res.data)
         }
         return
       }
@@ -469,7 +470,7 @@ const removeChunkFile = (file = null) => {
       if (file.uid === item.uid) {
         fileList.value.splice(idx, 1)
       } else if (item.res) {
-        files.push(props.onlyUrl ? item.res.url : item.res)
+        files.push(props.onlyData ? item.res[props.returnType] : item.res)
       }
     })
     emit('update:modelValue', files)
@@ -487,7 +488,7 @@ const removeFile = async (fileItem) => {
         if (item.uid === fileItem.uid) fileList.value.splice(idx, 1)
       })
       fileList.value.map( item => {
-        files.push(props.onlyUrl && item.url ? item.url : item)
+        files.push(props.onlyData && item[props.returnType] ? item[props.returnType] : item)
       })
       emit('update:modelValue', files)
       return true
diff --git a/src/components/ma-verifyCode/index.vue b/src/components/ma-verifyCode/index.vue
index b18208f4af17cdd45d8fed8cf39b06e6253a1107..7cbf559ceb119af2004ad7f91b924eb29b860eef 100644
--- a/src/components/ma-verifyCode/index.vue
+++ b/src/components/ma-verifyCode/index.vue
@@ -8,7 +8,7 @@
  - @Link   https://gitee.com/xmo/mineadmin-vue
 -->
 <script setup>
-import { ref, reactive, onMounted } from 'vue'
+import { ref, onMounted } from 'vue'
 import { Message } from '@arco-design/web-vue'
 import { useI18n } from 'vue-i18n'
 
@@ -97,7 +97,6 @@ onMounted(() => {
 
 const refresh = () => {
   generateCode()
-  verifyCode.value = ''
 }
 
 defineExpose({ checkResult, refresh })
diff --git a/src/layout/components/banner/index.vue b/src/layout/components/banner/index.vue
index 2ea9811ef50ff3110d2c39145a940800f03ce07a..a7af66f4b2f746b9ec2be2cd898556390b7ae927 100644
--- a/src/layout/components/banner/index.vue
+++ b/src/layout/components/banner/index.vue
@@ -15,15 +15,7 @@
         <span class="ml-2 text-xl mt-2.5 hidden md:block">MineAdmin</span>
       </div>
       <div class="flex justify-between w-full layout-banner">
-        <a-menu
-          ref="MaMenuRef"
-          mode="horizontal"
-          class="layout-banner-menu hidden lg:flex"
-          :popup-max-height="360"
-          :selected-keys="actives"
-        >
-          <children-menu v-model="userStore.routers" />
-        </a-menu>
+        <children-banner v-model="userStore.routers" />
         <ma-operation />
       </div>
     </a-layout-header>
@@ -39,7 +31,7 @@
   import MaOperation from '../ma-operation.vue'
   import MaWorkerArea from '../ma-workerArea.vue'
   import MaTags from '../ma-tags.vue'
-  import ChildrenMenu from '../components/children-menu.vue'
+  import ChildrenBanner from '../components/children-banner.vue'
 
   const route = useRoute()
 
diff --git a/src/layout/components/components/children-banner.vue b/src/layout/components/components/children-banner.vue
new file mode 100644
index 0000000000000000000000000000000000000000..46ca287886532134b465de5fa97a059dfc202831
--- /dev/null
+++ b/src/layout/components/components/children-banner.vue
@@ -0,0 +1,72 @@
+<!--
+ - MineAdmin is committed to providing solutions for quickly building web applications
+ - Please view the LICENSE file that was distributed with this source code,
+ - For the full copyright and license information.
+ - Thank you very much for using MineAdmin.
+ -
+ - @Author X.Mo<root@imoi.cn>
+ - @Link   https://gitee.com/xmo/mineadmin-vue
+-->
+<template>
+    <a-layout-content class="sys-menus">
+      <a-menu ref="MaMenuRef" mode="horizontal" class="layout-banner-menu hidden lg:flex" :popup-max-height="360"
+        :selected-keys="actives">
+        <template v-for="menu in modelValue" :key="menu.id">
+          <template v-if="!menu.meta.hidden">
+          <template v-if="! menu.children || menu.children.length === 0">
+            <!-- 没有子菜单的进入 -->
+            <a-menu-item :key="menu.name" @click="routerPush(menu)">
+              <template #icon v-if="menu.meta.icon">
+                <component :is="menu.meta.icon" :class="menu.meta.icon.indexOf('ma') > 0 ? 'icon' : ''" />
+              </template>
+              {{ $t(`menus.${menu.name}`).indexOf('.') > 0 ? menu.meta.title : $t(`menus.${menu.name}`) }}
+            </a-menu-item>
+          </template>
+          <!-- 有子菜单的进入 -->
+          <template v-else>
+            <SubMenu :menu-info="menu" />
+          </template>
+        </template>
+        </template>
+      </a-menu>
+    </a-layout-content>
+  </template>
+  <script setup>
+    import { ref, watch, onMounted } from 'vue'
+    import { useTagStore } from '@/store'
+    import { useRouter, useRoute } from 'vue-router'
+    import SubMenu from './sub-menu.vue'
+    defineProps({ modelValue: Array })
+    const router = useRouter()
+    const emits = defineEmits(['go'])
+    const tagStore = useTagStore()
+    const route = useRoute()
+    const actives = ref([])
+    onMounted(() => {
+      actives.value = [route.name]
+    })
+  
+    watch(() => route, v => {
+      actives.value = [v.name]
+    }, { deep: true })
+    const routerPush = (menu) => {
+      if (menu.meta && menu.meta.type === 'L') {
+        window.open(menu.path)
+      } else {
+        router.push(menu.path)
+        tagStore.addTag({ name: menu.name, title: menu.meta.title, path: menu.path })
+      }
+    }
+  
+  </script>
+  
+  <style>
+    .sys-menus .icon {
+      width: 1em;
+      height: 1em;
+    }
+  
+    .arco-menu-selected .icon {
+      fill: rgb(var(--primary-6));
+    }
+  </style>
\ No newline at end of file
diff --git a/src/layout/components/components/message-notification.vue b/src/layout/components/components/message-notification.vue
index 9f0983ecbc73b594e47bec619a20c7dce3dc1f53..9184304b90172b3be1d0c1c37eadf2e720430b79 100644
--- a/src/layout/components/components/message-notification.vue
+++ b/src/layout/components/components/message-notification.vue
@@ -71,7 +71,7 @@ const viewMessage = async (record) => {
   row.value = record
   await queueMessage.updateReadStatus({ ids: [record.id] })
   messageStore.messageList.find( (item, idx) => {
-    if (record.id == item.id) messageStore.messageList.splice(idx, 1)
+    if (item && record.id == item.id) messageStore.messageList.splice(idx, 1)
   })
   detailVisible.value = true
 }
diff --git a/src/layout/components/components/sub-menu.vue b/src/layout/components/components/sub-menu.vue
new file mode 100644
index 0000000000000000000000000000000000000000..b78dd11545d19a05a65eab67877e5fcf5e752dad
--- /dev/null
+++ b/src/layout/components/components/sub-menu.vue
@@ -0,0 +1,57 @@
+<!--
+ - MineAdmin is committed to providing solutions for quickly building web applications
+ - Please view the LICENSE file that was distributed with this source code,
+ - For the full copyright and license information.
+ - Thank you very much for using MineAdmin.
+ -
+ - @Author X.Mo<root@imoi.cn>
+ - @Link   https://gitee.com/xmo/mineadmin-vue
+-->
+<template>
+  <a-sub-menu :key="menuInfo.name">
+    <template #title>
+      {{ $t(`menus.${menuInfo.name}`).indexOf('.') > 0 ? menuInfo.meta.title : $t(`menus.${menuInfo.name}`) }}
+    </template>
+    <template #icon v-if="menuInfo.meta.icon">
+      <component :is="menuInfo.meta.icon" :class="menuInfo.meta.icon.indexOf('ma') > 0 ? 'icon' : ''" />
+    </template>
+    <template v-for="item in menuInfo.children" :key="item.id">
+      <template v-if="!item.children|| item.children.length === 0">
+        <a-menu-item :key="item.name" @click="routerPush(item)">
+          <template #icon v-if="item.meta.icon">
+            <component :is="item.meta.icon" :class="menuInfo.meta.icon.indexOf('ma') > 0 ? 'icon' : ''" />
+          </template>
+          {{ $t(`menus.${item.name}`).indexOf('.') > 0 ? item.meta.title : $t(`menus.${item.name}`) }}
+        </a-menu-item>
+      </template>
+      <template v-else>
+        <SubMenu :menu-info="item" />
+      </template>
+    </template>
+  </a-sub-menu>
+</template>
+
+<script setup name="SubMenu">
+  import { useRouter, useRoute } from 'vue-router'
+  import { useTagStore } from '@/store'
+  defineProps({ menuInfo: Object })
+  const emits = defineEmits(['go'])
+  const router = useRouter()
+  const tagStore = useTagStore()
+  const routerPush = (menu) => {
+    if (menu.meta && menu.meta.type === 'L') {
+      window.open(menu.path)
+    } else {
+      router.push(menu.path)
+      tagStore.addTag({ name: menu.name, title: menu.meta.title, path: menu.path })
+    }
+  }
+</script>
+<style scoped>
+.arco-trigger-menu-icon .icon {
+width: 1em; height: 1em; 
+}
+[mine-skin="mine"] .arco-menu-selected .icon {
+fill: rgb(var(--primary-6));
+}
+</style>
\ No newline at end of file
diff --git a/src/layout/components/ma-tags.vue b/src/layout/components/ma-tags.vue
index fa9d58de716a6a81262b24b29032ce2e72f10dbc..146365bd18335351bc95e4789789d372dd4fd2f2 100644
--- a/src/layout/components/ma-tags.vue
+++ b/src/layout/components/ma-tags.vue
@@ -3,7 +3,7 @@
     <div class="menu-tags-wrapper" ref="scrollbarDom" :class="{ 'tag-pn': tagShowPrevNext }">
       <div class="tags" ref="tags">
         <a v-for="tag in tagStore.tags" :key="tag.path" @contextmenu.prevent="openContextMenu($event, tag)"
-          :class="route.path == tag.path ? 'active' : ''"
+          :class="route.fullPath == tag.path ? 'active' : ''"
           @click="tagJump(tag)">
           {{ tag.customTitle ? tag.customTitle : $t('menus.' + tag.name).indexOf('.') > 0 ? tag.title : $t('menus.' + tag.name) }}
           <icon-close class="tag-icon" v-if="!tag.affix" @click.stop="closeTag(tag)" />
@@ -67,6 +67,7 @@ import { addTag, closeTag, refreshTag } from '@/utils/common'
 import Sortable from "sortablejs"
 import { Message } from '@arco-design/web-vue'
 import { IconFaceFrownFill } from '@arco-design/web-vue/dist/arco-vue-icon'
+import tool from '@/utils/tool'
 
 const route = useRoute()
 const router = useRouter()
@@ -136,7 +137,7 @@ watch(
 )
 
 const tagJump = tag => {
-  router.push({ path: tag.path })
+  router.push({ path: tag.path, query: tool.getRequestParams(tag.path) })
 }
 
 const openContextMenu = (e, tag) => {
@@ -162,8 +163,8 @@ const closeContextMenu = () => {
 const contextMenuRefreshTag = () => {
   const tag = contextMenuItem.value
   contextMenuVisible.value = false
-  if (route.path != tag.path) {
-    router.push({ path: tag.path })
+  if (route.fullPath != tag.fullPath) {
+    router.push({ path: tag.path, query: tool.getRequestParams(tag.path) })
   }
   refreshTag()
 }
diff --git a/src/store/modules/tag.js b/src/store/modules/tag.js
index ffd0b6156dcaf97cf93d839755826a3c684a397a..71d366fd1704596b1d30a4d62c5e9e51e5c12a3f 100644
--- a/src/store/modules/tag.js
+++ b/src/store/modules/tag.js
@@ -51,7 +51,7 @@ const useTagStore = defineStore('tag', {
     updateTagTitle(path, title) {
       this.tags.map(item => {
         if (item.path == path) {
-          item.customeTitle = title
+          item.customTitle = title
         }
       })
       this.updateTagsToLocal()
diff --git a/src/utils/common.js b/src/utils/common.js
index 0a2a3dc0b292f5c61757f9f76a50abb83a7a768c..b0525c856526283b0d53121a15d43d7f5107b165 100644
--- a/src/utils/common.js
+++ b/src/utils/common.js
@@ -7,6 +7,7 @@ import NProgress from 'nprogress'
 import 'nprogress/nprogress.css'
 import router from '@/router'
 import { useTagStore, useKeepAliveStore } from '@/store'
+import tool from '@/utils/tool'
 
 export const refreshTag = () => {
   const route = router.currentRoute.value
@@ -33,7 +34,7 @@ export const closeTag = (tag) => {
   const keepStore = useKeepAliveStore()
   const t = tagStore.removeTag(tag)
   keepStore.removeKeepAlive(tag)
-  router.push({ name: t.name, query: t.query })
+  router.push({ path: t.path, query: tool.getRequestParams(t.path) })
 }
 
 export const success = (title, content) => {
diff --git a/src/utils/tool.js b/src/utils/tool.js
index 48a49892876de931bacd15b2aa64f4e60d31fb6b..7534ea6756f8cc57235bc6c13bb6f1867bc0c722 100644
--- a/src/utils/tool.js
+++ b/src/utils/tool.js
@@ -1,5 +1,6 @@
 import CryptoJS from 'crypto-js'
 import uploadConfig from '@/config/upload'
+import CityLinkageJson from "@/components/ma-cityLinkage/lib/city.json"
 
 const typeColor = (type = 'default') => {
   let color = ''
@@ -134,11 +135,36 @@ tool.screen = (element) => {
   }
 }
 
+// 城市代码翻译成名称
+tool.cityToCode = function(province, city = undefined, area = undefined, split = ' / ') {
+  try {
+    let provinceData = CityLinkageJson.filter(item => province == item.code)[0]
+    if (! city) {
+      return provinceData.name
+    }
+    let cityData = provinceData.children.filter(item => city == item.code)[0]
+
+    if (! area) {
+      return [provinceData.name, cityData.name].join(split)
+    }
+    let areaData = cityData.children.filter(item => area == item.code)[0]
+
+    return [provinceData.name, cityData.name, areaData.name].join(split)
+  } catch (e) {
+    return ''
+  }
+}
+
 /* 复制对象 */
 tool.objCopy = (obj) => {
   return JSON.parse(JSON.stringify(obj));
 }
 
+tool.viewImage = function(path, defaultStorage = 'LOCAL') {
+  let mode = tool.local.get('site_storage_mode') ? tool.local.get('site_storage_mode').toUpperCase() : defaultStorage
+  return uploadConfig.storage[mode] + path
+}
+
 /* 日期格式化 */
 tool.dateFormat = (date, fmt = 'yyyy-MM-dd hh:mm:ss', isDefault = '-') => {
   if (date.toString().length == 10) {
@@ -279,6 +305,18 @@ tool.httpBuild = (data, isPrefix = false) => {
   return _result.length ? prefix + _result.join('&') : ''
 }
 
+tool.getRequestParams = (url) => {
+  const theRequest = new Object()
+  if (url.indexOf('?') != -1) {
+    const params = url.split('?')[1].split('&')
+    for (let i = 0; i < params.length; i++) {
+      const param = params[i].split('=')
+      theRequest[param[0]] = decodeURIComponent(param[1])
+    }
+  }
+  return theRequest
+}
+
 tool.attachUrl = (path, defaultStorage = 'LOCAL') => {
 	return uploadConfig.storage[defaultStorage] + path
 }
diff --git a/src/views/setting/code/components/editInfo.vue b/src/views/setting/code/components/editInfo.vue
index fcddb10870622d11554700b152a8faf0b200b199..ce79c952d18c46958c53ea5ce0e571bb55e14206 100644
--- a/src/views/setting/code/components/editInfo.vue
+++ b/src/views/setting/code/components/editInfo.vue
@@ -12,7 +12,7 @@
     <template #title>编辑生成信息 - {{ record?.table_comment }}</template>
 
     <a-spin :loading="loading" tip="加载数据中..." class="w-full">
-      <a-form :model="form">
+      <a-form :model="form" ref="formRef">
         <a-tabs v-model:active-key="activeTab">
           <a-tab-pane title="配置信息" key="base_config">
 
@@ -306,6 +306,7 @@
               <template #isEdit="{ rowIndex }"><a-checkbox v-model="form.columns[rowIndex].is_edit" /></template>
               <template #isList="{ rowIndex }"><a-checkbox v-model="form.columns[rowIndex].is_list" /></template>
               <template #isQuery="{ rowIndex }"><a-checkbox v-model="form.columns[rowIndex].is_query" /></template>
+              <template #isSort="{ rowIndex }"><a-checkbox v-model="form.columns[rowIndex].is_sort" /></template>
               <!-- end -->
               <!-- 查询方式 -->
               <template #queryType="{ rowIndex }">
@@ -314,7 +315,7 @@
               <!-- 组件 -->
               <template #viewType="{ record, rowIndex }">
                 <a-space>
-                  <a-select v-model="form.columns[rowIndex].view_type" :style="{ width: '180px' }" :options="vars.viewComponent" allow-clear></a-select>
+                  <a-select v-model="form.columns[rowIndex].view_type" :style="{ width: '160px' }" :options="vars.viewComponent" allow-clear></a-select>
                   <a-link
                     v-if="! notNeedSettingComponents.includes(record.view_type)"
                     @click="settingComponentRef.open(record)"
@@ -506,7 +507,6 @@ import SettingComponent from './settingComponent.vue'
 
 // 导入变量
 import * as vars from '../js/vars.js'
-import { findProp } from '@vue/compiler-core'
 
 const record = ref({})
 const loading = ref(true)
@@ -523,6 +523,9 @@ const form = ref({
   generate_menus: ['save', 'update' , 'read', 'delete' , 'recycle', 'changeStatus', 'numberOperation', 'import', 'export'],
   columns: [],
 })
+
+const formRef = ref()
+
 // form扩展组
 const formOptions = ref({
   relations: []
@@ -558,6 +561,13 @@ const confrimSetting = (name, value) => {
 }
 
 const save = async (done) => {
+  const validResult = await formRef.value.validate()
+  if (validResult) {
+    for (let i in validResult) {
+      Message.error(validResult[i].message)
+    }
+    return false
+  }
   form.value.options = formOptions.value
   if (! form.value.generate_menus) {
     form.value.generate_menus = ['save', 'update' , 'read', 'delete' , 'recycle', 'changeStatus', 'numberOperation', 'import', 'export']
@@ -602,6 +612,7 @@ const init = () => {
       item.is_edit = item.is_edit === 2
       item.is_list = item.is_list === 2
       item.is_query = item.is_query === 2
+      item.is_sort = item.is_sort === 2
       form.value.columns.push(item)
     })
   })
diff --git a/src/views/setting/code/components/settingComponent.vue b/src/views/setting/code/components/settingComponent.vue
index f09d08d05df4a00db68350ab77c93b97d49bcc32..a1b78f12b7c9f8d8177ed1744aee51245a543601 100644
--- a/src/views/setting/code/components/settingComponent.vue
+++ b/src/views/setting/code/components/settingComponent.vue
@@ -109,11 +109,11 @@
           </a-form-item>
           <a-form-item
             label="值"
-            field="code"
+            field="value"
             label-col-flex="auto"
             :label-col-style="{ width: '80px' }"
           >
-            <a-input v-model="item.code" />
+            <a-input v-model="item.value" />
           </a-form-item>
         </a-card>
       </div>
@@ -149,15 +149,29 @@
       <div v-if="['upload', 'selectResource'].includes(row.view_type)">
         <a-form-item
           label="返回数据"
-          field="onlyUrl"
+          field="onlyData"
           label-col-flex="auto"
           :label-col-style="{ width: '120px' }"
         >
-          <a-radio-group v-model="form.onlyUrl">
-            <a-radio :value="true">仅url地址</a-radio>
+          <a-radio-group v-model="form.onlyData">
+            <a-radio :value="true">单个字段数据</a-radio>
             <a-radio :value="false">全量数据</a-radio>
           </a-radio-group>
         </a-form-item>
+        <a-form-item
+          label="返回数据"
+          field="returnType"
+          label-col-flex="auto"
+          :label-col-style="{ width: '120px' }"
+          v-if="form.onlyData"
+          :extra="`支持 uploadfile 数据表所有字段，这里仅列常用部分`"
+        >
+          <a-select v-model="form.returnType" placeholder="请选择上传返回数据类型">
+            <a-option value="url">附件URL</a-option>
+            <a-option value="id">附件ID</a-option>
+            <a-option value="hash">附件HASH</a-option>
+          </a-select>
+        </a-form-item>
         <a-form-item
           label="是否可多选"
           field="multiple"
@@ -309,7 +323,7 @@ const open = (record) => {
 }
 
 const add = () => {
-  form.value.collection.push({ label: '', code: ''})
+  form.value.collection.push({ label: '', value: ''})
 }
 const del = (idx) => {
   form.value.collection.splice(idx, 1)
diff --git a/src/views/setting/code/index.vue b/src/views/setting/code/index.vue
index aaa48b1e31ff6300d3c39717cdc8233014d12fbd..56cc2f7f972234134d71779bb7a3e1029b036b72 100644
--- a/src/views/setting/code/index.vue
+++ b/src/views/setting/code/index.vue
@@ -76,8 +76,8 @@
   const router = useRouter()
 
   const types = [
-    { label: '单表CRUD', code: 'single' },
-    { label: '树表CRUD', code: 'tree' },
+    { label: '单表CRUD', value: 'single' },
+    { label: '树表CRUD', value: 'tree' },
   ]
 
   const selectSuccess = (result) => {
diff --git a/src/views/setting/code/js/vars.js b/src/views/setting/code/js/vars.js
index ac9e7cae6eede3dc446384d58b6163ab855b3840..c931d89456c1d0249792a1036eff2ad8b1096e2a 100644
--- a/src/views/setting/code/js/vars.js
+++ b/src/views/setting/code/js/vars.js
@@ -27,10 +27,11 @@ export const columns = [
   { title: '编辑', dataIndex: 'is_edit', slotName: 'isEdit', width: 80, },
   { title: '列表', dataIndex: 'is_list', slotName: 'isList', width: 80, },
   { title: '查询', dataIndex: 'is_query', slotName: 'isQuery', width: 80, },
+  { title: '排序', dataIndex: 'is_sort', slotName: 'isSort', width: 80, },
   { title: '查询方式', dataIndex: 'query_type', slotName: 'queryType', width: 180, },
-  { title: '页面控件', dataIndex: 'view_type', slotName: 'viewType', width: 260, },
-  { title: '数据字典', dataIndex: 'dict_type', slotName: 'dictType', width: 200, },
-  { title: '允许角色', dataIndex: 'allow_roles', slotName: 'allowRoles', width: 240, },
+  { title: '页面控件', dataIndex: 'view_type', slotName: 'viewType', width: 240, },
+  { title: '数据字典', dataIndex: 'dict_type', slotName: 'dictType', width: 180, },
+  { title: '允许角色', dataIndex: 'allow_roles', slotName: 'allowRoles', width: 200, },
 ]
 
 export const queryType = [
diff --git a/src/views/setting/config/components/addConfig.vue b/src/views/setting/config/components/addConfig.vue
index a06e86b3f94002b95d1ed147ea1bc2b5481aee6d..3b818e9610c08a60856c0e262292b28c42f1a620 100644
--- a/src/views/setting/config/components/addConfig.vue
+++ b/src/views/setting/config/components/addConfig.vue
@@ -28,14 +28,14 @@ const emit = defineEmits(['success'])
 const formRef = ref()
 const form = ref({ input_type: 'input', sort: 0 })
 const inputComponent = [
-  { label: '文本框', code: 'input' },
-  { label: '文本域', code: 'textarea' },
-  { label: '下拉选择框', code: 'select' },
-  { label: '单选框', code: 'radio' },
-  { label: '复选框', code: 'checkbox' },
-  { label: '开关', code: 'switch' },
-  { label: '图片上传', code: 'upload' },
-  { label: '富文本编辑器', code: 'editor' },
+  { label: '文本框', value: 'input' },
+  { label: '文本域', value: 'textarea' },
+  { label: '下拉选择框', value: 'select' },
+  { label: '单选框', value: 'radio' },
+  { label: '复选框', value: 'checkbox' },
+  { label: '开关', value: 'switch' },
+  { label: '图片上传', value: 'upload' },
+  { label: '富文本编辑器', value: 'editor' },
 ]
 
 const submit = async (data, done) => {
@@ -105,7 +105,7 @@ const columns = reactive([
     formType: 'code-editor',
     labelWidth: '120px',
     height: 200,
-    formExtra: '用于配置下拉、单选、复选的数据，格式例子：[{"label":"数据一", "code":"shuju1"},...]',
+    formExtra: '用于配置下拉、单选、复选的数据，格式例子：[{"label":"数据一", "value":"shuju1"},...]',
   }
 ])
 
diff --git a/src/views/setting/config/components/manageConfig.vue b/src/views/setting/config/components/manageConfig.vue
index 58e4f43796eb21c1b237a60ff1b1f001f4b15fae..2106c5453ec24f89f4afbaac20ccd30ad554b066 100644
--- a/src/views/setting/config/components/manageConfig.vue
+++ b/src/views/setting/config/components/manageConfig.vue
@@ -24,14 +24,14 @@ const visible = ref(false)
 const groupId = ref()
 const crudRef = ref()
 const inputComponent = [
-  { label: '文本框', code: 'input' },
-  { label: '文本域', code: 'textarea' },
-  { label: '下拉选择框', code: 'select' },
-  { label: '单选框', code: 'radio' },
-  { label: '复选框', code: 'checkbox' },
-  { label: '开关', code: 'switch' },
-  { label: '图片上传', code: 'upload' },
-  { label: '富文本编辑器', code: 'editor' },
+  { label: '文本框', value: 'input' },
+  { label: '文本域', value: 'textarea' },
+  { label: '下拉选择框', value: 'select' },
+  { label: '单选框', value: 'radio' },
+  { label: '复选框', value: 'checkbox' },
+  { label: '开关', value: 'switch' },
+  { label: '图片上传', value: 'upload' },
+  { label: '富文本编辑器', value: 'editor' },
 ]
 
 const open = (id) => {
diff --git a/src/views/setting/crontab/index.vue b/src/views/setting/crontab/index.vue
index 4d195f579c24902aabef8717147da4529c4d2697..7db2a5510f5270a2d89706a38e265b3cfb6966e7 100644
--- a/src/views/setting/crontab/index.vue
+++ b/src/views/setting/crontab/index.vue
@@ -44,10 +44,10 @@
   const logsRef = ref()
 
   const types = [
-    { label: '命令任务', code: 1 },
-    { label: '类任务', code: 2} ,
-    { label: 'URL任务', code: 3 },
-    { label: 'PHP脚本任务', code: 4 },
+    { label: '命令任务', value: 1 },
+    { label: '类任务', value: 2} ,
+    { label: 'URL任务', value: 3 },
+    { label: 'PHP脚本任务', value: 4 },
   ]
 
   const changeStatus = async (status, id) => {
@@ -105,7 +105,7 @@
     },
     {
       title: '单次执行', dataIndex: 'singleton', formType: 'radio', addDefaultValue: 2,
-      dict: { data: [{ label: '是', code: 1 }, { label: '否', code: 2 }]}, hide: true
+      dict: { data: [{ label: '是', value: 1 }, { label: '否', value: 2 }]}, hide: true
     },
     {
       title: '状态', dataIndex: 'status', search: true, formType: 'radio',
diff --git a/src/views/setting/module/index.vue b/src/views/setting/module/index.vue
index 502c774cd2ffd67df687feec8fb10aa481f11434..46b9b6686544f3c6abee12137af75d6df06ff515 100644
--- a/src/views/setting/module/index.vue
+++ b/src/views/setting/module/index.vue
@@ -154,7 +154,7 @@
     },
     {
       title: '状态', dataIndex: 'enabled', formType: 'radio', addDisplay: false, editDisplay: false, width: 120,
-      dict: { data: [ { label: '开启', code: true }, { label: '禁用', code: false } ], translation: true },
+      dict: { data: [ { label: '开启', value: true }, { label: '禁用', value: false } ], translation: true },
     }
   ])
 </script>
diff --git a/src/views/system/api/index.vue b/src/views/system/api/index.vue
index 52e1b24405cd3c63e71c59761bba0c6bd40f2e0e..6cc3a96fc660c1e965f1839eae8993d2c9579196 100644
--- a/src/views/system/api/index.vue
+++ b/src/views/system/api/index.vue
@@ -118,7 +118,7 @@
     },
     {
       title: '认证模式', dataIndex: 'auth_mode', formType: 'radio',
-      dict: { data: [{ label: '简易模式', code: 1 }, { label: '复杂模式', code: 2 }], translation: true },
+      dict: { data: [{ label: '简易模式', value: 1 }, { label: '复杂模式', value: 2 }], translation: true },
       addDefaultValue: 1, width: 130, span: 12,
     },
     {
diff --git a/src/views/system/api/paramsList.vue b/src/views/system/api/paramsList.vue
index f85562682322da30fba2594b078b704355579ab7..983be00efe906fd173008b78e151a340db5e5fbd 100644
--- a/src/views/system/api/paramsList.vue
+++ b/src/views/system/api/paramsList.vue
@@ -88,7 +88,7 @@ const columns = reactive([
   },
   {
     title: '字段类型', dataIndex: 'type', disabled: true, formType: 'radio',
-    dict: { data: [{ label: '请求', code: 1 }, { label: '响应', code: 2 }], translation: true },
+    dict: { data: [{ label: '请求', value: 1 }, { label: '响应', value: 2 }], translation: true },
     addDefaultValue: () => currentType.value == 'request' ? 1 : 2, 
     span: 8, labelWidth: '140px',
   },
@@ -99,7 +99,7 @@ const columns = reactive([
   },
   {
     title: '必填', dataIndex: 'is_required', search: true,
-    dict: { data: [{ label: '是', code: 2 }, { label: '否', code: 1 }], translation: true },
+    dict: { data: [{ label: '是', value: 2 }, { label: '否', value: 1 }], translation: true },
     addDefaultValue: 2, formType: 'radio', span: 8,
     control: (value) => {
       if ( value == 2) {
diff --git a/src/views/system/logs/loginLog.vue b/src/views/system/logs/loginLog.vue
index 62eaea87b94acd932ae660c721b6adbf668e3948..130aee8cc45106a2576cb6eda57f9410952de3ab 100644
--- a/src/views/system/logs/loginLog.vue
+++ b/src/views/system/logs/loginLog.vue
@@ -37,7 +37,7 @@
     { title: '登录用户', dataIndex: 'username', search: true, width: 150 }, 
     { 
       title: '登录状态', dataIndex: 'status', search: true, width: 120, formType: 'select',
-      dict: { data: [ { label: '成功', code: 1 }, { label: '失败', code: 2 } ], translation: true }
+      dict: { data: [ { label: '成功', value: 1 }, { label: '失败', value: 2 } ], translation: true }
     },
     { title: '登录IP', dataIndex: 'ip', width: 150, search: true },
     { title: '登录地点', dataIndex: 'ip_location', width: 150 },
diff --git a/src/views/system/menu/index.vue b/src/views/system/menu/index.vue
index f31e00f6c71d857632b029ef9eb7cd7a1bf14791..e46dc39db26a0a812148a32aaeb9462803cf5aba 100644
--- a/src/views/system/menu/index.vue
+++ b/src/views/system/menu/index.vue
@@ -59,10 +59,10 @@
   let isRecovery = computed(() => crudRef.value ? crudRef.value.isRecovery : false )
 
   const menuType = [
-    { label: '菜单', code: 'M' },
-    { label: '按钮', code: 'B' },
-    { label: '外链', code: 'L' },
-    { label: 'iFrame', code: 'I' },
+    { label: '菜单', value: 'M' },
+    { label: '按钮', value: 'B' },
+    { label: '外链', value: 'L' },
+    { label: 'iFrame', value: 'I' },
   ]
 
   const changeStatus = async (status, id) => {
@@ -121,7 +121,7 @@
     { 
       title: '菜单类型', dataIndex: 'type', formType: 'radio', addDefaultValue: 'M', width: 100,
       dict: {
-        data: menuType, props: { label: 'label', value: 'code' }, translation: true,
+        data: menuType, translation: true,
         tagColors: { 'M': 'blue', 'B': 'green', 'L': 'orangered', 'I': 'pinkpurple' }
       },
       control: (value) => {
diff --git a/src/views/system/role/components/dataPermission.vue b/src/views/system/role/components/dataPermission.vue
index b5734b89470446d3184032c9d95d19823e3a6bf1..88d5c155c3b53afa1fa1c64a199082a322f97cce 100644
--- a/src/views/system/role/components/dataPermission.vue
+++ b/src/views/system/role/components/dataPermission.vue
@@ -81,6 +81,9 @@
 
   const open = (row) => {
     form.value = { id: row.id, name: row.name, code: row.code, data_scope: row.data_scope }
+    handlerExpand(false)
+    handlerSelect(false)
+    handlerLinkage(false)
     setData(row.id)
     visible.value = true
   }
@@ -103,11 +106,12 @@
     t.expandNode(value, nodes.includes(value[0]) ? false : true)
   }
 
-  const setData = (roleId) => {
-    dept.tree().then(res => deptList.value = res.data )
-    role.getDeptByRole(roleId).then(res => {
-      selectKeys.value = res.data[0].depts.map( item => item.id )
-    })
+  const setData = async (roleId) => {
+    const deptResponse = await dept.tree({ scope: true })
+    deptList.value = deptResponse.data
+    const roleResponse = await role.getDeptByRole(roleId)
+    selectKeys.value = roleResponse.data[0].depts.map( item => item.id )
+    selectKeys.value.length > 0 && handlerLinkage(true)
     loading.value = false
   }
 
diff --git a/src/views/system/role/components/menuPermission.vue b/src/views/system/role/components/menuPermission.vue
index 9df4ed709bede8fc04adf88f47b5ba152ef7439d..4111ccac01d0351bdd20a4fc431546a8117bf254 100644
--- a/src/views/system/role/components/menuPermission.vue
+++ b/src/views/system/role/components/menuPermission.vue
@@ -63,6 +63,9 @@
 
   const open = (row) => {
     form.value = { id: row.id, name: row.name, code: row.code }
+    handlerExpand(false)
+    handlerSelect(false)
+    handlerLinkage(false)
     setData(row.id)
     visible.value = true
   }
@@ -85,11 +88,12 @@
     t.expandNode(value, nodes.includes(value[0]) ? false : true)
   }
 
-  const setData = (roleId) => {
-    menu.tree().then(res => menuList.value = res.data )
-    role.getMenuByRole(roleId).then(res => {
-      selectKeys.value = res.data[0].menus.map( item => item.id )
-    })
+  const setData = async (roleId) => {
+    const menuResponse = await menu.tree({ scope: true })
+    menuList.value = menuResponse.data
+    const roleResponse = await role.getMenuByRole(roleId)
+    selectKeys.value = roleResponse.data[0].menus.map( item => item.id)
+    selectKeys.value.length > 0 && handlerLinkage(true)
     loading.value = false
   }
 
diff --git a/src/views/userCenter/message.vue b/src/views/userCenter/message.vue
index f5ef50170efc74444dcdb8d17469f0d86e08395d..f3df3c7efa6185199d01a54d25bcb2573bdc9df5 100644
--- a/src/views/userCenter/message.vue
+++ b/src/views/userCenter/message.vue
@@ -21,7 +21,7 @@
     <div class="h-hull w-full lg:ml-3 lg:mr-2 pt-2">
       <ma-crud :crud="crud" :columns="columns" ref="crudRef">
 
-        <template #operation>
+        <template #tableAfterButtons>
           <a-radio-group
             class="mt-2 lg:mt-0"
             type="button"
diff --git a/yarn.lock b/yarn.lock
index 0ca05dd5cea0b20931bec2793e883f82f680fd53..e59bf43d8399ca5bd286f851920b660fadba2fe5 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -17,10 +17,10 @@
   dependencies:
     color "^3.1.3"
 
-"@arco-design/web-vue@^2.37.4":
-  version "2.37.4"
-  resolved "https://registry.yarnpkg.com/@arco-design/web-vue/-/web-vue-2.37.4.tgz#d14a89f7bdfa4465a3539161b2fb414824097e3b"
-  integrity sha512-h8mK/I0jxlYKG/q5EiOOTqOdE12bRLxMFIkmNYr5XiixbvlI2YBYuyOjoDtlr1FY68cp6o77ysPmmedG5rmeng==
+"@arco-design/web-vue@^2.38.3":
+  version "2.38.3"
+  resolved "https://registry.yarnpkg.com/@arco-design/web-vue/-/web-vue-2.38.3.tgz#16b97a980ed371812eaa473e4bd8610168cd37aa"
+  integrity sha512-dJsrTHlWKGeUcc6jomZamGYljn2h3yfuV0jZZOs9ho12PM5MfO2NucNNhhjbs25qmmCH8OGXPtZ6ilVoTbEA+Q==
   dependencies:
     "@arco-design/color" "^0.4.0"
     b-tween "^0.3.3"
@@ -31,10 +31,10 @@
     resize-observer-polyfill "^1.5.1"
     scroll-into-view-if-needed "^2.2.28"
 
-"@arco-themes/vue-mine-admin@^0.0.8":
-  version "0.0.8"
-  resolved "https://registry.yarnpkg.com/@arco-themes/vue-mine-admin/-/vue-mine-admin-0.0.8.tgz#dd60c0a354a1022557a17511e4b7a1d28c3c385d"
-  integrity sha512-RbF4q8yUIA32Mf9Vz1Nso5774pFD9e90jNRizTFcvqm6XAhCLccvz1FmlNwf4QSuSVERElxtlsWjzD/jsD7Mlg==
+"@arco-themes/vue-mine-admin@^0.0.9":
+  version "0.0.9"
+  resolved "https://registry.npmmirror.com/@arco-themes/vue-mine-admin/-/vue-mine-admin-0.0.9.tgz#755cbd867c553d9c6f60fc0135e8d380403e0487"
+  integrity sha512-j8oAqm+sF9hJfCPFGM3i93XxiwP7CaSSvrbUi+/JhT6XFGJlH3gRqoRzNZvrBs3UMAakJgyjXXkmD4f/Km/nog==
 
 "@babel/code-frame@^7.18.6":
   version "7.18.6"
@@ -434,10 +434,10 @@
     "@babel/plugin-transform-typescript" "^7.18.8"
     "@vue/babel-plugin-jsx" "^1.1.1"
 
-"@vitejs/plugin-vue@^3.0.0":
-  version "3.0.0"
-  resolved "https://registry.npmmirror.com/@vitejs/plugin-vue/-/plugin-vue-3.0.0.tgz#7081e2b3fbe04e291bb85107b9fb57a1fa5e6aeb"
-  integrity sha512-yWP34ArFh/jAeNUDkkLz/kVRLjf5ppJiq4L36f64Cp6dIrMQeYZGDP9xxdemlXfZR9ylN9JgHUl3GzfqOtgYDg==
+"@vitejs/plugin-vue@^3.1.2":
+  version "3.2.0"
+  resolved "https://registry.yarnpkg.com/@vitejs/plugin-vue/-/plugin-vue-3.2.0.tgz#a1484089dd85d6528f435743f84cdd0d215bbb54"
+  integrity sha512-E0tnaL4fr+qkdCNxJ+Xd0yM31UwMkQje76fsDVBBUCoGOUPexu2VDUYHL8P4CwV+zMvWw6nlRw19OnRKmYAJpw==
 
 "@vue/babel-helper-vue-transform-on@^1.0.2":
   version "1.0.2"