Bläddra i källkod

style: 统一el-radio-group 组件样式,进行深色主题适配

wu.jian2 1 år sedan
förälder
incheckning
88dd17be62

+ 42 - 42
data-room-ui/package-lock.json

@@ -1,6 +1,6 @@
 {
   "name": "@gcpaas/data-room-ui",
-  "version": "1.0.1-2023072503-Alpha",
+  "version": "1.0.1-2023080204-Alpha",
   "lockfileVersion": 1,
   "requires": true,
   "dependencies": {
@@ -3397,27 +3397,6 @@
         "whatwg-fetch": "^3.6.2"
       },
       "dependencies": {
-        "@vue/vue-loader-v15": {
-          "version": "npm:vue-loader@15.10.1",
-          "resolved": "https://registry.npmjs.org/vue-loader/-/vue-loader-15.10.1.tgz",
-          "integrity": "sha512-SaPHK1A01VrNthlix6h1hq4uJu7S/z0kdLUb6klubo738NeQoLbS6V9/d8Pv19tU0XdQKju3D1HSKuI8wJ5wMA==",
-          "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",
@@ -3489,26 +3468,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",
@@ -3726,6 +3685,47 @@
         "lodash": "^4.17.4"
       }
     },
+    "@vue/vue-loader-v15": {
+      "version": "npm:vue-loader@15.10.1",
+      "resolved": "https://registry.npmjs.org/vue-loader/-/vue-loader-15.10.1.tgz",
+      "integrity": "sha512-SaPHK1A01VrNthlix6h1hq4uJu7S/z0kdLUb6klubo738NeQoLbS6V9/d8Pv19tU0XdQKju3D1HSKuI8wJ5wMA==",
+      "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",

+ 5 - 1
data-room-ui/packages/BigScreenDesign/BorderSetting.vue

@@ -45,7 +45,10 @@
             />
           </el-form-item>
           <el-form-item label="背景色类型">
-            <el-radio-group v-model="config.customize.colorType">
+            <el-radio-group
+              v-model="config.customize.colorType"
+              class="bs-el-radio-group"
+            >
               <el-radio label="single">
                 纯色
               </el-radio>
@@ -194,6 +197,7 @@ export default {
 </script>
 
 <style lang="scss" scoped>
+@import '../assets/style/bsTheme.scss';
 .lc-field-body {
   padding: 12px 16px;
 }

+ 0 - 1
data-room-ui/packages/BigScreenDesign/OverallSetting/index.vue

@@ -500,7 +500,6 @@ export default {
 
   ::v-deep .el-input__inner,
   ::v-deep .el-color-picker__color-inner,
-  ::v-deep .el-radio__inner,
   ::v-deep .el-input-number--mini,
   ::v-deep .el-textarea__inner,
   ::v-deep .el-input-group__append,

+ 1 - 1
data-room-ui/packages/BigScreenDesign/RightSetting/DataSetting.vue

@@ -511,7 +511,7 @@
             >
               <el-radio-group
                 v-model="config.dataSource.serverPagination"
-                class="status-radio"
+                class="bs-el-radio-group"
                 size="mini"
                 @change="serverPaginationChange"
               >

+ 1 - 0
data-room-ui/packages/BigScreenDesign/RightSetting/G2CustomSetting.vue

@@ -119,6 +119,7 @@
                 <el-radio-group
                   v-else-if="setting.type === 'radio'"
                   v-model="setting.value"
+                  class="bs-el-radio-group"
                 >
                   <template v-for="(opt, optIndex) in setting.options">
                     <el-radio-button

+ 1 - 1
data-room-ui/packages/BigScreenDesign/RightSetting/TextGradient/index.vue

@@ -7,7 +7,7 @@
     >
       <el-radio-group
         v-model="position"
-        class="bs-radio-wrap"
+        class="bs-el-radio-group"
       >
         <el-radio label="top">
           上下

+ 4 - 1
data-room-ui/packages/DataSetManagement/src/CustomEditForm.vue

@@ -661,7 +661,10 @@
               filterable
             >
               <template slot-scope="scope">
-                <el-radio-group v-model="scope.row.require">
+                <el-radio-group
+                  v-model="scope.row.require"
+                  class="bs-el-radio-group"
+                >
                   <el-radio :label="1">
                   </el-radio>

+ 1 - 1
data-room-ui/packages/DataSetManagement/src/HttpEditForm.vue

@@ -171,7 +171,7 @@
                 >
                   <el-radio-group
                     v-model="dataForm.config.method"
-                    class="bs-radio-wrap"
+                    class="bs-el-radio-group"
                   >
                     <el-radio-button label="get">
                       GET

+ 4 - 1
data-room-ui/packages/DataSetManagement/src/JsComponents/ParamsSettingDialog.vue

@@ -64,7 +64,10 @@
             filterable
           >
             <template slot-scope="scope">
-              <el-radio-group v-model="scope.row.require">
+              <el-radio-group
+                v-model="scope.row.require"
+                class="bs-el-radio-group"
+              >
                 <el-radio :label="1">
                 </el-radio>

+ 1 - 8
data-room-ui/packages/DataSetManagement/src/OriginalEditForm.vue

@@ -231,7 +231,7 @@
                 >
                   <el-radio-group
                     v-model="dataForm.repeatStatus"
-                    class="bs-radio-wrap"
+                    class="bs-el-radio-group"
                     :disabled="!isEdit"
                   >
                     <el-radio :label="1">
@@ -949,8 +949,6 @@ export default {
 }
 </script>
 
-<style lang="scss"></style>
-
 <style lang="scss" scoped>
 @import '../../assets/style/bsTheme.scss';
 
@@ -960,11 +958,6 @@ export default {
   overflow-x: none;
 }
 
-// .tree-box {
-//   padding: 0;
-//   max-height: 270px;
-// }
-
 ::v-deep .el-input__inner {
   width: 100% !important;
 }

+ 1 - 0
data-room-ui/packages/DataSetManagement/src/ScriptEditForm.vue

@@ -440,6 +440,7 @@
                 <el-radio-group
                   v-model="scope.row.require"
                   :disabled="!isSet"
+                  class="bs-el-radio-group"
                 >
                   <el-radio :label="1">

+ 4 - 1
data-room-ui/packages/DataSetManagement/src/StoredProcedureEditForm.vue

@@ -477,7 +477,10 @@
               filterable
             >
               <template slot-scope="scope">
-                <el-radio-group v-model="scope.row.require">
+                <el-radio-group
+                  v-model="scope.row.require"
+                  class="bs-el-radio-group"
+                >
                   <el-radio :label="1">
                   </el-radio>

+ 12 - 1
data-room-ui/packages/assets/style/bsTheme.scss

@@ -526,9 +526,20 @@
 }
 
 // radio
-.bs-radio-wrap {
+.bs-el-radio-group {
+  .el-radio__label{
+    color: var(--bs-el-text) !important;
+  }
+  .el-radio__input.is-checked + .el-radio__label{
+    color: var(--bs-el-color-primary) !important;
+  }
   .el-radio__inner {
     border: 1px solid #dcdfe6 !important;
+    background: var(--bs-background-1) !important;
+    background-color: var(--bs-background-1) !important;
+  }
+  .el-radio__input.is-checked .el-radio__inner::after{
+    background-color: var(--bs-el-color-primary) !important;
   }
 }
 

+ 0 - 1
data-room-ui/packages/assets/style/settingWrap.scss

@@ -223,7 +223,6 @@
 
 ::v-deep .el-input__inner,
 ::v-deep .el-color-picker__color-inner,
-::v-deep .el-radio__inner,
 ::v-deep .el-input-number--mini,
 ::v-deep .el-textarea__inner,
 ::v-deep .el-input-group__append {