feat:bug修复以及点九图开发

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
     },

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",

data-room-ui/packages/BasicComponents/IndexCard/index.vue

@@ -5,7 +5,9 @@
   >
     <div
       :style="{
-        'background-color':customize.bgColor,
+         'background-image': `linear-gradient(${customize.gradientDirection}, ${
+            gradientColor0 ? gradientColor0 : gradientColor1
+          } , ${gradientColor1 ? gradientColor1 : gradientColor0})`,
         'border-radius':customize.borderRadius + 'px',
         border:`${customize.borderWidth}px solid ${customize.borderColor}`,
       }"
@@ -87,6 +89,12 @@ export default {
   mounted () {
   },
   computed: {
+    gradientColor0 () {
+      return this.config.customize.gradientColor0 || this.config.customize.gradientColor1 || 'transparent'
+    },
+    gradientColor1 () {
+       return this.config.customize.gradientColor1 || this.config.customize.gradientColor0 || 'transparent'
+    },
      unit(){
       return this.config?.customize.unit || ''
     },

data-room-ui/packages/BasicComponents/IndexCard/setting.vue

@@ -44,12 +44,32 @@
           </div> -->
         <SettingTitle>基础</SettingTitle>
         <div class="lc-field-body">
-          <el-form-item label-width="100px" label="背景色">
+          <el-form-item label-width="100px" label="渐变背景色一">
             <ColorPicker
-              v-model="config.customize.bgColor"
+              v-model="config.customize.gradientColor0"
               :predefine="predefineThemeColors"
             />
           </el-form-item>
+          <el-form-item label-width="100px" label="渐变背景色二">
+            <ColorPicker
+              v-model="config.customize.gradientColor1"
+              :predefine="predefineThemeColors"
+            />
+          </el-form-item>
+          <el-form-item label-width="100px" label="渐变色方向">
+              <el-select
+                v-model="config.customize.gradientDirection"
+                popper-class="bs-el-select"
+                class="bs-el-select"
+              >
+                <el-option
+                  v-for="iconPosition in options"
+                  :key="iconPosition.value"
+                  :label="iconPosition.label"
+                  :value="iconPosition.value"
+                />
+              </el-select>
+            </el-form-item>
           <el-form-item label-width="100px" label="边框颜色">
             <ColorPicker
               v-model="config.customize.borderColor"
@@ -150,6 +170,7 @@
             <el-input-number
               v-model="config.customize.firstWeight"
               :precision="0"
+              :step="100"
               class="bs-el-input-number"
               label="请输入首行字体粗细"
             />
@@ -182,6 +203,7 @@
             <el-input-number
               v-model="config.customize.secondWeight"
               :precision="0"
+              :step="100"
               class="bs-el-input-number"
               label="请输入第二行字体粗细"
             />
@@ -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',

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,

data-room-ui/packages/BasicComponents/IndexCard2/index.vue

@@ -5,7 +5,9 @@
   >
     <div
       :style="{
-        'background-color':customize.bgColor,
+        'background-image': `linear-gradient(${customize.gradientDirection}, ${
+            gradientColor0 ? gradientColor0 : gradientColor1
+          } , ${gradientColor1 ? gradientColor1 : gradientColor0})`,
         'border-radius':customize.borderRadius + 'px',
         border:`${customize.borderWidth}px solid ${customize.borderColor}`,
       }"
@@ -85,6 +87,12 @@ export default {
   mounted () {
   },
   computed: {
+     gradientColor0 () {
+      return this.config.customize.gradientColor0 || this.config.customize.gradientColor1 || 'transparent'
+    },
+    gradientColor1 () {
+       return this.config.customize.gradientColor1 || this.config.customize.gradientColor0 || 'transparent'
+    },
     unit(){
       return this.config?.customize.unit || ''
     },

data-room-ui/packages/BasicComponents/IndexCard2/setting.vue

@@ -44,12 +44,32 @@
         </div>
         <SettingTitle>基础</SettingTitle>
         <div class="lc-field-body">
-          <el-form-item label-width="100px" label="背景色">
+           <el-form-item label-width="100px" label="渐变背景色一">
             <ColorPicker
-              v-model="config.customize.bgColor"
+              v-model="config.customize.gradientColor0"
               :predefine="predefineThemeColors"
             />
           </el-form-item>
+          <el-form-item label-width="100px" label="渐变背景色二">
+            <ColorPicker
+              v-model="config.customize.gradientColor1"
+              :predefine="predefineThemeColors"
+            />
+          </el-form-item>
+          <el-form-item label-width="100px" label="渐变色方向">
+              <el-select
+                v-model="config.customize.gradientDirection"
+                popper-class="bs-el-select"
+                class="bs-el-select"
+              >
+                <el-option
+                  v-for="iconPosition in options"
+                  :key="iconPosition.value"
+                  :label="iconPosition.label"
+                  :value="iconPosition.value"
+                />
+              </el-select>
+            </el-form-item>
           <el-form-item label-width="100px" label="边框颜色">
             <ColorPicker
               v-model="config.customize.borderColor"
@@ -150,6 +170,7 @@
             <el-input-number
               v-model="config.customize.firstWeight"
               :precision="0"
+              :step="100"
               class="bs-el-input-number"
               label="请输入首行字体粗细"
             />
@@ -169,7 +190,7 @@
               v-model="config.customize.secondSize"
               :precision="0"
               class="bs-el-input-number"
-              label="请输入首行字体粗细"
+              label="请输入第二行文字大小"
             />
           </el-form-item>
            <el-form-item label-width="100px" label="第二行字体颜色">
@@ -182,6 +203,7 @@
             <el-input-number
               v-model="config.customize.secondWeight"
               :precision="0"
+              :step="100"
               class="bs-el-input-number"
               label="请输入第二行字体粗细"
             />
@@ -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',

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,

data-room-ui/packages/BasicComponents/IndicatorCard/index.vue

@@ -5,7 +5,9 @@
   >
     <div
       :style="{
-        'background-color':customize.bgColor,
+        'background-image': `linear-gradient(${customize.gradientDirection}, ${
+            gradientColor0 ? gradientColor0 : gradientColor1
+          } , ${gradientColor1 ? gradientColor1 : gradientColor0})`,
         'border-radius':customize.borderRadius + 'px',
         border:`${customize.borderWidth}px solid ${customize.borderColor}`,
       }"
@@ -76,6 +78,12 @@ export default {
     // this.chartInit()
   },
   computed: {
+    gradientColor0 () {
+      return this.config.customize.gradientColor0 || this.config.customize.gradientColor1 || 'transparent'
+    },
+    gradientColor1 () {
+       return this.config.customize.gradientColor1 || this.config.customize.gradientColor0 || 'transparent'
+    },
     unit(){
       return this.config?.customize.unit || ''
     },

data-room-ui/packages/BasicComponents/IndicatorCard/setting.vue

@@ -44,12 +44,32 @@
           </div> -->
         <SettingTitle>基础</SettingTitle>
         <div class="lc-field-body">
-          <el-form-item label-width="100px" label="背景色">
+          <el-form-item label-width="100px" label="渐变背景色一">
             <ColorPicker
-              v-model="config.customize.bgColor"
+              v-model="config.customize.gradientColor0"
               :predefine="predefineThemeColors"
             />
           </el-form-item>
+          <el-form-item label-width="100px" label="渐变背景色二">
+            <ColorPicker
+              v-model="config.customize.gradientColor1"
+              :predefine="predefineThemeColors"
+            />
+          </el-form-item>
+          <el-form-item label-width="100px" label="渐变色方向">
+              <el-select
+                v-model="config.customize.gradientDirection"
+                popper-class="bs-el-select"
+                class="bs-el-select"
+              >
+                <el-option
+                  v-for="iconPosition in options"
+                  :key="iconPosition.value"
+                  :label="iconPosition.label"
+                  :value="iconPosition.value"
+                />
+              </el-select>
+            </el-form-item>
           <el-form-item label-width="100px" label="边框颜色">
             <ColorPicker
               v-model="config.customize.borderColor"
@@ -123,6 +143,7 @@
             <el-input-number
               v-model="config.customize.firstWeight"
               :precision="0"
+              :step="100"
               class="bs-el-input-number"
               label="请输入首行字体粗细"
             />
@@ -142,7 +163,7 @@
               v-model="config.customize.secondSize"
               :precision="0"
               class="bs-el-input-number"
-              label="请输入首行字体粗细"
+              label="请输入第二行文字大小"
             />
           </el-form-item>
            <el-form-item label-width="100px" label="第二行字体颜色">
@@ -155,6 +176,7 @@
             <el-input-number
               v-model="config.customize.secondWeight"
               :precision="0"
+              :step="100"
               class="bs-el-input-number"
               label="请输入第二行字体粗细"
             />
@@ -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',

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,

data-room-ui/packages/BasicComponents/IndicatorCard2/index.vue

@@ -5,7 +5,9 @@
   >
     <div
       :style="{
-        'background-color':customize.bgColor,
+        'background-image': `linear-gradient(${customize.gradientDirection}, ${
+            gradientColor0 ? gradientColor0 : gradientColor1
+          } , ${gradientColor1 ? gradientColor1 : gradientColor0})`,
         'border-radius':customize.borderRadius + 'px',
         border:`${customize.borderWidth}px solid ${customize.borderColor}`,
       }"
@@ -76,6 +78,12 @@ export default {
     // this.chartInit()
   },
   computed: {
+    gradientColor0 () {
+      return this.config.customize.gradientColor0 || this.config.customize.gradientColor1 || 'transparent'
+    },
+    gradientColor1 () {
+       return this.config.customize.gradientColor1 || this.config.customize.gradientColor0 || 'transparent'
+    },
      unit(){
       return this.config?.customize.unit || ''
     },

data-room-ui/packages/BasicComponents/IndicatorCard2/setting.vue

@@ -44,12 +44,32 @@
           </div> -->
         <SettingTitle>基础</SettingTitle>
         <div class="lc-field-body">
-          <el-form-item label-width="100px" label="背景色">
+          <el-form-item label-width="100px" label="渐变背景色一">
             <ColorPicker
-              v-model="config.customize.bgColor"
+              v-model="config.customize.gradientColor0"
               :predefine="predefineThemeColors"
             />
           </el-form-item>
+          <el-form-item label-width="100px" label="渐变背景色二">
+            <ColorPicker
+              v-model="config.customize.gradientColor1"
+              :predefine="predefineThemeColors"
+            />
+          </el-form-item>
+          <el-form-item label-width="100px" label="渐变色方向">
+              <el-select
+                v-model="config.customize.gradientDirection"
+                popper-class="bs-el-select"
+                class="bs-el-select"
+              >
+                <el-option
+                  v-for="iconPosition in options"
+                  :key="iconPosition.value"
+                  :label="iconPosition.label"
+                  :value="iconPosition.value"
+                />
+              </el-select>
+            </el-form-item>
           <el-form-item label-width="100px" label="边框颜色">
             <ColorPicker
               v-model="config.customize.borderColor"
@@ -123,6 +143,7 @@
             <el-input-number
               v-model="config.customize.firstWeight"
               :precision="0"
+              :step="100"
               class="bs-el-input-number"
               label="请输入首行字体粗细"
             />
@@ -142,7 +163,7 @@
               v-model="config.customize.secondSize"
               :precision="0"
               class="bs-el-input-number"
-              label="请输入首行字体粗细"
+              label="请输入第二行文字大小"
             />
           </el-form-item>
            <el-form-item label-width="100px" label="第二行字体颜色">
@@ -155,6 +176,7 @@
             <el-input-number
               v-model="config.customize.secondWeight"
               :precision="0"
+              :step="100"
               class="bs-el-input-number"
               label="请输入第二行字体粗细"
             />
@@ -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',

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,

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:'背景色',

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:'背景色',

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:'背景色',

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:'背景色',

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:'背景色',

data-room-ui/packages/BorderComponents/GcBorder16/index.vue

@@ -2,10 +2,9 @@
   <div
     style="width: 100%;height: 100%"
     class="bs-design-wrap"
+    :id="'border'+ config.code"
     :style="{
-      'background-image-source':`url(${img})`,
-      border:'100px solid #000',
-      borderImageSlice:'100 100 100 100',
+      borderImageSlice:'100 100 100 100 fill',
       borderImageWidth:'100px 100px 100px 100px',
     }"
   >
@@ -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 {
 
 <style lang="scss" scoped>
 .bs-design-wrap {
+  border-image-source:url(component.png);
   width: 100%;
   height: 100%;
   position: absolute;

data-room-ui/packages/BorderComponents/GcBorder16/setting.js

@@ -1,7 +1,7 @@
 
-const type = 'GcBorder15'
+const type = 'GcBorder16'
 
-const name = '边框15'
+const name = '边框16'
 
 const isTitle = true
 

data-room-ui/packages/BorderComponents/GcBorder2/setting.js

@@ -19,7 +19,7 @@ const setting = [
     // 是否多选
     multiple: false,
     // 绑定的值
-    value: '',
+    value: '#83bff6',
   },
   {
     label:'边框副颜色',
@@ -31,7 +31,7 @@ const setting = [
     // 是否多选
     multiple: false,
     // 绑定的值
-    value: '',
+    value: '#00CED1',
   },
   {
     label:'背景色',

data-room-ui/packages/BorderComponents/GcBorder3/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:'背景色',

data-room-ui/packages/BorderComponents/GcBorder4/setting.js

@@ -19,7 +19,7 @@ const setting = [
     // 是否多选
     multiple: false,
     // 绑定的值
-    value: '',
+    value: '#83bff6',
   },
   {
     label:'边框副颜色',
@@ -31,7 +31,7 @@ const setting = [
     // 是否多选
     multiple: false,
     // 绑定的值
-    value: '',
+    value: '#00CED1',
   },
   {
     label:'背景色',

data-room-ui/packages/BorderComponents/GcBorder5/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:'背景色',

data-room-ui/packages/BorderComponents/GcBorder6/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:'背景色',

data-room-ui/packages/BorderComponents/GcBorder7/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:'背景色',

data-room-ui/packages/BorderComponents/GcBorder8/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:'背景色',

data-room-ui/packages/BorderComponents/GcBorder9/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:'背景色',

data-room-ui/packages/Borders/Border14/settingConfig.js

@@ -25,7 +25,7 @@ const customConfig = {
     // 边框线颜色
     borderColor: '#87888e',
     // 边框线宽度
-    borderWidth: 10,
+    borderWidth: 2,
     // 边框背景颜色
     backgroundColor: '#232832',
     colorType: 'single',

data-room-ui/packages/Borders/Border15/settingConfig.js

@@ -25,7 +25,7 @@ const customConfig = {
     // 边框线颜色
     borderColor: '#87888e',
     // 边框线宽度
-    borderWidth: 10,
+    borderWidth: 2,
     // 边框背景颜色
     backgroundColor: '#232832',
     colorType: 'single',

data-room-ui/packages/js/config/basicComponentsConfig.js

@@ -30,7 +30,7 @@ const typeList = [
   // 'button',
   'marquee',
   'chartTab',
-  'themeSwitcher',
+  // 'themeSwitcher',
   'themeSelect',
   'select',
   'timePicker',

data-room-ui/packages/js/utils/getComponentConfig.js

@@ -320,7 +320,7 @@ export default function getComponentConfig (type) {
           img: require('data-room-ui/assets/images/cardImg/indicard.png'),
           className: 'com.gccloud.dataroom.core.module.chart.components.ScreenIndexCardChart',
           w: 400,
-          h: 200,
+          h: 170,
           x: 0,
           y: 0,
           type
@@ -333,7 +333,7 @@ export default function getComponentConfig (type) {
             img: require('data-room-ui/assets/images/cardImg/indcard2.png'),
             className: 'com.gccloud.dataroom.core.module.chart.components.ScreenIndexCardChart',
             w: 400,
-            h: 200,
+            h: 170,
             x: 0,
             y: 0,
             type