diff --git a/.drone.yml b/.drone.yml index 164e9c0..f2400d2 100644 --- a/.drone.yml +++ b/.drone.yml @@ -25,9 +25,9 @@ steps: - npm -v - mkdir -p ./node_modules - export NODE_MODULES_PATH=`pwd`/node_modules - - npm config set registry https://registry.npmmirror.com + # - npm config set registry https://registry.npmmirror.com #- set NODE_OPTIONS=--openssl-legacy-provider - - npm install + # - npm install - npm run build - ls /app/build/$DRONE_REPO_NAME/ - echo $NODE_MODULES_PATH diff --git a/src/api/role/role.js b/src/api/role/role.js index 6aa7b3d..28a4f7b 100644 --- a/src/api/role/role.js +++ b/src/api/role/role.js @@ -14,6 +14,14 @@ export const getRoleOption = () => { method: "get" }); }; + +export const getTemRoleOption = () => { + return request({ + url: '/admin/role/option/template', + method: "get" + }); +}; + //查询角色信息 export const getRoleDetail = (roleId) => { return request({ diff --git a/src/fvcomponents/fvRadio/index.vue b/src/fvcomponents/fvRadio/index.vue index ea6e821..9575f2a 100644 --- a/src/fvcomponents/fvRadio/index.vue +++ b/src/fvcomponents/fvRadio/index.vue @@ -15,7 +15,7 @@ const props = defineProps({ default: [] }, modelValue: { - type: [Number, String], + type: [Number, String, Boolean], default: '' }, cacheKey: { diff --git a/src/fvcomponents/fvSearchForm/index.vue b/src/fvcomponents/fvSearchForm/index.vue index 8afc13b..0994c8c 100644 --- a/src/fvcomponents/fvSearchForm/index.vue +++ b/src/fvcomponents/fvSearchForm/index.vue @@ -65,8 +65,6 @@ const filterConfig = computed(()=>{ return arr.length >= 4 && showMore.value ? arr : arr.slice(0, 3) }) -console.log(filterConfig.value, 'filterConfig'); - // 搜索功能表单元素默认值 const setDefaultFormValues = () => { filterConfig.value.forEach(item=>{ diff --git a/src/views/system/role/add.vue b/src/views/system/role/add.vue index 54c750b..7229e15 100644 --- a/src/views/system/role/add.vue +++ b/src/views/system/role/add.vue @@ -2,13 +2,17 @@