Merge branch 'cpq-dev' of wangfan/adweb3-web into master

src/views/adweb/product/AdwebProduct.data.ts

@@ -13,11 +13,13 @@ export const columns: BasicColumn[] = [
   {
     title: '更新日期',
     align: 'center',
+    sorter: true,
     dataIndex: 'updateTime',
   },
   {
     title: '站点推送时间',
     align: 'center',
+    sorter: true,
     dataIndex: 'requestTime',
   },
   {
@@ -28,6 +30,7 @@ export const columns: BasicColumn[] = [
   {
     title: '产品ID',
     align: 'center',
+    sorter: true,
     dataIndex: 'productId',
   },
   {
@@ -38,6 +41,7 @@ export const columns: BasicColumn[] = [
   {
     title: '产品状态',
     align: 'center',
+    sorter: true,
     dataIndex: 'actionType',
   },
   {

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

@@ -13,12 +13,15 @@ export const columns: BasicColumn[] = [
     title: '客户名',
     align: 'left',
     dataIndex: 'uid_dictText',
-    width: '160px',
+    width: 160,
+    resizable: true,
   },
   {
     title: '渠道商',
     align: 'left',
     dataIndex: 'channelProviderName',
+    resizable: true,
+    width: 160,
     customRender: function ({ text }) {
       if (text) {
         return text;
@@ -31,6 +34,8 @@ export const columns: BasicColumn[] = [
     title: '站点名称',
     align: 'left',
     dataIndex: 'name',
+    width: 250,
+    resizable: true,
   },
   {
     title: '站点域名',

src/views/adweb/site/AdwebSiteList.vue

@@ -362,16 +362,20 @@
 
     // 站点已发布，并且是正式域名时可以添加GTM 代码
     if (record.isDomain === 1 && record.status === 1) {
-      dropDown.push({
-        label: 'GTM代码',
-        onClick: addGtm.bind(null, record),
-      },{
-        label: 'Google Ads',
-        onClick: bindGoogleAds.bind(null, record),
-      });
+      dropDown.push(
+        {
+          label: 'GTM代码',
+          onClick: addGtm.bind(null, record),
+        },
+        {
+          label: 'Google Ads',
+          onClick: bindGoogleAds.bind(null, record),
+        }
+      );
     }
 
-    if (isAdmin.value) {
+    // 当前是管理员，并且站点是被删除状态
+    if (isAdmin.value && record.status === 0) {
       dropDown.push({
         label: '资源删除',
         popConfirm: {

src/views/system/user/user.data.ts

@@ -193,6 +193,7 @@ export const formSchema: FormSchema[] = [
     label: '角色',
     field: 'selectedroles',
     component: 'ApiSelect',
+    required: true,
     componentProps: {
       mode: 'multiple',
       api: getAllRolesListNoByTenant,
@@ -236,6 +237,7 @@ export const formSchema: FormSchema[] = [
     label: '租户',
     field: 'relTenantIds',
     component: 'ApiSelect',
+    required: true,
     componentProps: {
       mode: 'multiple',
       api: getAllTenantList,