Commit ad21da0c authored by 何远江's avatar 何远江

BUG 修改

parent 14295c51
...@@ -15,28 +15,28 @@ export const authorityConfig = { ...@@ -15,28 +15,28 @@ export const authorityConfig = {
editObjects: 0, //编辑对象 editObjects: 0, //编辑对象
editScenarios: 0, //编辑方案 editScenarios: 0, //编辑方案
sheet: 1, //如果为1或true,则该工作表受到保护;如果为0或false,则该工作表不受保护。 sheet: 1, //如果为1或true,则该工作表受到保护;如果为0或false,则该工作表不受保护。
hintText: "", //弹窗提示的文字 hintText: '', //弹窗提示的文字
algorithmName: "None", //加密方案:MD2,MD4,MD5,RIPEMD-128,RIPEMD-160,SHA-1,SHA-256,SHA-384,SHA-512,WHIRLPOOL algorithmName: 'None', //加密方案:MD2,MD4,MD5,RIPEMD-128,RIPEMD-160,SHA-1,SHA-256,SHA-384,SHA-512,WHIRLPOOL
saltValue: null, //密码解密的盐参数,为一个自己定的随机数值 saltValue: null, //密码解密的盐参数,为一个自己定的随机数值
allowRangeList: [], allowRangeList: []
}; }
export const showsheetbarConfig = { export const showsheetbarConfig = {
add: false, //新增sheet add: false, //新增sheet
menu: true, //sheet管理菜单 menu: true, //sheet管理菜单
sheet: true, //sheet页显示 sheet: true //sheet页显示
}; }
export const sheetRightClickConfig = { export const sheetRightClickConfig = {
delete: false, // 删除 delete: false, // 删除
copy: false, // 复制 copy: false, // 复制
rename: false, //重命名 rename: false, //重命名
color: false, //更改颜色 color: false, //更改颜色
hide: false, //隐藏,取消隐藏 hide: false, //隐藏,取消隐藏
move: false, //向左移,向右移 move: false //向左移,向右移
}; }
export const cellRightClickConfig = { export const cellRightClickConfig = {
copy: false, // 复制 copy: false, // 复制
copyAs: false, // 复制为 copyAs: false, // 复制为
paste: false, // 粘贴 paste: false, // 粘贴
...@@ -57,16 +57,15 @@ export const authorityConfig = { ...@@ -57,16 +57,15 @@ export const authorityConfig = {
image: false, // 插入图片 image: false, // 插入图片
link: false, // 插入链接 link: false, // 插入链接
data: false, // 数据验证 data: false, // 数据验证
cellFormat: false, // 设置单元格格式 cellFormat: false // 设置单元格格式
}; }
export const showstatisticBarConfig = { export const showstatisticBarConfig = {
count: false, // 计数栏 count: false, // 计数栏
view: false, // 打印视图 view: false, // 打印视图
zoom: true, // 缩放 zoom: true // 缩放
} }
export const colors = [
export const colors = [
'#70a1d7', '#70a1d7',
'#a1de93', '#a1de93',
'#f7f48b', '#f7f48b',
...@@ -75,13 +74,14 @@ export const authorityConfig = { ...@@ -75,13 +74,14 @@ export const authorityConfig = {
'#66c6ba', '#66c6ba',
'#a4e5d9', '#a4e5d9',
'#c8f4de' '#c8f4de'
] ]
export const areaMarksColor = { export const areaMarksColor = {
'data': '#65d0ea', data: '#65d0ea',
'head': '#34718d', head: '#34718d',
'default': '#ffffff', default: '#ffffff',
'attch': '#e6ccb2', attch: '#e6ccb2',
'attch_title': '#e58e26', attch_title: '#e58e26',
'attch_head': '#b08968', attch_head: '#b08968',
} filter: '#ff0000'
\ No newline at end of file }
...@@ -203,8 +203,6 @@ import { getRangetxt } from '@/utils/excel' ...@@ -203,8 +203,6 @@ import { getRangetxt } from '@/utils/excel'
import type { VxeTableInstance } from 'vxe-table' import type { VxeTableInstance } from 'vxe-table'
import EditArea from '../EditArea/EditArea.vue' import EditArea from '../EditArea/EditArea.vue'
const tableData = ref([])
const connectVisible = ref(false) const connectVisible = ref(false)
const xTableConnect = ref<VxeTableInstance>() const xTableConnect = ref<VxeTableInstance>()
const beConnectTable = ref<VxeTableInstance>() const beConnectTable = ref<VxeTableInstance>()
...@@ -701,7 +699,8 @@ const filterObjKeys = (data: any) => { ...@@ -701,7 +699,8 @@ const filterObjKeys = (data: any) => {
} }
const expandConfig = reactive({ const expandConfig = reactive({
visibleMethod({ row }) { visibleMethod({ row }) {
if (row.expandData !== undefined && typeof row.expandData === 'object') { console.log('row', row)
if (typeof row.expendData === 'object') {
return true return true
} }
return false return false
......
...@@ -87,8 +87,10 @@ const saveArea = async () => { ...@@ -87,8 +87,10 @@ const saveArea = async () => {
setDataAreaRef.value.resetFormState() setDataAreaRef.value.resetFormState()
setDataAreaTitleRef.value.resetExcelAreaTitleState() setDataAreaTitleRef.value.resetExcelAreaTitleState()
setAttchRef.value.resetFormState() setAttchRef.value.resetFormState()
}
emits('success', data) emits('success', data)
} else {
return ElMessage.error(data.message || '保存失败!')
}
} }
</script> </script>
<style lang="scss"> <style lang="scss">
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment