feat(resources): fix review bugs

Author: betterdancing

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

@@ -6,7 +6,6 @@
       v-model="isShow"
       :visible-arrow="false"
       :popper-class="['option-popper', 'fixed-left']"
-      height="844"
     >
       <div class="source-wrap">
         <div class="source-title">
@@ -46,7 +45,7 @@
           </div>
           <div class="source-list">
             <div v-for="(item, index) in sourceList" :key="item.id" class="source-item">
-              <img :src="item.thumbnailUrl ?? item.resourceUrl" />
+              <img :src="item.thumbnailUrl || item.resourceUrl" />
               <tiny-radio
                 v-model="selectedSourceIndex"
                 @change="selectSource(index)"
@@ -77,15 +76,7 @@
 <script lang="ts">
 import { ref, watch } from '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 { Popover as TinyPopover, Button as TinyButton, Input, Search, Select, Divider, Radio } 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'
@@ -105,12 +96,12 @@ export default {
   components: {
     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,
+    TinyInput: Input,
+    TinySearch: Search,
+    TinySelect: Select,
+    TinyDivider: Divider,
+    TinyRadio: Radio,
+    SearchEmpty,
     TinyIconClose: iconClose(),
     TinyIconSearch: iconSearch()
   },
@@ -181,7 +172,9 @@ export default {
     watch(
       () => searchWords.value,
       () => {
-        sourceList.value = sourceOriginList.value.filter((item) => item.name.includes(searchWords.value))
+        sourceList.value = sourceOriginList.value.filter((item) =>
+          item.name.toLowerCase().includes(searchWords.value.toLowerCase())
+        )
       }
     )
 

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

@@ -19,7 +19,7 @@ export const fetchResourceListByGroupId = (resourceGroupId: number) =>
   getMetaApi(META_SERVICE.Http).get(`${baseUrl}/resource/find/${resourceGroupId}`)
 
 // 资源管理 -- 根据appId查询资源分组列表
-export const fetchResourceGroupByAppId = (appId: number) =>
+export const fetchResourceGroupByAppId = (appId?: number) =>
   getMetaApi(META_SERVICE.Http).get(
     `${baseUrl}/resource-group/${appId || getMetaApi(META_SERVICE.GlobalService).getBaseInfo().id}`
   )

packages/plugins/resource/src/Main.vue

@@ -35,17 +35,20 @@
         <search-empty :isShow="!resourceList?.length" />
       </template>
     </plugin-panel>
-    <resource-setting @create-group="refreshCategory"></resource-setting>
+    <resource-setting @refreshCategory="refreshCategory"></resource-setting>
     <resource-list></resource-list>
   </div>
 </template>
-<script>
+<script lang="ts">
+/* metaService: engine.plugins.resource.Main */
 import { ref, reactive, provide, onMounted } from 'vue'
 import { useLayout, useNotify } from '@opentiny/tiny-engine-meta-register'
 import { PluginPanel, SvgButton, SearchEmpty } from '@opentiny/tiny-engine-common'
 import ResourceSetting, { openResourceSettingPanel, closeResourceSettingPanel } from './ResourceSetting.vue'
 import ResourceList, { openResourceListPanel, closeResourceListPanel } from './ResourceList.vue'
 import { fetchResourceGroupByAppId } from './js/http'
+
+/* metaComponent: engine.plugins.resource */
 export default {
   components: {
     PluginPanel,

packages/plugins/resource/src/ResourceList.vue

@@ -35,7 +35,7 @@
                 name="tiny-checkbox"
                 @change="selectSource($event, item)"
               ></tiny-checkbox>
-              <div class="source-action">
+              <div class="source-action" v-if="!enableBatchAction">
                 <tiny-popover placement="bottom" :visible-arrow="false" :offset="-18" trigger="hover">
                   <div class="actions">
                     <tiny-popover
@@ -141,17 +141,19 @@
     </tiny-dialog-box>
   </teleport>
 </template>
-<script>
+<script lang="ts">
+/* metaService: engine.plugins.resource.ResourceList */
 import { ref, reactive, computed, watch } from 'vue'
+import type { Component } from 'vue'
 import useClipboard from 'vue-clipboard3'
 import {
-  Button,
+  Button as TinyButton,
   Divider,
   Grid,
   GridColumn,
   Input,
-  Checkbox,
-  Popover,
+  Checkbox as TinyCheckbox,
+  Popover as TinyPopover,
   DialogBox,
   Alert,
   FileUpload
@@ -184,13 +186,13 @@ export default {
   components: {
     PluginSetting,
     SvgButton,
-    TinyButton: Button,
+    TinyButton: TinyButton as Component,
     TinyDivider: Divider,
     TinyGrid: Grid,
     TinyGridColumn: GridColumn,
     TinyInput: Input,
-    TinyCheckbox: Checkbox,
-    TinyPopover: Popover,
+    TinyCheckbox: TinyCheckbox as Component,
+    TinyPopover: TinyPopover as Component,
     TinyDialogBox: DialogBox,
     TinyAlert: Alert,
     TinyFileUpload: FileUpload,
@@ -224,7 +226,7 @@ export default {
           type: 'string',
           validator: ({ row }, value) => {
             return new Promise((resolve, reject) => {
-              const regex = /^[a-zA-Z0-9_\-=+(){}[\]\u4e00-\u9fa5]+\.(png|jpg|jpeg|svg|PNG|JPG|JPEG|SVG)$/i
+              const regex = /^[a-zA-Z0-9_\-=+(){}[\]\u4e00-\u9fa5]+\.(png|jpg|jpeg|svg|PNG|JPG|JPEG|SVG)$/
               if (!regex.test(value)) {
                 reject(new Error('资源名称格式错误'))
               } else if (addSourceData.value.find((item) => item._RID !== row._RID && item.name === value)) {

packages/plugins/resource/src/ResourceSetting.vue

@@ -32,9 +32,11 @@
     </template>
   </plugin-setting>
 </template>
-<script>
+<script lang="ts">
+/* metaService: engine.plugins.resource.ResourceSetting */
 import { ref, reactive, computed } from 'vue'
-import { Button, Collapse, CollapseItem, Form, FormItem, Input } from '@opentiny/vue'
+import type { Component } from 'vue'
+import { Button as TinyButton, Collapse, CollapseItem, Form, FormItem, Input } from '@opentiny/vue'
 import { useLayout, useNotify } from '@opentiny/tiny-engine-meta-register'
 import { PluginSetting, ButtonGroup, SvgButton } from '@opentiny/tiny-engine-common'
 import { createResourceGroup, updateResourceGroup } from './js/http'
@@ -65,7 +67,7 @@ export default {
   components: {
     PluginSetting,
     SvgButton,
-    TinyButton: Button,
+    TinyButton: TinyButton as Component,
     TinyCollapse: Collapse,
     TinyCollapseItem: CollapseItem,
     TinyFormItem: FormItem,
@@ -74,7 +76,7 @@ export default {
     ButtonGroup
   },
   props: {},
-  emits: ['create-group'],
+  emits: ['refreshCategory'],
   setup(props, { emit }) {
     const { PLUGIN_NAME, getPluginByLayout } = useLayout()
     const align = computed(() => getPluginByLayout(PLUGIN_NAME.Resource))
@@ -108,7 +110,7 @@ export default {
         if (state.data.id) {
           updateResourceGroup(state.data.id, { name: state.data.name, description: state.data.description })
             .then(() => {
-              emit('create-group')
+              emit('refreshCategory')
               closeResourceSettingPanel()
               useNotify({ message: '修改资源分组成功', type: 'success' })
             })
@@ -118,7 +120,7 @@ export default {
         } else {
           createResourceGroup(state.data)
             .then(() => {
-              emit('create-group')
+              emit('refreshCategory')
               closeResourceSettingPanel()
               useNotify({ message: '添加资源分组成功', type: 'success' })
             })

packages/plugins/resource/src/js/http.ts

@@ -46,9 +46,6 @@ export const deleteResource = (id: number) => getMetaApi(META_SERVICE.Http).get(
 // 资源管理 -- 获取资源详情
 export const fetchResourceDetail = (id: number) => getMetaApi(META_SERVICE.Http).get(`${baseUrl}/resource/detail/${id}`)
 
-// 资源管理 -- 查询资源分组列表
-export const fetchResourceGroupList = () => getMetaApi(META_SERVICE.Http).get(`${baseUrl}/resource-group/list`)
-
 // 资源管理 -- 根据appId查询资源分组列表
 export const fetchResourceGroupByAppId = () =>
   getMetaApi(META_SERVICE.Http).get(