feat(resources): fix review bugs

Author: betterdancing

packages/configurator/src/source-select-configurator/SourceSelectConfigurator.vue

@@ -74,9 +74,18 @@
     </tiny-popover>
   </div>
 </template>
-<script>
+<script lang="ts">
 import { ref, watch } from 'vue'
-import { Popover, Button, Input, Search, Select, Divider, Radio } from '@opentiny/vue'
+import type { Component } from 'vue'
+import {
+  Popover as TinyPopover,
+  Button as TinyButton,
+  Input as TinyInput,
+  Search as TinySearch,
+  Select as TinySelect,
+  Divider as TinyDivider,
+  Radio as TinyRadio
+} from '@opentiny/vue'
 import { iconClose, iconSearch } from '@opentiny/vue-icon'
 import { SearchEmpty } from '@opentiny/tiny-engine-common'
 import { useNotify } from '@opentiny/tiny-engine-meta-register'
@@ -94,14 +103,14 @@ const closePopover = () => {
 
 export default {
   components: {
-    TinyPopover: Popover,
-    TinyButton: Button,
-    TinyInput: Input,
-    TinySearch: Search,
-    TinySelect: Select,
-    TinyDivider: Divider,
-    TinyRadio: Radio,
-    SearchEmpty,
+    TinyPopover: TinyPopover as Component,
+    TinyButton: TinyButton as Component,
+    TinyInput: TinyInput as Component,
+    TinySearch: TinySearch as Component,
+    TinySelect: TinySelect as Component,
+    TinyDivider: TinyDivider as Component,
+    TinyRadio: TinyRadio as Component,
+    SearchEmpty: SearchEmpty as Component,
     TinyIconClose: iconClose(),
     TinyIconSearch: iconSearch()
   },
@@ -205,7 +214,7 @@ export default {
     position: relative;
     width: 150px;
     height: 96px;
-    background-color: #f5f5f5;
+    background-color: var(--te-common-bg-container);
     img {
       width: 100%;
       height: 100%;
@@ -228,10 +237,10 @@ export default {
         width: 70px;
         height: 22px;
         line-height: 22px;
-        border: 1px solid #fff;
+        border: 1px solid var(--te-common-bg-popover);
         border-radius: 4px;
         text-align: center;
-        color: #fff;
+        color: var(--te-common-text-inverse);
         cursor: pointer;
       }
     }
@@ -305,7 +314,7 @@ export default {
         width: 120px;
         height: 78px;
         position: relative;
-        background-color: #f5f5f5;
+        background-color: var(--te-common-bg-container);
         border-radius: 2px;
 
         .tiny-radio {
@@ -334,7 +343,7 @@ export default {
           text-align: center;
           line-height: 28px;
           width: 120px;
-          color: #fff;
+          color: var(--te-common-text-inverse);
           white-space: nowrap;
           overflow: hidden;
           text-overflow: ellipsis;

packages/configurator/src/source-select-configurator/http.ts

@@ -10,7 +10,6 @@
  *
  */
 
-/* metaService: engine.plugins.appmanage.http */
 import { getMetaApi, META_SERVICE } from '@opentiny/tiny-engine-meta-register'
 
 const baseUrl = '/material-center/api'

packages/design-core/assets/plugin-icon-resource.svg

@@ -18,7 +18,7 @@
         ></svg-button>
       </template>
       <template #content>
-        <div class="resouce-list">
+        <div class="resource-list">
           <div
             v-for="item in resourceList"
             :key="item.id"
@@ -35,7 +35,7 @@
         <search-empty :isShow="!resourceList?.length" />
       </template>
     </plugin-panel>
-    <resource-setting @create-group="createCategory"></resource-setting>
+    <resource-setting @create-group="refreshCategory"></resource-setting>
     <resource-list></resource-list>
   </div>
 </template>
@@ -115,14 +115,9 @@ export default {
         })
     }
 
-    const createCategory = () => {
+    const refreshCategory = () => {
       getCategoryList()
     }
-
-    const updateCategory = (data) => {
-      resourceList.value = data
-    }
-
     const openResourceList = (data) => {
       setItemActive(data)
       openResourceListPanel(data)
@@ -140,14 +135,13 @@ export default {
       pluginPanelClosed,
       openCategoryForm,
       openResourceList,
-      createCategory,
-      updateCategory
+      refreshCategory
     }
   }
 }
 </script>
 <style lang="less" scoped>
-.resouce-list {
+.resource-list {
   margin: 8px 0;
 
   .resource-item {

packages/plugins/resource/src/Main.vue

@@ -1,9 +1,7 @@
 <template>
   <plugin-setting v-if="isShow" :fixed-name="PLUGIN_NAME.Resource" :align="align" :title="state.title">
     <template #header>
-      <button-group>
-        <svg-button name="close" @click="cancelResourceList"></svg-button>
-      </button-group>
+      <svg-button name="close" @click="cancelResourceList"></svg-button>
     </template>
 
     <template #content>
@@ -45,7 +43,7 @@
                       :visible-arrow="false"
                       trigger="manual"
                       :content="copyTipContent"
-                      :modelValue="item.id && item.id === copySourceId"
+                      :modelValue="item?.id === copySourceId"
                     >
                       <template #reference>
                         <span @click="copySourceLink(item)">复制</span>
@@ -160,7 +158,7 @@ import {
 } from '@opentiny/vue'
 import { iconPopup } from '@opentiny/vue-icon'
 import { useLayout, useModal, useNotify } from '@opentiny/tiny-engine-meta-register'
-import { PluginSetting, ButtonGroup, SvgButton, SearchEmpty } from '@opentiny/tiny-engine-common'
+import { PluginSetting, SvgButton, SearchEmpty } from '@opentiny/tiny-engine-common'
 import { fetchResourceListByGroupId, batchCreateResource, updateResourceGroup } from './js/http'
 
 const isShow = ref(false)
@@ -196,7 +194,6 @@ export default {
     TinyDialogBox: DialogBox,
     TinyAlert: Alert,
     TinyFileUpload: FileUpload,
-    ButtonGroup,
     SearchEmpty,
     TinyIconPopup: iconPopup()
   },
@@ -304,9 +301,7 @@ export default {
         // eslint-disable-next-line no-console
         console.error('Clipboard operation failed:', e)
       } finally {
-        setTimeout(() => {
-          copySourceId.value = ''
-        }, 2000)
+        copySourceId.value = ''
       }
     }
 

packages/plugins/resource/src/ResourceList.vue

@@ -82,7 +82,23 @@ export default {
     const generalForm = ref()
 
     const rules = reactive({
-      name: [{ required: true, message: '必填', trigger: 'blur' }]
+      name: [
+        { required: true, message: '必填', trigger: 'blur' },
+        { min: 1, max: 32, message: '长度在1-32之间', trigger: 'blur' },
+        {
+          type: 'string',
+          validator: (value) => {
+            return new Promise((resolve, reject) => {
+              const regex = /^[a-zA-Z0-9_\-\u4e00-\u9fa5]+$/i
+              if (!regex.test(value)) {
+                reject(new Error('分组名称只能包含中文、英文、数字、下划线、中划线等字符'))
+              } else {
+                resolve()
+              }
+            })
+          }
+        }
+      ]
     })
     const saveResourceSetting = () => {
       generalForm.value.validate((valid) => {

packages/plugins/resource/src/ResourceSetting.vue

@@ -10,7 +10,7 @@
  *
  */
 
-/* metaService: engine.plugins.appmanage.http */
+/* metaService: engine.plugins.resource.http */
 import { getMetaApi, getMergeMeta, META_SERVICE } from '@opentiny/tiny-engine-meta-register'
 
 const baseUrl = '/material-center/api'
@@ -66,11 +66,3 @@ export const createResourceGroup = (params: any) =>
 // 资源管理 -- 修改资源分组信息-包括删除
 export const updateResourceGroup = (id: number, params: any) =>
   getMetaApi(META_SERVICE.Http).put(`${baseUrl}/resource-group/update/${id}`, params)
-
-// 资源管理 -- 查询资源分组详情
-export const fetchResourceGroupDetail = (id: number) =>
-  getMetaApi(META_SERVICE.Http).get(`${baseUrl}/resource-group/detail/${id}`)
-
-// 资源管理 -- 删除资源分组
-export const deleteResourceGroup = (id: number) =>
-  getMetaApi(META_SERVICE.Http).get(`${baseUrl}/resource-group/delete/${id}`)