diff --git a/data-room-ui/package-lock.json b/data-room-ui/package-lock.json index 5a3ee12d..32c968d4 100644 --- a/data-room-ui/package-lock.json +++ b/data-room-ui/package-lock.json @@ -3392,27 +3392,6 @@ "whatwg-fetch": "^3.6.2" }, "dependencies": { - "@vue/vue-loader-v15": { - "version": "npm:vue-loader@15.10.2", - "resolved": "https://registry.npmjs.org/vue-loader/-/vue-loader-15.10.2.tgz", - "integrity": "sha512-ndeSe/8KQc/nlA7TJ+OBhv2qalmj1s+uBs7yHDRFaAXscFTApBzY9F1jES3bautmgWjDlDct0fw8rPuySDLwxw==", - "dev": true, - "requires": { - "@vue/component-compiler-utils": "^3.1.0", - "hash-sum": "^1.0.2", - "loader-utils": "^1.1.0", - "vue-hot-reload-api": "^2.3.0", - "vue-style-loader": "^4.1.0" - }, - "dependencies": { - "hash-sum": { - "version": "1.0.2", - "resolved": "https://registry.npmjs.org/hash-sum/-/hash-sum-1.0.2.tgz", - "integrity": "sha512-fUs4B4L+mlt8/XAtSOGMUO1TXmAelItBPtJG7CyHJfYTdDjwisntGO2JQz7oUsatOY9o68+57eziUVNw/mRHmA==", - "dev": true - } - } - }, "acorn-walk": { "version": "8.2.0", "resolved": "https://registry.npmjs.org/acorn-walk/-/acorn-walk-8.2.0.tgz", @@ -3484,26 +3463,6 @@ "tapable": "^2.0.0" } }, - "json5": { - "version": "1.0.2", - "resolved": "https://registry.npmjs.org/json5/-/json5-1.0.2.tgz", - "integrity": "sha512-g1MWMLBiz8FKi1e4w0UyVL3w+iJceWAFBAaBnnGKOpNa5f8TLktkbre1+s6oICydWAm+HRUGTmI+//xv2hvXYA==", - "dev": true, - "requires": { - "minimist": "^1.2.0" - } - }, - "loader-utils": { - "version": "1.4.2", - "resolved": "https://registry.npmjs.org/loader-utils/-/loader-utils-1.4.2.tgz", - "integrity": "sha512-I5d00Pd/jwMD2QCduo657+YM/6L3KZu++pmX9VFncxaxvHcru9jx1lBaFft+r4Mt2jK0Yhp41XlRAihzPxHNCg==", - "dev": true, - "requires": { - "big.js": "^5.2.2", - "emojis-list": "^3.0.0", - "json5": "^1.0.1" - } - }, "ms": { "version": "2.1.2", "resolved": "https://registry.npmjs.org/ms/-/ms-2.1.2.tgz", @@ -3738,6 +3697,47 @@ "lodash": "^4.17.4" } }, + "@vue/vue-loader-v15": { + "version": "npm:vue-loader@15.10.2", + "resolved": "https://registry.npmjs.org/vue-loader/-/vue-loader-15.10.2.tgz", + "integrity": "sha512-ndeSe/8KQc/nlA7TJ+OBhv2qalmj1s+uBs7yHDRFaAXscFTApBzY9F1jES3bautmgWjDlDct0fw8rPuySDLwxw==", + "dev": true, + "requires": { + "@vue/component-compiler-utils": "^3.1.0", + "hash-sum": "^1.0.2", + "loader-utils": "^1.1.0", + "vue-hot-reload-api": "^2.3.0", + "vue-style-loader": "^4.1.0" + }, + "dependencies": { + "hash-sum": { + "version": "1.0.2", + "resolved": "https://registry.npmjs.org/hash-sum/-/hash-sum-1.0.2.tgz", + "integrity": "sha512-fUs4B4L+mlt8/XAtSOGMUO1TXmAelItBPtJG7CyHJfYTdDjwisntGO2JQz7oUsatOY9o68+57eziUVNw/mRHmA==", + "dev": true + }, + "json5": { + "version": "1.0.2", + "resolved": "https://registry.npmjs.org/json5/-/json5-1.0.2.tgz", + "integrity": "sha512-g1MWMLBiz8FKi1e4w0UyVL3w+iJceWAFBAaBnnGKOpNa5f8TLktkbre1+s6oICydWAm+HRUGTmI+//xv2hvXYA==", + "dev": true, + "requires": { + "minimist": "^1.2.0" + } + }, + "loader-utils": { + "version": "1.4.2", + "resolved": "https://registry.npmjs.org/loader-utils/-/loader-utils-1.4.2.tgz", + "integrity": "sha512-I5d00Pd/jwMD2QCduo657+YM/6L3KZu++pmX9VFncxaxvHcru9jx1lBaFft+r4Mt2jK0Yhp41XlRAihzPxHNCg==", + "dev": true, + "requires": { + "big.js": "^5.2.2", + "emojis-list": "^3.0.0", + "json5": "^1.0.1" + } + } + } + }, "@vue/vue2-jest": { "version": "27.0.0", "resolved": "https://registry.npmjs.org/@vue/vue2-jest/-/vue2-jest-27.0.0.tgz", @@ -20147,7 +20147,7 @@ }, "vue-hot-reload-api": { "version": "2.3.4", - "resolved": "https://registry.npmmirror.com/vue-hot-reload-api/-/vue-hot-reload-api-2.3.4.tgz", + "resolved": "https://registry.npmjs.org/vue-hot-reload-api/-/vue-hot-reload-api-2.3.4.tgz", "integrity": "sha512-BXq3jwIagosjgNVae6tkHzzIk6a8MHFtzAdwhnV5VlvPTFxDCvIttgSiHWjdGoTJvXtmRu5HacExfdarRcFhog==", "dev": true }, diff --git a/data-room-ui/package.json b/data-room-ui/package.json index 5a1dd907..270cd920 100644 --- a/data-room-ui/package.json +++ b/data-room-ui/package.json @@ -22,15 +22,13 @@ "scripts": { "serve": "vue-cli-service serve --open", "serve:max": "node --max_old_space_size=4096 node_modules/@vue/cli-service/bin/vue-cli-service.js serve --open", - "build": "vue-cli-service build", "build:stage": "vue-cli-service build --mode staging", "build:hash": "vue-cli-service build", "build:history": "vue-cli-service build --mode history", "build:hash:pro": "vue-cli-service build --name dataRoomPro", "build:history:pro": "vue-cli-service build --mode=pro.history", - "build:history:all": "vue-cli-service build --mode history && vue-cli-service build --mode=pro.history", - + "build:history:all": "vue-cli-service build --mode history && vue-cli-service build --mode=pro.history", "preview": "node build/index.js --preview", "lint": "eslint --ext .js,.vue packages", "lint:fix": "eslint --ext .js,.vue packages --fix", diff --git a/data-room-ui/packages/BasicComponents/IndexCard/index.vue b/data-room-ui/packages/BasicComponents/IndexCard/index.vue index 549c9af6..35a61f41 100644 --- a/data-room-ui/packages/BasicComponents/IndexCard/index.vue +++ b/data-room-ui/packages/BasicComponents/IndexCard/index.vue @@ -5,7 +5,9 @@ >
--> 基础
- + + + + + + + + + @@ -182,6 +203,7 @@ @@ -208,6 +230,40 @@ export default { }, data () { return { + options: [ + { + label: '从左到右', + value: 'to right' + }, + { + label: '从右到左', + value: 'to left' + }, + { + label: '从上到下', + value: 'to bottom' + }, + { + label: '从下到上', + value: 'to top' + }, + { + label: '从左上到右下', + value: 'to bottom right' + }, + { + label: '从右上到左下', + value: 'to bottom left' + }, + { + label: '从左下到右上', + value: 'to top right' + }, + { + label: '从右下到左上', + value: 'to top left' + } + ], // 预设主题色 predefineThemeColors: [ '#007aff', diff --git a/data-room-ui/packages/BasicComponents/IndexCard/settingConfig.js b/data-room-ui/packages/BasicComponents/IndexCard/settingConfig.js index 81504f79..925532f9 100644 --- a/data-room-ui/packages/BasicComponents/IndexCard/settingConfig.js +++ b/data-room-ui/packages/BasicComponents/IndexCard/settingConfig.js @@ -52,7 +52,9 @@ const customConfig = { borderWidth: 0, lineDistance: 6, borderColor: '', - bgColor: 'rgba(0, 122, 255, 0.07)', + gradientDirection:'to right', + gradientColor0: 'rgba(0, 122, 255, 0.07)', + gradientColor1:'rgba(0, 122, 255, 0.07)', distance: 30, imgSize: 80, firstSize: 64, diff --git a/data-room-ui/packages/BasicComponents/IndexCard2/index.vue b/data-room-ui/packages/BasicComponents/IndexCard2/index.vue index 49a32a65..3413d34a 100644 --- a/data-room-ui/packages/BasicComponents/IndexCard2/index.vue +++ b/data-room-ui/packages/BasicComponents/IndexCard2/index.vue @@ -5,7 +5,9 @@ >
基础
- + + + + + + + + + @@ -169,7 +190,7 @@ v-model="config.customize.secondSize" :precision="0" class="bs-el-input-number" - label="请输入首行字体粗细" + label="请输入第二行文字大小" /> @@ -182,6 +203,7 @@ @@ -208,6 +230,40 @@ export default { }, data () { return { + options: [ + { + label: '从左到右', + value: 'to right' + }, + { + label: '从右到左', + value: 'to left' + }, + { + label: '从上到下', + value: 'to bottom' + }, + { + label: '从下到上', + value: 'to top' + }, + { + label: '从左上到右下', + value: 'to bottom right' + }, + { + label: '从右上到左下', + value: 'to bottom left' + }, + { + label: '从左下到右上', + value: 'to top right' + }, + { + label: '从右下到左上', + value: 'to top left' + } + ], // 预设主题色 predefineThemeColors: [ '#007aff', diff --git a/data-room-ui/packages/BasicComponents/IndexCard2/settingConfig.js b/data-room-ui/packages/BasicComponents/IndexCard2/settingConfig.js index 3b07faa3..d1f69503 100644 --- a/data-room-ui/packages/BasicComponents/IndexCard2/settingConfig.js +++ b/data-room-ui/packages/BasicComponents/IndexCard2/settingConfig.js @@ -52,7 +52,9 @@ const customConfig = { borderWidth: 0, lineDistance: 6, borderColor: '', - bgColor: 'rgba(0, 122, 255, 0.07)', + gradientDirection:'to right', + gradientColor0: 'rgba(0, 122, 255, 0.07)', + gradientColor1:'rgba(0, 122, 255, 0.07)', distance: 30, imgSize: 80, firstSize: 21, diff --git a/data-room-ui/packages/BasicComponents/IndicatorCard/index.vue b/data-room-ui/packages/BasicComponents/IndicatorCard/index.vue index 449be32a..77c6e155 100644 --- a/data-room-ui/packages/BasicComponents/IndicatorCard/index.vue +++ b/data-room-ui/packages/BasicComponents/IndicatorCard/index.vue @@ -5,7 +5,9 @@ >
--> 基础
- + + + + + + + + + @@ -142,7 +163,7 @@ v-model="config.customize.secondSize" :precision="0" class="bs-el-input-number" - label="请输入首行字体粗细" + label="请输入第二行文字大小" /> @@ -155,6 +176,7 @@ @@ -181,6 +203,40 @@ export default { }, data () { return { + options: [ + { + label: '从左到右', + value: 'to right' + }, + { + label: '从右到左', + value: 'to left' + }, + { + label: '从上到下', + value: 'to bottom' + }, + { + label: '从下到上', + value: 'to top' + }, + { + label: '从左上到右下', + value: 'to bottom right' + }, + { + label: '从右上到左下', + value: 'to bottom left' + }, + { + label: '从左下到右上', + value: 'to top right' + }, + { + label: '从右下到左上', + value: 'to top left' + } + ], // 预设主题色 predefineThemeColors: [ '#007aff', diff --git a/data-room-ui/packages/BasicComponents/IndicatorCard/settingConfig.js b/data-room-ui/packages/BasicComponents/IndicatorCard/settingConfig.js index 6bb776bc..7e8d36c4 100644 --- a/data-room-ui/packages/BasicComponents/IndicatorCard/settingConfig.js +++ b/data-room-ui/packages/BasicComponents/IndicatorCard/settingConfig.js @@ -51,7 +51,9 @@ const customConfig = { borderWidth: 0, lineDistance: 25, borderColor: '', - bgColor: 'rgba(0, 122, 255, 1)', + gradientDirection:'to right', + gradientColor0: 'rgba(0, 122, 255, 1)', + gradientColor1:'rgba(0, 122, 255, 1)', firstSize: 50, firstColor: '#ffffff', firstWeight: 500, diff --git a/data-room-ui/packages/BasicComponents/IndicatorCard2/index.vue b/data-room-ui/packages/BasicComponents/IndicatorCard2/index.vue index 0696574a..ed02ff46 100644 --- a/data-room-ui/packages/BasicComponents/IndicatorCard2/index.vue +++ b/data-room-ui/packages/BasicComponents/IndicatorCard2/index.vue @@ -5,7 +5,9 @@ >
--> 基础
- + + + + + + + + + @@ -142,7 +163,7 @@ v-model="config.customize.secondSize" :precision="0" class="bs-el-input-number" - label="请输入首行字体粗细" + label="请输入第二行文字大小" /> @@ -155,6 +176,7 @@ @@ -181,6 +203,40 @@ export default { }, data () { return { + options: [ + { + label: '从左到右', + value: 'to right' + }, + { + label: '从右到左', + value: 'to left' + }, + { + label: '从上到下', + value: 'to bottom' + }, + { + label: '从下到上', + value: 'to top' + }, + { + label: '从左上到右下', + value: 'to bottom right' + }, + { + label: '从右上到左下', + value: 'to bottom left' + }, + { + label: '从左下到右上', + value: 'to top right' + }, + { + label: '从右下到左上', + value: 'to top left' + } + ], // 预设主题色 predefineThemeColors: [ '#007aff', diff --git a/data-room-ui/packages/BasicComponents/IndicatorCard2/settingConfig.js b/data-room-ui/packages/BasicComponents/IndicatorCard2/settingConfig.js index e07a24b7..339d000c 100644 --- a/data-room-ui/packages/BasicComponents/IndicatorCard2/settingConfig.js +++ b/data-room-ui/packages/BasicComponents/IndicatorCard2/settingConfig.js @@ -51,7 +51,9 @@ const customConfig = { borderWidth: 0, lineDistance: 25, borderColor: '', - bgColor: 'rgba(0, 122, 255, 1)', + gradientDirection:'to right', + gradientColor0: 'rgba(0, 122, 255, 1)', + gradientColor1:'rgba(0, 122, 255, 1)', firstSize: 32, firstColor: '#ffffff', firstWeight: 500, diff --git a/data-room-ui/packages/BorderComponents/GcBorder1/setting.js b/data-room-ui/packages/BorderComponents/GcBorder1/setting.js index 5be989c8..17db4786 100644 --- a/data-room-ui/packages/BorderComponents/GcBorder1/setting.js +++ b/data-room-ui/packages/BorderComponents/GcBorder1/setting.js @@ -21,7 +21,7 @@ const setting = [ // 是否多选 multiple: false, // 绑定的值 - value: '', + value: '#83bff6', }, { label:'边框副颜色', @@ -33,7 +33,7 @@ const setting = [ // 是否多选 multiple: false, // 绑定的值 - value: '', + value: '#00CED1', }, { label:'背景色', diff --git a/data-room-ui/packages/BorderComponents/GcBorder10/setting.js b/data-room-ui/packages/BorderComponents/GcBorder10/setting.js index f3a945b9..53aa22c5 100644 --- a/data-room-ui/packages/BorderComponents/GcBorder10/setting.js +++ b/data-room-ui/packages/BorderComponents/GcBorder10/setting.js @@ -20,7 +20,7 @@ const setting = [ // 是否多选 multiple: false, // 绑定的值 - value: '', + value: '#83bff6', }, { label:'边框副颜色', @@ -32,7 +32,7 @@ const setting = [ // 是否多选 multiple: false, // 绑定的值 - value: '', + value: '#00CED1', }, { label:'背景色', diff --git a/data-room-ui/packages/BorderComponents/GcBorder11/setting.js b/data-room-ui/packages/BorderComponents/GcBorder11/setting.js index 9bda8eb7..e8418379 100644 --- a/data-room-ui/packages/BorderComponents/GcBorder11/setting.js +++ b/data-room-ui/packages/BorderComponents/GcBorder11/setting.js @@ -31,7 +31,7 @@ const setting = [ // 是否多选 multiple: false, // 绑定的值 - value: '', + value: '#83bff6', }, { label:'边框副颜色', @@ -43,7 +43,7 @@ const setting = [ // 是否多选 multiple: false, // 绑定的值 - value: '', + value: '#00CED1', }, { label:'背景色', diff --git a/data-room-ui/packages/BorderComponents/GcBorder12/setting.js b/data-room-ui/packages/BorderComponents/GcBorder12/setting.js index fae9d75c..8a731e65 100644 --- a/data-room-ui/packages/BorderComponents/GcBorder12/setting.js +++ b/data-room-ui/packages/BorderComponents/GcBorder12/setting.js @@ -21,7 +21,7 @@ const setting = [ // 是否多选 multiple: false, // 绑定的值 - value: '', + value: '#83bff6', }, { label:'边框副颜色', @@ -33,7 +33,7 @@ const setting = [ // 是否多选 multiple: false, // 绑定的值 - value: '', + value: '#00CED1', }, { label:'背景色', diff --git a/data-room-ui/packages/BorderComponents/GcBorder13/setting.js b/data-room-ui/packages/BorderComponents/GcBorder13/setting.js index c9affd8a..135b24f8 100644 --- a/data-room-ui/packages/BorderComponents/GcBorder13/setting.js +++ b/data-room-ui/packages/BorderComponents/GcBorder13/setting.js @@ -20,7 +20,7 @@ const setting = [ // 是否多选 multiple: false, // 绑定的值 - value: '', + value: '#83bff6', }, { label:'边框副颜色', @@ -32,7 +32,7 @@ const setting = [ // 是否多选 multiple: false, // 绑定的值 - value: '', + value: '#00CED1', }, { label:'背景色', diff --git a/data-room-ui/packages/BorderComponents/GcBorder16/index.vue b/data-room-ui/packages/BorderComponents/GcBorder16/index.vue index e73b3a51..ba83dba4 100644 --- a/data-room-ui/packages/BorderComponents/GcBorder16/index.vue +++ b/data-room-ui/packages/BorderComponents/GcBorder16/index.vue @@ -2,10 +2,9 @@
@@ -19,6 +18,10 @@ export default { }, mixins: [refreshComponentMixin], props: { + id:{ + type: String, + default: 'name' + }, // 卡片的属性 config: { type: Object, @@ -27,17 +30,15 @@ export default { }, data () { return { - } }, computed: { - img(){ - return 'component.png' - } }, watch: { }, mounted () { + const a =document.getElementById('border'+ this.config.code) + // a.style['border-image-source']=`url(http://127.0.0.1:8081//bigScreenServer/static/1704043211902484481.png)` }, methods: { } @@ -46,6 +47,7 @@ export default {