站点管理优化

src/views/adweb/site/AdwebSite.data.ts

@@ -22,7 +22,7 @@ export const columns: BasicColumn[] = [
     align: 'left',
     dataIndex: 'channelProviderName',
     resizable: true,
-    width: 160,
+    width: 200,
     customRender: function ({ text }) {
       if (text) {
         return text;
@@ -35,7 +35,7 @@ export const columns: BasicColumn[] = [
     title: '站点名称',
     align: 'left',
     dataIndex: 'name',
-    width: 250,
+    width: 280,
     resizable: true,
   },
   {
@@ -101,9 +101,9 @@ export const columns: BasicColumn[] = [
 
 // 高级查询数据
 export const superQuerySchema = {
-  uid: { title: '用户ID,与用户表关联', order: 0, view: 'sel_user', type: 'string' },
+  uid: { title: '创建人', order: 0, view: 'sel_user', type: 'string' },
   code: {
-    title: '站点code,生成6位长度随机码，取值范围[a-z0-9],保证系统唯一',
+    title: '站点code',
     order: 1,
     view: 'text',
     type: 'string',
@@ -111,7 +111,7 @@ export const superQuerySchema = {
   name: { title: '站点名称', order: 2, view: 'text', type: 'string' },
   domain: { title: '站点域名', order: 3, view: 'text', type: 'string' },
   status: {
-    title: '当前状态：0：已删除；1：正常；2:未发布  3:拉取测试站点中 ；4：发布正式站点中 ;5:拉取异常',
+    title: '当前状态',
     order: 4,
     view: 'number',
     type: 'number',

src/views/adweb/site/AdwebSiteList.vue

@@ -300,8 +300,12 @@
    * 编辑事件
    */
   function handleEdit(record: Recordable) {
-    registerModal.value.disableSubmit = false;
-    registerModal.value.edit(record);
+    if (isAdmin.value) {
+      registerModal.value.disableSubmit = false;
+      registerModal.value.edit(record);
+    } else {
+      return window.open(record.domain + '/adweb-admin/');
+    }
   }
 
   /**

src/views/adweb/site/components/AdwebSiteForm.vue

@@ -4,31 +4,60 @@
       <template #detail>
         <a-form ref="formRef" class="antd-modal-form" :labelCol="labelCol" :wrapperCol="wrapperCol">
           <a-row>
-						<a-col :span="24">
-							<a-form-item label="用户ID,与用户表关联" v-bind="validateInfos.uid">
-						<j-select-user v-model:value="formData.uid"  allow-clear />
-							</a-form-item>
-						</a-col>
-						<a-col :span="24">
-							<a-form-item label="站点名称" v-bind="validateInfos.name">
-								<a-input v-model:value="formData.name" placeholder="请输入站点名称"  allow-clear ></a-input>
-							</a-form-item>
-						</a-col>
-						<a-col :span="24">
-							<a-form-item label="站点域名" v-bind="validateInfos.domain">
-								<a-input v-model:value="formData.domain" placeholder="请输入站点域名"  allow-clear ></a-input>
-							</a-form-item>
-						</a-col>
-						<a-col :span="24">
-							<a-form-item label="到期时间，默认为ctime+1年" v-bind="validateInfos.etime">
-								<a-date-picker placeholder="请选择到期时间，默认为ctime+1年"  v-model:value="formData.etime" showTime value-format="YYYY-MM-DD HH:mm:ss" style="width: 100%"  allow-clear />
-							</a-form-item>
-						</a-col>
-						<a-col :span="24">
-							<a-form-item label="发布正式环境时间（首次发布）" v-bind="validateInfos.issueTime">
-								<a-date-picker placeholder="请选择发布正式环境时间（首次发布）"  v-model:value="formData.issueTime" showTime value-format="YYYY-MM-DD HH:mm:ss" style="width: 100%"  allow-clear />
-							</a-form-item>
-						</a-col>
+            <a-col :span="24">
+              <a-form-item label="创建人" v-bind="validateInfos.uid">
+                <j-select-user v-model:value="formData.uid" allow-clear disabled="true" />
+              </a-form-item>
+            </a-col>
+            <a-col :span="24">
+              <a-form-item label="站点名称" v-bind="validateInfos.name">
+                <a-input v-model:value="formData.name" placeholder="请输入站点名称" allow-clear />
+              </a-form-item>
+            </a-col>
+            <a-col :span="24">
+              <a-form-item label="是否发布" v-bind="validateInfos.status">
+                <a-radio-group v-model:value="formData.status" option-type="button" :options="statusList" />
+              </a-form-item>
+            </a-col>
+            <a-col :span="24">
+              <a-form-item label="是否有正式域名" v-bind="validateInfos.isDomain">
+                <a-radio-group v-model:value="formData.isDomain" option-type="button" :options="isDomainList" />
+              </a-form-item>
+            </a-col>
+            <a-col :span="24">
+              <a-form-item label="站点域名" v-bind="validateInfos.domain">
+                <a-input v-model:value="formData.domain" placeholder="请输入站点域名" allow-clear />
+              </a-form-item>
+            </a-col>
+            <a-col :span="24">
+              <a-form-item label="临时站点域名" v-bind="validateInfos.domainDev">
+                <a-input v-model:value="formData.domainDev" placeholder="请输入临时站点域名" allow-clear disabled="true" />
+              </a-form-item>
+            </a-col>
+            <a-col :span="24">
+              <a-form-item label="到期时间" v-bind="validateInfos.etime">
+                <a-date-picker
+                  placeholder="请选择到期时间，默认为ctime+1年"
+                  v-model:value="formData.etime"
+                  showTime
+                  value-format="YYYY-MM-DD HH:mm:ss"
+                  style="width: 100%"
+                  allow-clear
+                />
+              </a-form-item>
+            </a-col>
+            <a-col :span="24">
+              <a-form-item label="发布正式时间" v-bind="validateInfos.issueTime">
+                <a-date-picker
+                  placeholder="请选择发布正式环境时间（首次发布）"
+                  v-model:value="formData.issueTime"
+                  showTime
+                  value-format="YYYY-MM-DD HH:mm:ss"
+                  style="width: 100%"
+                  allow-clear
+                />
+              </a-form-item>
+            </a-col>
           </a-row>
         </a-form>
       </template>
@@ -37,8 +66,7 @@
 </template>
 
 <script lang="ts" setup>
-  import { ref, reactive, defineExpose, nextTick, defineProps, computed, onMounted } from 'vue';
-  import { defHttp } from '/src/utils/http/axios';
+  import { computed, defineExpose, defineProps, nextTick, reactive, ref } from 'vue';
   import { useMessage } from '/src/hooks/web/useMessage';
   import JSelectUser from '/src/components/Form/src/jeecg/components/JSelectUser.vue';
   import { getValueType } from '/src/utils';
@@ -48,8 +76,8 @@
 
   const props = defineProps({
     formDisabled: { type: Boolean, default: false },
-    formData: { type: Object, default: () => ({})},
-    formBpm: { type: Boolean, default: true }
+    formData: { type: Object, default: () => ({}) },
+    formBpm: { type: Boolean, default: true },
   });
   const formRef = ref();
   const useForm = Form.useForm;
@@ -59,6 +87,9 @@
     uid: '',
     name: '',
     domain: '',
+    isDomain: 0,
+    status: 0,
+    domainDev: '',
     etime: '',
     issueTime: '',
   });
@@ -68,26 +99,67 @@
   const confirmLoading = ref<boolean>(false);
   //表单验证
   const validatorRules = reactive({
-    uid: [{ required: true, message: '请输入用户ID,与用户表关联!'},],
-    name: [{ required: true, message: '请输入站点名称!'},],
-    domain: [{ required: true, message: '请输入站点域名!'},],
-    etime: [{ required: true, message: '请输入到期时间，默认为ctime+1年!'},],
+    uid: [{ required: true, message: '请输入用户ID,与用户表关联!' }],
+    name: [{ required: true, message: '请输入站点名称!' }],
+    domain: [{ required: true, message: '请输入站点域名!' }],
+    etime: [{ required: true, message: '请输入到期时间，默认为ctime+1年!' }],
   });
   const { resetFields, validate, validateInfos } = useForm(formData, validatorRules, { immediate: false });
 
+  const isDomainList = ref([
+    {
+      value: 0,
+      label: '否',
+    },
+    {
+      value: 1,
+      label: '是',
+    },
+  ]);
+
+  const statusList = ref([
+    {
+      value: 0,
+      label: '已删除',
+    },
+    {
+      value: 1,
+      label: '已发布',
+    },
+    {
+      value: 2,
+      label: '临时站点已创建',
+    },
+    {
+      value: 3,
+      label: '临时站点正在创建',
+    },
+    {
+      value: 4,
+      label: '临时站点创建失败',
+    },
+    {
+      value: 5,
+      label: '正式站点正在创建',
+    },
+    {
+      value: 6,
+      label: '正式站点创建失败',
+    },
+  ]);
+
   // 表单禁用
-  const disabled = computed(()=>{
-    if(props.formBpm === true){
-      if(props.formData.disabled === false){
+  const disabled = computed(() => {
+    if (props.formBpm === true) {
+      if (props.formData.disabled === false) {
         return false;
-      }else{
+      } else {
         return true;
       }
     }
     return props.formDisabled;
   });
 
-
   /**
    * 新增
    */
@@ -103,10 +175,10 @@
       resetFields();
       const tmpData = {};
       Object.keys(formData).forEach((key) => {
-        if(record.hasOwnProperty(key)){
-          tmpData[key] = record[key]
+        if (record.hasOwnProperty(key)) {
+          tmpData[key] = record[key];
         }
-      })
+      });
       //赋值
       Object.assign(formData, tmpData);
     });
@@ -150,7 +222,6 @@
       });
   }
 
-
   defineExpose({
     add,
     edit,