新增：css样式支持

src/api/cms/article/model/index.ts

@@ -65,6 +65,8 @@ export interface ArticleParam extends PageParam {
   title?: string;
   articleId?: number;
   categoryId?: number;
+  model?: string;
+  modelName?: string;
   navigationId?: number;
   status?: number;
   sortNumber?: string;

src/api/cms/design/model/index.ts

@@ -20,7 +20,7 @@ export interface Design {
   // 高
   height?: string;
   // 页面样式
-  styles?: string;
+  style?: string;
   // 附件
   images?: string;
   // 用户ID

src/api/cms/navigation/model/index.ts

@@ -11,6 +11,7 @@ export interface Navigation {
   path?: string;
   icon?: string;
   component?: string;
+  componentPath?: string;
   model?: string;
   modelName?: string;
   type?: number;
@@ -40,6 +41,7 @@ export interface Navigation {
   isMpWeixin?: boolean;
   label?: string;
   value?: number;
+  style?: string;
 }
 
 /**

src/api/cms/website/field/model/index.ts

@@ -16,6 +16,7 @@ export interface WebsiteField {
   sortNumber?: any;
   createTime?: string;
   deleted?: number;
+  style?: string;
 }
 
 // 约定的网站参数名称

src/api/cms/website/model/index.ts

@@ -49,6 +49,7 @@ export interface Website {
   links?: Link[];
   // 配置信息
   config?: any;
+  style?: string;
 }
 
 /**

src/api/system/dict-data/model/index.ts

@@ -14,6 +14,10 @@ export interface DictData {
   dictDataCode?: string;
   // 字典数据名称
   dictDataName?: string;
+  // 预设字段(路由地址)
+  path?: string;
+  // 预设字段(组件路径)
+  component?: string;
   // 字典标识
   dictCode?: string;
   // 排序号

src/api/system/dictionary-data/model/index.ts

@@ -12,8 +12,12 @@ export interface DictionaryData {
   dictDataCode?: string;
   // 字典数据名称
   dictDataName?: string;
+  // 预设字段(路由地址)
+  path?: string;
+  // 组件路径
+  component?: string;
   // 排序号
-  sortNumber?: string;
+  sortNumber?: number;
   // 备注
   comments?: string;
   // 创建时间

src/api/system/domain/index.ts

@@ -0,0 +1,106 @@
+import request from '@/utils/request';
+import type { ApiResult, PageResult } from '@/api';
+import type { Domain, DomainParam } from './model';
+import { SERVER_API_URL } from '@/config/setting';
+
+/**
+ * 分页查询授权域名
+ */
+export async function pageDomain(params: DomainParam) {
+  const res = await request.get<ApiResult<PageResult<Domain>>>(
+    SERVER_API_URL + '/system/domain/page',
+    {
+      params
+    }
+  );
+  if (res.data.code === 0) {
+    return res.data.data;
+  }
+  return Promise.reject(new Error(res.data.message));
+}
+
+/**
+ * 查询授权域名列表
+ */
+export async function listDomain(params?: DomainParam) {
+  const res = await request.get<ApiResult<Domain[]>>(
+    SERVER_API_URL + '/system/domain',
+    {
+      params
+    }
+  );
+  if (res.data.code === 0 && res.data.data) {
+    return res.data.data;
+  }
+  return Promise.reject(new Error(res.data.message));
+}
+
+/**
+ * 添加授权域名
+ */
+export async function addDomain(data: Domain) {
+  const res = await request.post<ApiResult<unknown>>(
+    SERVER_API_URL + '/system/domain',
+    data
+  );
+  if (res.data.code === 0) {
+    return res.data.message;
+  }
+  return Promise.reject(new Error(res.data.message));
+}
+
+/**
+ * 修改授权域名
+ */
+export async function updateDomain(data: Domain) {
+  const res = await request.put<ApiResult<unknown>>(
+    SERVER_API_URL + '/system/domain',
+    data
+  );
+  if (res.data.code === 0) {
+    return res.data.message;
+  }
+  return Promise.reject(new Error(res.data.message));
+}
+
+/**
+ * 删除授权域名
+ */
+export async function removeDomain(id?: number) {
+  const res = await request.delete<ApiResult<unknown>>(
+    SERVER_API_URL + '/system/domain/' + id
+  );
+  if (res.data.code === 0) {
+    return res.data.message;
+  }
+  return Promise.reject(new Error(res.data.message));
+}
+
+/**
+ * 批量删除授权域名
+ */
+export async function removeBatchDomain(data: (number | undefined)[]) {
+  const res = await request.delete<ApiResult<unknown>>(
+    SERVER_API_URL + '/system/domain/batch',
+    {
+      data
+    }
+  );
+  if (res.data.code === 0) {
+    return res.data.message;
+  }
+  return Promise.reject(new Error(res.data.message));
+}
+
+/**
+ * 根据id查询授权域名
+ */
+export async function getDomain(id: number) {
+  const res = await request.get<ApiResult<Domain>>(
+    SERVER_API_URL + '/system/domain/' + id
+  );
+  if (res.data.code === 0 && res.data.data) {
+    return res.data.data;
+  }
+  return Promise.reject(new Error(res.data.message));
+}

src/api/system/domain/model/index.ts

@@ -0,0 +1,38 @@
+import type { PageParam } from '@/api';
+
+/**
+ * 授权域名
+ */
+export interface Domain {
+  // ID
+  id?: number;
+  // 域名
+  domain?: string;
+  // 主机记录
+  hostName?: string;
+  // 记录值
+  hostValue?: string;
+  // 状态
+  status?: number;
+  // 排序号
+  sortNumber?: number;
+  // 用户ID
+  userId?: number;
+  // 是否删除, 0否, 1是
+  deleted?: number;
+  // 租户id
+  tenantId?: number;
+  // 创建时间
+  createTime?: string;
+  // 修改时间
+  updateTime?: string;
+  comments?: string;
+}
+
+/**
+ * 授权域名搜索条件
+ */
+export interface DomainParam extends PageParam {
+  id?: number;
+  keywords?: string;
+}

src/api/system/website/field/index.ts

@@ -134,7 +134,7 @@ export async function checkExistence(
  */
 export async function configWebsiteField(params?: WebsiteFieldParam) {
   const res = await request.get<ApiResult<Config>>(
-    'https://modules.gxwebsoft.com/api/system/website-field/config',
+    MODULES_API_URL + '/cms/website-field/config',
     {
       params
     }

src/components/ChooseDictionary/index.vue

@@ -62,7 +62,8 @@
       data.value = list.map((d) => {
         return {
           label: d.dictDataName,
-          value: d.dictDataCode
+          value: d.dictDataCode,
+          component: d.component
         };
       });
     });

src/components/SelectWebsiteField/components/select-data.vue

@@ -154,11 +154,6 @@
   /* 自定义行属性 */
   const customRow = (record: Company) => {
     return {
-      // 行点击事件
-      // onClick: () => {
-      //   updateVisible(false);
-      //   emit('done', record);
-      // },
       // 行双击事件
       onDblclick: () => {
         updateVisible(false);

src/utils/common.ts

@@ -80,21 +80,21 @@ export function openSpmUrl(path: string, d?: any, id = 0): void {
   const timestamp = ref(Date.now() / 1000);
   token.value = `&token=${uuid()}`;
 
-  // TODO 含http直接跳转
-  if (path.slice(0, 4) == 'http') {
-    window.open(`${path}`);
-    return;
-  }
-
   // TODO 不传data
-  if (!d) {
+  // if (!d) {
-    window.open(`${domain}${path}`);
+  //   window.open(`${domain}${path}`);
-    return;
+  //   return;
-  }
+  // }
 
   // TODO 封装租户ID和店铺ID
   spm.value = `?spm=c.${uid}.${tid}.${pid}.${cid}.${id}.${timestamp.value}`;
 
+  // TODO 含http直接跳转
+  if (path.slice(0, 4) == 'http') {
+    window.open(`${path}${spm.value}`);
+    return;
+  }
+
   // 跳转页面
   url.value = `${domain}${path}${spm.value}${token.value}`;
   window.open(url.value);

src/views/cms/article/components/search.vue

@@ -22,17 +22,26 @@
       allow-clear
       :tree-data="navigationList"
       tree-default-expand-all
-      style="width: 230px"
+      style="width: 280px"
       placeholder="请选择栏目"
       :value="where.categoryId || undefined"
       :dropdown-style="{ maxHeight: '360px', overflow: 'auto' }"
       @update:value="(value?: number) => (where.categoryId = value)"
       @change="onCategoryId"
     />
+    <ChooseDictionary
+      v-if="showChooseDict"
+      dict-code="NavigationModel"
+      :placeholder="`选择模型`"
+      style="width: 120px"
+      v-model:value="where.model"
+      @done="chooseModel"
+    />
     <a-input-search
       allow-clear
       placeholder="请输入关键词"
-      v-model:value="where.keywords"
+      style="width: 280px"
+      v-model:value="where.userId"
       @pressEnter="reload"
       @search="reload"
     />
@@ -62,15 +71,18 @@
   const type = ref<string>();
   // 统计数据
   const articleCount = ref<ArticleCount>();
+  const showChooseDict = ref<boolean>(false);
 
   // 表单数据
   const { where, resetFields } = useSearch<ArticleParam>({
     articleId: undefined,
+    model: undefined,
     navigationId: undefined,
     categoryId: undefined,
     merchantId: undefined,
     status: undefined,
-    keywords: ''
+    keywords: '',
+    userId: undefined
   });
 
   const emit = defineEmits<{
@@ -107,6 +119,13 @@
     emit('search', where);
   };
 
+  // 按模型查找
+  const chooseModel = (item: Navigation) => {
+    where.model = `${item.value}`;
+    where.modelName = `${item.label}`;
+    emit('search', where);
+  };
+
   // 按分类查询
   const onCategoryId = (id: number) => {
     where.categoryId = id;

src/views/cms/article/index.vue

@@ -317,7 +317,7 @@
         data: res?.map((d) => {
           d.value = d.navigationId;
           d.label = d.title;
-          if (d.type != 2) {
+          if (d.model == 'links' || d.model == 'product' || d.path == '/') {
             d.disabled = true;
           }
           return d;

src/views/cms/design/components/search.vue

@@ -7,6 +7,18 @@
       </template>
       <span>添加</span>
     </a-button>
+    <a-tree-select
+      allow-clear
+      :tree-data="navigationList"
+      tree-default-expand-all
+      style="width: 230px"
+      placeholder="请选择栏目"
+      :value="where.categoryId || undefined"
+      :dropdown-style="{ maxHeight: '360px', overflow: 'auto' }"
+      @update:value="(value?: number) => (where.categoryId = value)"
+      @change="onCategoryId"
+    />
+    <a-button @click="reset">重置</a-button>
   </a-space>
 </template>
 
@@ -14,11 +26,14 @@
   import { PlusOutlined } from '@ant-design/icons-vue';
   import type { GradeParam } from '@/api/user/grade/model';
   import { watch } from 'vue';
+  import useSearch from "@/utils/use-search";
+  import type { ArticleParam } from "@/api/cms/article/model";
 
   const props = withDefaults(
     defineProps<{
       // 选中的角色
       selection?: [];
+      navigationList?: Navigator[];
     }>(),
     {}
   );
@@ -35,6 +50,29 @@
     emit('add');
   };
 
+  // 表单数据
+  const { where, resetFields } = useSearch<ArticleParam>({
+    articleId: undefined,
+    navigationId: undefined,
+    categoryId: undefined,
+    merchantId: undefined,
+    status: undefined,
+    keywords: ''
+  });
+
+  // 按分类查询
+  const onCategoryId = (id: number) => {
+    where.categoryId = id;
+    emit('search', where);
+  };
+
+  /*  重置 */
+  const reset = () => {
+    resetFields();
+    type.value = '';
+    reload();
+  };
+
   watch(
     () => props.selection,
     () => {}

src/views/cms/design/index.vue

@@ -15,6 +15,7 @@
             <search
               @search="reload"
               :selection="selection"
+              :navigationList="navigationList"
               @add="openEdit"
               @remove="removeBatch"
               @batchMove="openMove"
@@ -65,7 +66,7 @@
 </template>
 
 <script lang="ts" setup>
-  import { createVNode, ref, watch } from 'vue';
+  import { createVNode, ref } from 'vue';
   import { message, Modal } from 'ant-design-vue';
   import { ExclamationCircleOutlined } from '@ant-design/icons-vue';
   import type { EleProTable } from 'ele-admin-pro';
@@ -82,8 +83,11 @@
   } from '@/api/cms/design';
   import type { Design, DesignParam } from '@/api/cms/design/model';
   import { useRouter } from 'vue-router';
-  import { openPreview, openUrl } from "@/utils/common";
+  import { toTreeData } from 'ele-admin-pro';
+  import { openUrl } from '@/utils/common';
   import { getSiteDomain } from '@/utils/domain';
+  import { Navigation } from '@/api/cms/navigation/model';
+  import { listNavigation } from '@/api/cms/navigation';
 
   // 表格实例
   const tableRef = ref<InstanceType<typeof EleProTable> | null>(null);
@@ -98,6 +102,8 @@
   const showMove = ref(false);
   // 网站域名
   const domain = getSiteDomain();
+  // 栏目数据
+  const navigationList = ref<Navigation[]>();
 
   // 加载状态
   const loading = ref(true);
@@ -243,6 +249,23 @@
   /* 查询 */
   const query = () => {
     loading.value = true;
+    // 加载栏目数据
+    if (!navigationList.value) {
+      listNavigation({}).then((res) => {
+        navigationList.value = toTreeData({
+          data: res?.map((d) => {
+            d.value = d.navigationId;
+            d.label = d.title;
+            if (d.model != 'custom') {
+              d.disabled = true;
+            }
+            return d;
+          }),
+          idField: 'navigationId',
+          parentIdField: 'parentId'
+        });
+      });
+    }
   };
 
   /* 自定义行属性 */

src/views/cms/field/components/website-field-edit.vue

@@ -1,7 +1,7 @@
 <!-- 用户编辑弹窗 -->
 <template>
   <ele-modal
-    :width="500"
+    :width="600"
     :visible="visible"
     :maskClosable="false"
     :title="isUpdate ? '编辑参数' : '添加参数'"
@@ -13,27 +13,23 @@
       ref="formRef"
       :model="form"
       :rules="rules"
-      :label-col="{ md: { span: 5 }, sm: { span: 4 }, xs: { span: 24 } }"
+      :label-col="{ md: { span: 3 }, sm: { span: 4 }, xs: { span: 24 } }"
       :wrapper-col="{ md: { span: 21 }, sm: { span: 22 }, xs: { span: 24 } }"
     >
       <a-form-item label="参数名" name="name">
         <SelectWebsiteField
-          :placeholder="`添加参数`"
+          :placeholder="`可配置参数`"
           class="input-item"
           v-model:value="form.name"
           @done="chooseData"
         />
       </a-form-item>
       <a-form-item label="配置值" name="value">
-        <a-input allow-clear placeholder="淘宝网" v-model:value="form.value" />
+        <a-textarea
-      </a-form-item>
+          :rows="4"
-      <a-form-item label="图片">
+          :maxlength="200"
-        <SelectFile
+          placeholder="网站名称"
-          :placeholder="`请选择图片`"
+          v-model:value="form.value"
-          :limit="1"
-          :data="images"
-          @done="chooseImage"
-          @del="onDeleteItem"
         />
       </a-form-item>
       <a-form-item label="描述" name="comments">
@@ -44,6 +40,23 @@
           v-model:value="form.comments"
         />
       </a-form-item>
+      <a-form-item label="css样式" name="style">
+        <a-textarea
+          :rows="4"
+          :maxlength="200"
+          placeholder="css样式"
+          v-model:value="form.style"
+        />
+      </a-form-item>
+      <a-form-item label="图片">
+        <SelectFile
+          :placeholder="`请选择图片`"
+          :limit="1"
+          :data="images"
+          @done="chooseImage"
+          @del="onDeleteItem"
+        />
+      </a-form-item>
       <a-form-item label="排序" name="sortNumber">
         <a-input-number
           :min="0"
@@ -97,6 +110,7 @@
     modifyRange: undefined,
     defaultValue: undefined,
     comments: '',
+    style: '',
     status: 0,
     sortNumber: 100
   });
@@ -149,6 +163,13 @@
   const chooseData = (data: WebsiteField) => {
     assignFields(data);
     form.value = data.defaultValue;
+    if (data.type == 1) {
+      images.value.push({
+        uid: `${data.id}`,
+        url: data.defaultValue,
+        status: 'done'
+      });
+    }
   };
 
   /* 保存编辑 */

src/views/cms/navigation/components/design-edit.vue

@@ -69,7 +69,7 @@
               :rows="4"
               :maxlength="200"
               placeholder="Tailwind CSS风格"
-              v-model:value="form.styles"
+              v-model:value="form.style"
             />
           </a-space>
         </a-form-item>
@@ -110,7 +110,6 @@ import TinymceEditor from "@/components/TinymceEditor/index.vue";
 import useFormData from "@/utils/use-form-data";
 import {removeSiteInfoCache} from "@/api/cms/website";
 import {FileRecord} from "@/api/system/file/model";
-import category from "@/views/cms/category/index.vue";
 
 // 是否是修改
 const isUpdate = ref(false);
@@ -155,7 +154,7 @@ const { form, resetFields, assignFields } = useFormData<Design>({
   buyUrl: '',
   type: '',
   categoryId: undefined,
-  styles: '',
+  style: '',
   status: 0,
   comments: '',
   sortNumber: 100,

src/views/cms/navigation/components/navigation-edit.vue

@@ -22,6 +22,7 @@
         <a-col
           v-bind="styleResponsive ? { md: 12, sm: 24, xs: 24 } : { span: 12 }"
         >
+          {{ form.parentId }}
           <a-form-item label="上级分类" name="parentId">
             <a-tree-select
               allow-clear
@@ -44,6 +45,7 @@
           <a-form-item
             :label="form.type == 9 ? '链接地址' : '路由地址'"
             name="path"
+            v-if="isUpdate"
           >
             <a-input
               allow-clear
@@ -54,11 +56,20 @@
               @pressEnter="save"
             />
           </a-form-item>
-          <a-form-item label="组件路径" name="component">
+          <a-form-item label="组件路径" name="component" v-if="isUpdate">
             <a-input
               allow-clear
-              placeholder="/pages/[custom].vue"
+              placeholder="/pages/product/detail.vue"
               v-model:value="form.component"
+              disabled
+              @pressEnter="save"
+            />
+          </a-form-item>
+          <a-form-item label="css样式" name="style" v-if="isUpdate">
+            <a-input
+              allow-clear
+              placeholder="Tailwind CSS风格"
+              v-model:value="form.style"
               @pressEnter="save"
             />
           </a-form-item>
@@ -82,40 +93,13 @@
               @done="chooseModel"
             />
           </a-form-item>
-          <a-form-item label="位置" name="top">
+          <a-form-item label="位置" name="top" v-if="isUpdate">
             <a-radio-group v-model:value="form.position" @change="onPosition">
               <a-radio :value="1">顶部</a-radio>
               <a-radio :value="2">底部</a-radio>
               <a-radio :value="0">不限</a-radio>
             </a-radio-group>
           </a-form-item>
-          <a-form-item label="权限" name="">
-            <a-radio-group v-model:value="form.permission">
-              <a-radio :value="0">所有人</a-radio>
-              <a-radio :value="1">登录可见</a-radio>
-              <a-radio :value="2">密码可见</a-radio>
-            </a-radio-group>
-          </a-form-item>
-          <a-form-item label="允许评论" name="">
-            <a-space>
-              <a-switch
-                checked-children="是"
-                un-checked-children="否"
-                :checked="form.hide === 0"
-                @update:checked="updateHideValue"
-              />
-            </a-space>
-          </a-form-item>
-          <a-form-item label="状态" name="hide">
-            <a-space>
-              <a-switch
-                checked-children="显示"
-                un-checked-children="隐藏"
-                :checked="form.hide === 0"
-                @update:checked="updateHideValue"
-              />
-            </a-space>
-          </a-form-item>
           <a-form-item label="排序" name="sortNumber">
             <a-input-number
               :min="0"
@@ -136,6 +120,31 @@
               @del="onDeleteItem"
             />
           </a-form-item>
+          <a-divider style="margin-bottom: 16px" />
+          <a-form-item label="状态" name="hide">
+            <a-space>
+              <a-switch
+                checked-children="显示"
+                un-checked-children="隐藏"
+                :checked="form.hide === 0"
+                @update:checked="updateHideValue"
+              />
+            </a-space>
+          </a-form-item>
+          <a-form-item label="权限" name="permission" v-if="isUpdate">
+            <a-radio-group v-model:value="form.permission">
+              <a-radio :value="0">所有人</a-radio>
+              <a-radio :value="1">登录可见</a-radio>
+              <a-radio :value="2">密码可见</a-radio>
+            </a-radio-group>
+          </a-form-item>
+          <a-form-item
+            label="访问密码"
+            name="password"
+            v-if="form.permission == 2"
+          >
+            <a-tag>{{ form.password }}</a-tag>
+          </a-form-item>
         </a-col>
       </a-row>
     </a-form>
@@ -154,7 +163,6 @@
   import { removeSiteInfoCache } from '@/api/cms/website';
   import { ItemType } from 'ele-admin-pro/es/ele-image-upload/types';
   import { FileRecord } from '@/api/system/file/model';
-  import { uuid } from 'ele-admin-pro';
 
   // 是否开启响应式布局
   const themeStore = useThemeStore();
@@ -190,9 +198,9 @@
   // 表单数据
   const { form, resetFields, assignFields } = useFormData<Navigation>({
     navigationId: undefined,
-    model: '[custom]',
+    model: 'custom',
     code: undefined,
-    modelName: '',
+    modelName: '通用模型',
     type: 0,
     title: '',
     parentId: 0,
@@ -200,10 +208,11 @@
     parentPath: undefined,
     path: undefined,
     component: undefined,
+    componentPath: '/pages/[custom].vue',
     sortNumber: 100,
     hide: 0,
     permission: 0,
-    password: uuid(),
+    password: undefined,
     position: 1,
     top: 0,
     bottom: 1,
@@ -304,9 +313,10 @@
   });
 
   const chooseModel = (item: Navigation) => {
+    console.log(item);
     form.model = `${item.value}`;
     form.modelName = `${item.label}`;
-    form.component = `/pages/${item.value}`;
+    form.componentPath = `${item.component}`;
   };
 
   const chooseFile = (data: FileRecord) => {
@@ -379,10 +389,12 @@
     (visible) => {
       if (visible) {
         form.position = props.position;
+        if (props.parentId) {
+          form.parentId = props.parentId;
+        }
         if (props.data) {
           assignFields({
             ...props.data,
-            parentId: props.data.parentId ? props.data.parentId : 0,
             tempPath: props.data.path
           });
           if (props.data.type == 2) {

src/views/cms/navigation/index.vue

@@ -59,6 +59,9 @@
               <span></span>
             </template>
           </template>
+          <template v-if="column.key === 'model'">
+            <text class="ele-text-placeholder">{{ record.modelName }}</text>
+          </template>
           <template v-if="column.key === 'type'">
             <a-tag v-if="isExternalLink(record.path)" color="purple"
               >外部链接</a-tag
@@ -68,14 +71,7 @@
               内链
             </a-tag>
             <span v-else-if="isDirectory(record)"></span>
-            <a-tag v-else-if="record.type === 0">通用模型</a-tag>
+            <a-tag v-else>{{ record.modelName }}</a-tag>
-            <a-tag v-else-if="record.type === 1" color="purple">页面</a-tag>
-            <a-tag v-else-if="record.type === 2" color="blue">文章列表</a-tag>
-            <a-tag v-else-if="record.type === 3">文章</a-tag>
-            <a-tag v-else-if="record.type === 4" color="cyan">表单</a-tag>
-            <a-tag v-else-if="record.type === 5" color="green">文档</a-tag>
-            <a-tag v-else-if="record.type === 6" color="pink">图片列表</a-tag>
-            <a-tag v-else-if="record.type === 9" color="purple">外部链接</a-tag>
           </template>
           <template v-else-if="column.key === 'title'">
             <a-avatar
@@ -85,9 +81,15 @@
               style="margin-right: 10px"
               v-if="record.image"
             />
-            <a @click="openSpmUrl(record.path, record, record.navigationId)">{{
+            <span class="cursor-pointer" v-if="isDirectory(record)">{{
               record.title
-            }}</a>
+            }}</span>
+            <span
+              v-else
+              @click="openSpmUrl(record.path, record, record.navigationId)"
+              class="cursor-pointer"
+              >{{ record.title }}</span
+            >
           </template>
           <template v-if="column.key === 'showIndex'">
             <a-tag v-if="record.showIndex === 1" color="green">显示</a-tag>
@@ -186,16 +188,11 @@
   import NavigationEdit from './components/navigation-edit.vue';
   import DesignEdit from './components/design-edit.vue';
   import Components from './components/components.vue';
-  import {
+  import { listNavigation, removeNavigation } from '@/api/cms/navigation';
-    listNavigation,
-    removeNavigation,
-    updateNavigation
-  } from '@/api/cms/navigation';
   import type { Navigation, NavigationParam } from '@/api/cms/navigation/model';
   import { openSpmUrl } from '@/utils/common';
   import { getSiteInfo } from '@/api/layout';
   import { Design } from '@/api/cms/design/model';
-  import router from '@/router';
 
   // 表格实例
   const tableRef = ref<InstanceType<typeof EleProTable> | null>(null);
@@ -227,8 +224,8 @@
     },
     {
       title: '模型',
-      dataIndex: 'type',
+      dataIndex: 'model',
-      key: 'type',
+      key: 'model',
       align: 'center',
       width: 120
     },
@@ -319,17 +316,6 @@
     return listNavigation({ ...where });
   };
 
-  // 上移
-  const moveUp = (row?: Navigation) => {
-    updateNavigation({
-      navigationId: row?.navigationId,
-      sortNumber: Number(row?.sortNumber) - 1
-    }).then((msg) => {
-      message.success(msg);
-      reload();
-    });
-  };
-
   /* 数据转为树形结构 */
   const parseData = (data: Navigation[]) => {
     return toTreeData({
@@ -360,21 +346,20 @@
 
   const openDesign = (row?: Navigation) => {
     categoryId.value = row?.navigationId;
-    // TODO 通用模型
+    showDesignEdit.value = true;
-    if (row?.model == '[custom]') {
+    // // TODO 通用模型
-      showDesignEdit.value = true;
+    // if (row?.model == 'custom') {
-      return;
+    //   showDesignEdit.value = true;
-    }
+    //   return;
-
+    // }
-    // TODO 文章列表
+    //
-    if (row?.model === 'article') {
+    // // TODO 文章列表
-      router.push({
+    // if (row?.model === 'article') {
-        path: '/cms/article',
+    //   router.push({
-        query: { categoryId: row.navigationId, type: row.type }
+    //     path: '/cms/article',
-      });
+    //     query: { categoryId: row.navigationId, type: row.type }
-    }
+    //   });
-    console.log(row);
+    // }
-    // /cms/article
   };
 
   const openLayout = (row?: Navigation) => {

src/views/cms/website/components/websiteEdit.vue

@@ -35,6 +35,14 @@
           v-model:value="form.websiteName"
         />
       </a-form-item>
+      <a-form-item label="访问地址" name="domain">
+        <a-input
+          v-model:value="form.websiteCode"
+          placeholder="huawei"
+          addon-before="https://"
+          addon-after=".wsdns.cn"
+        />
+      </a-form-item>
       <a-form-item label="网站描述" name="comments">
         <a-textarea
           :rows="4"
@@ -51,46 +59,52 @@
           v-model:value="form.keywords"
         />
       </a-form-item>
-      <a-form-item label="网站域名" name="domain">
+      <a-form-item label="全局样式" name="style">
-        <a-input v-model:value="form.domain" placeholder="domain.com">
+        <a-textarea
-          <template #addonBefore>
+          :rows="4"
-            <a-select v-model:value="form.prefix" style="width: 90px">
+          :maxlength="200"
-              <a-select-option value="http://">http://</a-select-option>
+          placeholder="全局样式(Tailwind CSS风格)"
-              <a-select-option value="https://">https://</a-select-option>
+          v-model:value="form.style"
-            </a-select>
-          </template>
-        </a-input>
-      </a-form-item>
-      <a-form-item label="后台管理" name="adminUrl">
-        <a-input v-model:value="form.adminUrl" placeholder="admin.domain.com">
-          <template #addonBefore>
-            <a-select v-model:value="form.prefix" style="width: 90px">
-              <a-select-option value="http://">http://</a-select-option>
-              <a-select-option value="https://">https://</a-select-option>
-            </a-select>
-          </template>
-        </a-input>
-      </a-form-item>
-      <a-form-item label="ICP备案号" name="icpNo">
-        <a-input
-          allow-clear
-          placeholder="请输入网站备案"
-          v-model:value="form.icpNo"
         />
       </a-form-item>
-      <a-form-item label="网站类型" name="websiteType">
+      <!--      <a-form-item label="访问域名" name="domain">-->
-        <a-select
+      <!--        <a-input-->
-          :options="websiteType"
+      <!--          v-model:value="form.domain"-->
-          :value="form.websiteType"
+      <!--          placeholder="websoft.top"-->
-          placeholder="请选择主体类型"
+      <!--          addon-before="https://"-->
-          @change="onWebsiteType"
+      <!--          addon-after="websoft.top"-->
-        />
+      <!--        />-->
-      </a-form-item>
+      <!--      </a-form-item>-->
-      <a-form-item label="当前版本" name="version">
+      <!--      <a-form-item label="后台管理" name="adminUrl">-->
-        <span v-if="form.version === 10">免费版</span>
+      <!--        <a-input v-model:value="form.adminUrl" placeholder="admin.domain.com">-->
-        <span v-if="form.version === 20">授权版</span>
+      <!--          <template #addonBefore>-->
-        <span v-if="form.version === 30">永久授权</span>
+      <!--            <a-select v-model:value="form.prefix" style="width: 90px">-->
-      </a-form-item>
+      <!--              <a-select-option value="http://">http://</a-select-option>-->
+      <!--              <a-select-option value="https://">https://</a-select-option>-->
+      <!--            </a-select>-->
+      <!--          </template>-->
+      <!--        </a-input>-->
+      <!--      </a-form-item>-->
+      <!--      <a-form-item label="ICP备案号" name="icpNo">-->
+      <!--        <a-input-->
+      <!--          allow-clear-->
+      <!--          placeholder="请输入网站备案"-->
+      <!--          v-model:value="form.icpNo"-->
+      <!--        />-->
+      <!--      </a-form-item>-->
+      <!--      <a-form-item label="网站类型" name="websiteType">-->
+      <!--        <a-select-->
+      <!--          :options="websiteType"-->
+      <!--          :value="form.websiteType"-->
+      <!--          placeholder="请选择主体类型"-->
+      <!--          @change="onWebsiteType"-->
+      <!--        />-->
+      <!--      </a-form-item>-->
+      <!--      <a-form-item label="当前版本" name="version">-->
+      <!--        <a-tag color="red" v-if="form.version === 10">免费版</a-tag>-->
+      <!--        <a-tag color="green" v-if="form.version === 20">授权版</a-tag>-->
+      <!--        <a-tag color="cyan" v-if="form.version === 30">永久授权</a-tag>-->
+      <!--      </a-form-item>-->
       <a-form-item label="状态" name="status">
         <a-radio-group
           v-model:value="form.status"
@@ -109,6 +123,7 @@
           v-model:value="form.statusText"
         />
       </a-form-item>
+      <!--      <a-divider style="margin-bottom: 24px" />-->
     </a-form>
   </ele-modal>
 </template>
@@ -158,10 +173,12 @@
     websiteId: undefined,
     websiteLogo: undefined,
     websiteName: undefined,
+    websiteCode: undefined,
     keywords: '',
     prefix: '',
     domain: '',
     adminUrl: '',
+    style: '',
     icpNo: undefined,
     email: undefined,
     version: undefined,

src/views/cms/website/index.vue

@@ -28,9 +28,16 @@
             <template v-if="column.key === 'domain'">
               <a-button
                 type="link"
-                @click="openUrl(`${record.prefix}${record.domain}`)"
+                @click="
-                >{{ record.domain }}</a-button
+                  openSpmUrl(
+                    `https://${record.websiteCode}.wsdns.cn`,
+                    record,
+                    record.websiteId
+                  )
+                "
               >
+                {{ record.websiteCode }}.wsdns.cn
+              </a-button>
             </template>
             <template v-if="column.key === 'type'">
               <a-tag v-if="record.type === 1" color="green">是</a-tag>
@@ -42,9 +49,9 @@
               >
             </template>
             <template v-if="column.key === 'version'">
-              <a-tag v-if="record.version === 10">免费版</a-tag>
+              <text v-if="record.version === 10">免费版</text>
-              <a-tag v-if="record.version === 20">授权版</a-tag>
+              <text v-if="record.version === 20">授权版</text>
-              <a-tag v-if="record.version === 30">永久授权</a-tag>
+              <text v-if="record.version === 30">永久授权</text>
             </template>
             <template v-if="column.key === 'status'">
               <a-tag v-if="record.status === 0" color="red">未开通</a-tag>
@@ -88,7 +95,7 @@
     updateWebsite
   } from '@/api/cms/website';
   import type { Website, WebsiteParam } from '@/api/cms/website/model';
-  import { openPreview, openUrl } from '@/utils/common';
+  import { openPreview, openSpmUrl, openUrl } from '@/utils/common';
   import { getSiteDomain } from '@/utils/domain';
 
   // 表格实例

src/views/oa/domain/components/domainEdit.vue

@@ -0,0 +1,193 @@
+<!-- 编辑弹窗 -->
+<template>
+  <ele-modal
+    :width="800"
+    :visible="visible"
+    :maskClosable="false"
+    :maxable="maxable"
+    :title="isUpdate ? '编辑域名' : '授权域名'"
+    :body-style="{ paddingBottom: '28px' }"
+    @update:visible="updateVisible"
+    @ok="save"
+  >
+    <a-form
+      ref="formRef"
+      :model="form"
+      :rules="rules"
+      :label-col="styleResponsive ? { md: 4, sm: 5, xs: 24 } : { flex: '90px' }"
+      :wrapper-col="
+        styleResponsive ? { md: 19, sm: 19, xs: 24 } : { flex: '1' }
+      "
+    >
+      <a-form-item label="域名" name="domain">
+        <a-input
+          allow-clear
+          placeholder="请输入域名"
+          v-model:value="form.domain"
+        />
+      </a-form-item>
+      <a-form-item label="主机记录" name="hostName">
+        <a-tag>{{ form.hostName }}</a-tag>
+      </a-form-item>
+      <a-form-item label="记录值" name="hostValue">
+        <a-tag>{{ form.hostValue }}</a-tag>
+      </a-form-item>
+      <a-form-item label="状态" name="status">
+        <a-radio-group v-model:value="form.status">
+          <a-radio :value="1">已通过</a-radio>
+          <a-radio :value="0">驳回</a-radio>
+        </a-radio-group>
+      </a-form-item>
+      <a-form-item label="驳回原因" name="comments" v-if="form.status == 0">
+        <a-textarea
+          :rows="4"
+          :maxlength="200"
+          placeholder="请输入驳回原因"
+          v-model:value="form.comments"
+        />
+      </a-form-item>
+    </a-form>
+  </ele-modal>
+</template>
+
+<script lang="ts" setup>
+  import { ref, reactive, watch } from 'vue';
+  import { Form, message } from 'ant-design-vue';
+  import { assignObject, uuid } from 'ele-admin-pro';
+  import { addDomain, updateDomain } from '@/api/system/domain';
+  import { Domain } from '@/api/system/domain/model';
+  import { useThemeStore } from '@/store/modules/theme';
+  import { storeToRefs } from 'pinia';
+  import { ItemType } from 'ele-admin-pro/es/ele-image-upload/types';
+  import { FormInstance } from 'ant-design-vue/es/form';
+  import { FileRecord } from '@/api/system/file/model';
+
+  // 是否是修改
+  const isUpdate = ref(false);
+  const useForm = Form.useForm;
+  // 是否开启响应式布局
+  const themeStore = useThemeStore();
+  const { styleResponsive } = storeToRefs(themeStore);
+
+  const props = defineProps<{
+    // 弹窗是否打开
+    visible: boolean;
+    // 修改回显的数据
+    data?: Domain | null;
+  }>();
+
+  const emit = defineEmits<{
+    (e: 'done'): void;
+    (e: 'update:visible', visible: boolean): void;
+  }>();
+
+  // 提交状态
+  const loading = ref(false);
+  // 是否显示最大化切换按钮
+  const maxable = ref(true);
+  // 表格选中数据
+  const formRef = ref<FormInstance | null>(null);
+  const images = ref<ItemType[]>([]);
+
+  // 用户信息
+  const form = reactive<Domain>({
+    id: undefined,
+    domain: undefined,
+    hostName: undefined,
+    hostValue: undefined,
+    sortNumber: undefined,
+    userId: undefined,
+    deleted: undefined,
+    tenantId: undefined,
+    createTime: undefined,
+    updateTime: undefined,
+    status: 0,
+    comments: ''
+  });
+
+  /* 更新visible */
+  const updateVisible = (value: boolean) => {
+    emit('update:visible', value);
+  };
+
+  // 表单验证规则
+  const rules = reactive({
+    domainName: [
+      {
+        required: true,
+        type: 'string',
+        message: '请填写授权域名名称',
+        trigger: 'blur'
+      }
+    ]
+  });
+
+  const chooseImage = (data: FileRecord) => {
+    images.value.push({
+      uid: data.id,
+      url: data.path,
+      status: 'done'
+    });
+    form.image = data.path;
+  };
+
+  const onDeleteItem = (index: number) => {
+    images.value.splice(index, 1);
+    form.image = '';
+  };
+
+  const { resetFields } = useForm(form, rules);
+
+  /* 保存编辑 */
+  const save = () => {
+    if (!formRef.value) {
+      return;
+    }
+    formRef.value
+      .validate()
+      .then(() => {
+        loading.value = true;
+        const formData = {
+          ...form
+        };
+        const saveOrUpdate = isUpdate.value ? updateDomain : addDomain;
+        saveOrUpdate(formData)
+          .then((msg) => {
+            loading.value = false;
+            message.success(msg);
+            updateVisible(false);
+            emit('done');
+          })
+          .catch((e) => {
+            loading.value = false;
+            message.error(e.message);
+          });
+      })
+      .catch(() => {});
+  };
+
+  watch(
+    () => props.visible,
+    (visible) => {
+      if (visible) {
+        images.value = [];
+        if (props.data) {
+          assignObject(form, props.data);
+          if (props.data.image) {
+            images.value.push({
+              uid: uuid(),
+              url: props.data.image,
+              status: 'done'
+            });
+          }
+          isUpdate.value = true;
+        } else {
+          isUpdate.value = false;
+        }
+      } else {
+        resetFields();
+      }
+    },
+    { immediate: true }
+  );
+</script>

src/views/oa/domain/components/search.vue

@@ -0,0 +1,53 @@
+<!-- 搜索表单 -->
+<template>
+  <a-space :size="10" style="flex-wrap: wrap">
+    <a-input-search
+      allow-clear
+      v-model:value="where.keywords"
+      placeholder="租户ID|域名"
+      @search="search"
+      @pressEnter="search"
+    />
+  </a-space>
+</template>
+
+<script lang="ts" setup>
+  import { watch } from 'vue';
+  import useSearch from '@/utils/use-search';
+  import { DomainParam } from '@/api/system/domain/model';
+
+  const props = withDefaults(
+    defineProps<{
+      // 选中的角色
+      selection?: [];
+    }>(),
+    {}
+  );
+
+  const emit = defineEmits<{
+    (e: 'search', where?: DomainParam): void;
+    (e: 'add'): void;
+    (e: 'remove'): void;
+    (e: 'batchMove'): void;
+  }>();
+
+  // 新增
+  const add = () => {
+    emit('add');
+  };
+
+  /* 搜索 */
+  const search = () => {
+    emit('search', where);
+  };
+
+  // 表单数据
+  const { where } = useSearch<DomainParam>({
+    keywords: ''
+  });
+
+  watch(
+    () => props.selection,
+    () => {}
+  );
+</script>

src/views/oa/domain/index.vue

@@ -0,0 +1,246 @@
+<template>
+  <div class="page">
+    <div class="ele-body">
+      <a-card :bordered="false" :body-style="{ padding: '16px' }">
+        <ele-pro-table
+          ref="tableRef"
+          row-key="domainId"
+          :columns="columns"
+          :datasource="datasource"
+          :customRow="customRow"
+          tool-class="ele-toolbar-form"
+          class="sys-org-table"
+        >
+          <template #toolbar>
+            <search
+              @search="reload"
+              :selection="selection"
+              @add="openEdit"
+              @remove="removeBatch"
+              @batchMove="openMove"
+            />
+          </template>
+          <template #bodyCell="{ column, record }">
+            <template v-if="column.key === 'domain'">
+              <text
+                @click="
+                  openSpmUrl(`http://${record.domain}`, record, record.tenantId)
+                "
+              >
+                {{ record.domain }}
+              </text>
+            </template>
+            <template v-if="column.key === 'image'">
+              <a-image :src="record.image" :width="50" />
+            </template>
+            <template v-if="column.key === 'status'">
+              <a-tag v-if="record.status === 1" color="green">已通过</a-tag>
+              <a-tag v-if="record.status === 0" color="red">待审核</a-tag>
+            </template>
+            <template v-if="column.key === 'action'">
+              <a-space>
+                <a @click="openEdit(record)">修改</a>
+                <a-divider type="vertical" />
+                <a-popconfirm
+                  title="确定要删除此记录吗？"
+                  @confirm="remove(record)"
+                >
+                  <a class="ele-text-danger">删除</a>
+                </a-popconfirm>
+              </a-space>
+            </template>
+          </template>
+        </ele-pro-table>
+      </a-card>
+
+      <!-- 编辑弹窗 -->
+      <DomainEdit v-model:visible="showEdit" :data="current" @done="reload" />
+    </div>
+  </div>
+</template>
+
+<script lang="ts" setup>
+  import { createVNode, ref } from 'vue';
+  import { message, Modal } from 'ant-design-vue';
+  import { ExclamationCircleOutlined } from '@ant-design/icons-vue';
+  import type { EleProTable } from 'ele-admin-pro';
+  import { toDateString } from 'ele-admin-pro';
+  import type {
+    DatasourceFunction,
+    ColumnItem
+  } from 'ele-admin-pro/es/ele-pro-table/types';
+  import Search from './components/search.vue';
+  import DomainEdit from './components/domainEdit.vue';
+  import {
+    pageDomain,
+    removeDomain,
+    removeBatchDomain
+  } from '@/api/system/domain';
+  import type { Domain, DomainParam } from '@/api/system/domain/model';
+  import { openSpmUrl } from '@/utils/common';
+
+  // 表格实例
+  const tableRef = ref<InstanceType<typeof EleProTable> | null>(null);
+
+  // 表格选中数据
+  const selection = ref<Domain[]>([]);
+  // 当前编辑数据
+  const current = ref<Domain | null>(null);
+  // 是否显示编辑弹窗
+  const showEdit = ref(false);
+  // 是否显示批量移动弹窗
+  const showMove = ref(false);
+  // 加载状态
+  const loading = ref(true);
+
+  // 表格数据源
+  const datasource: DatasourceFunction = ({
+    page,
+    limit,
+    where,
+    orders,
+    filters
+  }) => {
+    if (filters) {
+      where.status = filters.status;
+    }
+    return pageDomain({
+      ...where,
+      ...orders,
+      page,
+      limit
+    });
+  };
+
+  // 表格列配置
+  const columns = ref<ColumnItem[]>([
+    {
+      title: '租户ID',
+      dataIndex: 'tenantId',
+      key: 'tenantId',
+      width: 80
+    },
+    {
+      title: '域名',
+      dataIndex: 'domain',
+      key: 'domain',
+      align: 'center'
+    },
+    {
+      title: '租户名称',
+      dataIndex: 'tenantName',
+      key: 'tenantName',
+      align: 'center'
+    },
+    {
+      title: '状态',
+      dataIndex: 'status',
+      key: 'status',
+      align: 'center'
+    },
+    {
+      title: '创建时间',
+      dataIndex: 'createTime',
+      key: 'createTime',
+      align: 'center',
+      sorter: true,
+      ellipsis: true,
+      customRender: ({ text }) => toDateString(text, 'yyyy-MM-dd')
+    },
+    {
+      title: '操作',
+      key: 'action',
+      width: 180,
+      fixed: 'right',
+      align: 'center',
+      hideInSetting: true
+    }
+  ]);
+
+  /* 搜索 */
+  const reload = (where?: DomainParam) => {
+    selection.value = [];
+    tableRef?.value?.reload({ where: where });
+  };
+
+  /* 打开编辑弹窗 */
+  const openEdit = (row?: Domain) => {
+    current.value = row ?? null;
+    showEdit.value = true;
+  };
+
+  /* 打开批量移动弹窗 */
+  const openMove = () => {
+    showMove.value = true;
+  };
+
+  /* 删除单个 */
+  const remove = (row: Domain) => {
+    const hide = message.loading('请求中..', 0);
+    removeDomain(row.id)
+      .then((msg) => {
+        hide();
+        message.success(msg);
+        reload();
+      })
+      .catch((e) => {
+        hide();
+        message.error(e.message);
+      });
+  };
+
+  /* 批量删除 */
+  const removeBatch = () => {
+    if (!selection.value.length) {
+      message.error('请至少选择一条数据');
+      return;
+    }
+    Modal.confirm({
+      title: '提示',
+      content: '确定要删除选中的记录吗?',
+      icon: createVNode(ExclamationCircleOutlined),
+      maskClosable: true,
+      onOk: () => {
+        const hide = message.loading('请求中..', 0);
+        removeBatchDomain(selection.value.map((d) => d.id))
+          .then((msg) => {
+            hide();
+            message.success(msg);
+            reload();
+          })
+          .catch((e) => {
+            hide();
+            message.error(e.message);
+          });
+      }
+    });
+  };
+
+  /* 查询 */
+  const query = () => {
+    loading.value = true;
+  };
+
+  /* 自定义行属性 */
+  const customRow = (record: Domain) => {
+    return {
+      // 行点击事件
+      onClick: () => {
+        // console.log(record);
+      },
+      // 行双击事件
+      onDblclick: () => {
+        openEdit(record);
+      }
+    };
+  };
+  query();
+</script>
+
+<script lang="ts">
+  export default {
+    name: 'Domain'
+  };
+</script>
+
+<style lang="less" scoped></style>

src/views/system/dict/components/dict-data-edit.vue

@@ -46,6 +46,15 @@
           v-model:value="form.comments"
         />
       </a-form-item>
+      <a-divider style="margin-bottom: 20px" />
+      <a-form-item label="预留字段" v-bind="validateInfos.component">
+        <a-input
+          allow-clear
+          :maxlength="100"
+          placeholder="预设字段:组件路径(选填)"
+          v-model:value="form.component"
+        />
+      </a-form-item>
     </a-form>
   </ele-modal>
 </template>
@@ -84,6 +93,8 @@
     dictDataId: undefined,
     dictDataName: '',
     dictDataCode: '',
+    path: '',
+    component: '',
     sortNumber: 100,
     comments: ''
   });

src/views/system/dictionary/components/dict-data-edit.vue

@@ -46,6 +46,15 @@
           v-model:value="form.comments"
         />
       </a-form-item>
+      <a-divider style="margin-bottom: 20px" />
+      <a-form-item label="预留字段" v-bind="validateInfos.component">
+        <a-input
+          allow-clear
+          :maxlength="100"
+          placeholder="预设字段:组件路径(选填)"
+          v-model:value="form.component"
+        />
+      </a-form-item>
     </a-form>
   </ele-modal>
 </template>
@@ -87,6 +96,8 @@
     dictDataId: undefined,
     dictDataName: '',
     dictDataCode: '',
+    path: '',
+    component: '',
     sortNumber: 100,
     comments: ''
   });

src/views/system/domain/components/domainEdit.vue

@@ -0,0 +1,193 @@
+<!-- 编辑弹窗 -->
+<template>
+  <ele-modal
+    :width="800"
+    :visible="visible"
+    :maskClosable="false"
+    :maxable="maxable"
+    :title="isUpdate ? '编辑域名' : '授权域名'"
+    :body-style="{ paddingBottom: '28px' }"
+    @update:visible="updateVisible"
+    @ok="save"
+  >
+    <a-form
+      ref="formRef"
+      :model="form"
+      :rules="rules"
+      :label-col="styleResponsive ? { md: 4, sm: 5, xs: 24 } : { flex: '90px' }"
+      :wrapper-col="
+        styleResponsive ? { md: 19, sm: 19, xs: 24 } : { flex: '1' }
+      "
+    >
+      <a-form-item label="域名" name="domain">
+        <a-input
+          allow-clear
+          placeholder="请输入域名"
+          v-model:value="form.domain"
+        />
+      </a-form-item>
+      <a-form-item label="主机记录" name="hostName">
+        <a-tag>{{ form.hostName }}</a-tag>
+      </a-form-item>
+      <a-form-item label="记录值" name="hostValue">
+        <a-tag>{{ form.hostValue }}</a-tag>
+      </a-form-item>
+      <a-form-item label="状态" name="status">
+        <a-radio-group v-model:value="form.status">
+          <a-radio :value="1">已通过</a-radio>
+          <a-radio :value="0">驳回</a-radio>
+        </a-radio-group>
+      </a-form-item>
+      <a-form-item label="驳回原因" name="comments" v-if="form.status == 0">
+        <a-textarea
+          :rows="4"
+          :maxlength="200"
+          placeholder="请输入驳回原因"
+          v-model:value="form.comments"
+        />
+      </a-form-item>
+    </a-form>
+  </ele-modal>
+</template>
+
+<script lang="ts" setup>
+  import { ref, reactive, watch } from 'vue';
+  import { Form, message } from 'ant-design-vue';
+  import { assignObject, uuid } from 'ele-admin-pro';
+  import { addDomain, updateDomain } from '@/api/system/domain';
+  import { Domain } from '@/api/system/domain/model';
+  import { useThemeStore } from '@/store/modules/theme';
+  import { storeToRefs } from 'pinia';
+  import { ItemType } from 'ele-admin-pro/es/ele-image-upload/types';
+  import { FormInstance } from 'ant-design-vue/es/form';
+  import { FileRecord } from '@/api/system/file/model';
+
+  // 是否是修改
+  const isUpdate = ref(false);
+  const useForm = Form.useForm;
+  // 是否开启响应式布局
+  const themeStore = useThemeStore();
+  const { styleResponsive } = storeToRefs(themeStore);
+
+  const props = defineProps<{
+    // 弹窗是否打开
+    visible: boolean;
+    // 修改回显的数据
+    data?: Domain | null;
+  }>();
+
+  const emit = defineEmits<{
+    (e: 'done'): void;
+    (e: 'update:visible', visible: boolean): void;
+  }>();
+
+  // 提交状态
+  const loading = ref(false);
+  // 是否显示最大化切换按钮
+  const maxable = ref(true);
+  // 表格选中数据
+  const formRef = ref<FormInstance | null>(null);
+  const images = ref<ItemType[]>([]);
+
+  // 用户信息
+  const form = reactive<Domain>({
+    id: undefined,
+    domain: undefined,
+    hostName: undefined,
+    hostValue: undefined,
+    sortNumber: undefined,
+    userId: undefined,
+    deleted: undefined,
+    tenantId: undefined,
+    createTime: undefined,
+    updateTime: undefined,
+    status: 0,
+    comments: ''
+  });
+
+  /* 更新visible */
+  const updateVisible = (value: boolean) => {
+    emit('update:visible', value);
+  };
+
+  // 表单验证规则
+  const rules = reactive({
+    domainName: [
+      {
+        required: true,
+        type: 'string',
+        message: '请填写授权域名名称',
+        trigger: 'blur'
+      }
+    ]
+  });
+
+  const chooseImage = (data: FileRecord) => {
+    images.value.push({
+      uid: data.id,
+      url: data.path,
+      status: 'done'
+    });
+    form.image = data.path;
+  };
+
+  const onDeleteItem = (index: number) => {
+    images.value.splice(index, 1);
+    form.image = '';
+  };
+
+  const { resetFields } = useForm(form, rules);
+
+  /* 保存编辑 */
+  const save = () => {
+    if (!formRef.value) {
+      return;
+    }
+    formRef.value
+      .validate()
+      .then(() => {
+        loading.value = true;
+        const formData = {
+          ...form
+        };
+        const saveOrUpdate = isUpdate.value ? updateDomain : addDomain;
+        saveOrUpdate(formData)
+          .then((msg) => {
+            loading.value = false;
+            message.success(msg);
+            updateVisible(false);
+            emit('done');
+          })
+          .catch((e) => {
+            loading.value = false;
+            message.error(e.message);
+          });
+      })
+      .catch(() => {});
+  };
+
+  watch(
+    () => props.visible,
+    (visible) => {
+      if (visible) {
+        images.value = [];
+        if (props.data) {
+          assignObject(form, props.data);
+          if (props.data.image) {
+            images.value.push({
+              uid: uuid(),
+              url: props.data.image,
+              status: 'done'
+            });
+          }
+          isUpdate.value = true;
+        } else {
+          isUpdate.value = false;
+        }
+      } else {
+        resetFields();
+      }
+    },
+    { immediate: true }
+  );
+</script>

src/views/system/domain/components/search.vue

@@ -0,0 +1,53 @@
+<!-- 搜索表单 -->
+<template>
+  <a-space :size="10" style="flex-wrap: wrap">
+    <a-input-search
+      allow-clear
+      v-model:value="where.keywords"
+      placeholder="租户ID|域名"
+      @search="search"
+      @pressEnter="search"
+    />
+  </a-space>
+</template>
+
+<script lang="ts" setup>
+  import { watch } from 'vue';
+  import useSearch from '@/utils/use-search';
+  import { DomainParam } from '@/api/system/domain/model';
+
+  const props = withDefaults(
+    defineProps<{
+      // 选中的角色
+      selection?: [];
+    }>(),
+    {}
+  );
+
+  const emit = defineEmits<{
+    (e: 'search', where?: DomainParam): void;
+    (e: 'add'): void;
+    (e: 'remove'): void;
+    (e: 'batchMove'): void;
+  }>();
+
+  // 新增
+  const add = () => {
+    emit('add');
+  };
+
+  /* 搜索 */
+  const search = () => {
+    emit('search', where);
+  };
+
+  // 表单数据
+  const { where } = useSearch<DomainParam>({
+    keywords: ''
+  });
+
+  watch(
+    () => props.selection,
+    () => {}
+  );
+</script>

src/views/system/domain/index.vue

@@ -0,0 +1,246 @@
+<template>
+  <div class="page">
+    <div class="ele-body">
+      <a-card :bordered="false" :body-style="{ padding: '16px' }">
+        <ele-pro-table
+          ref="tableRef"
+          row-key="domainId"
+          :columns="columns"
+          :datasource="datasource"
+          :customRow="customRow"
+          tool-class="ele-toolbar-form"
+          class="sys-org-table"
+        >
+          <template #toolbar>
+            <search
+              @search="reload"
+              :selection="selection"
+              @add="openEdit"
+              @remove="removeBatch"
+              @batchMove="openMove"
+            />
+          </template>
+          <template #bodyCell="{ column, record }">
+            <template v-if="column.key === 'domain'">
+              <text
+                @click="
+                  openSpmUrl(`http://${record.domain}`, record, record.tenantId)
+                "
+              >
+                {{ record.domain }}
+              </text>
+            </template>
+            <template v-if="column.key === 'image'">
+              <a-image :src="record.image" :width="50" />
+            </template>
+            <template v-if="column.key === 'status'">
+              <a-tag v-if="record.status === 1" color="green">已通过</a-tag>
+              <a-tag v-if="record.status === 0" color="red">待审核</a-tag>
+            </template>
+            <template v-if="column.key === 'action'">
+              <a-space>
+                <a @click="openEdit(record)">修改</a>
+                <a-divider type="vertical" />
+                <a-popconfirm
+                  title="确定要删除此记录吗？"
+                  @confirm="remove(record)"
+                >
+                  <a class="ele-text-danger">删除</a>
+                </a-popconfirm>
+              </a-space>
+            </template>
+          </template>
+        </ele-pro-table>
+      </a-card>
+
+      <!-- 编辑弹窗 -->
+      <DomainEdit v-model:visible="showEdit" :data="current" @done="reload" />
+    </div>
+  </div>
+</template>
+
+<script lang="ts" setup>
+  import { createVNode, ref } from 'vue';
+  import { message, Modal } from 'ant-design-vue';
+  import { ExclamationCircleOutlined } from '@ant-design/icons-vue';
+  import type { EleProTable } from 'ele-admin-pro';
+  import { toDateString } from 'ele-admin-pro';
+  import type {
+    DatasourceFunction,
+    ColumnItem
+  } from 'ele-admin-pro/es/ele-pro-table/types';
+  import Search from './components/search.vue';
+  import DomainEdit from './components/domainEdit.vue';
+  import {
+    pageDomain,
+    removeDomain,
+    removeBatchDomain
+  } from '@/api/system/domain';
+  import type { Domain, DomainParam } from '@/api/system/domain/model';
+  import { openSpmUrl } from '@/utils/common';
+
+  // 表格实例
+  const tableRef = ref<InstanceType<typeof EleProTable> | null>(null);
+
+  // 表格选中数据
+  const selection = ref<Domain[]>([]);
+  // 当前编辑数据
+  const current = ref<Domain | null>(null);
+  // 是否显示编辑弹窗
+  const showEdit = ref(false);
+  // 是否显示批量移动弹窗
+  const showMove = ref(false);
+  // 加载状态
+  const loading = ref(true);
+
+  // 表格数据源
+  const datasource: DatasourceFunction = ({
+    page,
+    limit,
+    where,
+    orders,
+    filters
+  }) => {
+    if (filters) {
+      where.status = filters.status;
+    }
+    return pageDomain({
+      ...where,
+      ...orders,
+      page,
+      limit
+    });
+  };
+
+  // 表格列配置
+  const columns = ref<ColumnItem[]>([
+    {
+      title: '租户ID',
+      dataIndex: 'tenantId',
+      key: 'tenantId',
+      width: 80
+    },
+    {
+      title: '域名',
+      dataIndex: 'domain',
+      key: 'domain',
+      align: 'center'
+    },
+    {
+      title: '租户名称',
+      dataIndex: 'tenantName',
+      key: 'tenantName',
+      align: 'center'
+    },
+    {
+      title: '状态',
+      dataIndex: 'status',
+      key: 'status',
+      align: 'center'
+    },
+    {
+      title: '创建时间',
+      dataIndex: 'createTime',
+      key: 'createTime',
+      align: 'center',
+      sorter: true,
+      ellipsis: true,
+      customRender: ({ text }) => toDateString(text, 'yyyy-MM-dd')
+    },
+    {
+      title: '操作',
+      key: 'action',
+      width: 180,
+      fixed: 'right',
+      align: 'center',
+      hideInSetting: true
+    }
+  ]);
+
+  /* 搜索 */
+  const reload = (where?: DomainParam) => {
+    selection.value = [];
+    tableRef?.value?.reload({ where: where });
+  };
+
+  /* 打开编辑弹窗 */
+  const openEdit = (row?: Domain) => {
+    current.value = row ?? null;
+    showEdit.value = true;
+  };
+
+  /* 打开批量移动弹窗 */
+  const openMove = () => {
+    showMove.value = true;
+  };
+
+  /* 删除单个 */
+  const remove = (row: Domain) => {
+    const hide = message.loading('请求中..', 0);
+    removeDomain(row.id)
+      .then((msg) => {
+        hide();
+        message.success(msg);
+        reload();
+      })
+      .catch((e) => {
+        hide();
+        message.error(e.message);
+      });
+  };
+
+  /* 批量删除 */
+  const removeBatch = () => {
+    if (!selection.value.length) {
+      message.error('请至少选择一条数据');
+      return;
+    }
+    Modal.confirm({
+      title: '提示',
+      content: '确定要删除选中的记录吗?',
+      icon: createVNode(ExclamationCircleOutlined),
+      maskClosable: true,
+      onOk: () => {
+        const hide = message.loading('请求中..', 0);
+        removeBatchDomain(selection.value.map((d) => d.id))
+          .then((msg) => {
+            hide();
+            message.success(msg);
+            reload();
+          })
+          .catch((e) => {
+            hide();
+            message.error(e.message);
+          });
+      }
+    });
+  };
+
+  /* 查询 */
+  const query = () => {
+    loading.value = true;
+  };
+
+  /* 自定义行属性 */
+  const customRow = (record: Domain) => {
+    return {
+      // 行点击事件
+      onClick: () => {
+        // console.log(record);
+      },
+      // 行双击事件
+      onDblclick: () => {
+        openEdit(record);
+      }
+    };
+  };
+  query();
+</script>
+
+<script lang="ts">
+  export default {
+    name: 'Domain'
+  };
+</script>
+
+<style lang="less" scoped></style>

src/views/system/field/components/website-field-edit.vue

@@ -17,20 +17,14 @@
       :wrapper-col="{ md: { span: 21 }, sm: { span: 22 }, xs: { span: 24 } }"
     >
       <a-form-item label="参数名" name="name">
-        <!--        <ChooseWebsiteField-->
+        <a-input allow-clear placeholder="siteName" v-model:value="form.name" />
-        <!--          v-model:value="form.name"-->
-        <!--          :placeholder="`选择参数`"-->
-        <!--          @done="chooseData"-->
-        <!--        />-->
-        <SelectWebsiteField
-          :placeholder="`添加参数`"
-          class="input-item"
-          v-model:value="form.name"
-          @done="chooseData"
-        />
       </a-form-item>
       <a-form-item label="配置值" name="value">
-        <a-input allow-clear placeholder="淘宝网" v-model:value="form.value" />
+        <a-input
+          allow-clear
+          placeholder="网宿软件"
+          v-model:value="form.value"
+        />
       </a-form-item>
       <a-form-item label="图片格式">
         <SelectFile
@@ -80,7 +74,10 @@
   import { FormInstance } from 'ant-design-vue/es/form';
   import { WebsiteField } from '@/api/system/website/field/model';
   import useFormData from '@/utils/use-form-data';
-  import { addWebsiteField, updateWebsiteField } from '@/api/system/website/field';
+  import {
+    addWebsiteField,
+    updateWebsiteField
+  } from '@/api/system/website/field';
   import { message } from 'ant-design-vue/es';
   import { removeSiteInfoCache } from '@/api/system/website';
   import { ItemType } from 'ele-admin-pro/es/ele-image-upload/types';

src/views/system/menu/index.vue

@@ -33,9 +33,9 @@
             <a-button type="dashed" class="ele-btn-icon" @click="foldAll">
               折叠全部
             </a-button>
-            <!--            <a-button type="dashed" class="ele-btn-icon" @click="cloneMenu">-->
+            <a-button type="dashed" class="ele-btn-icon" @click="cloneMenu">
-            <!--              一键克隆-->
+              一键克隆
-            <!--            </a-button>-->
+            </a-button>
           </a-space>
         </template>
         <template #bodyCell="{ column, record }">