edit [basic-info] [basic-icon]

Author: ChanMenglin

src/components/base/Step/Basic/b-step-icon.vue

@@ -2,14 +2,14 @@
   <basic-icon
     v-if="size === 'sm'"
     icon="circle-fill"
-    :icon-color="color"
+    :color="color"
     class="align-self-center m-2"
     style="font-size: .8em;"
   />
   <basic-icon
     v-else
     :icon="icon"
-    :icon-color="color"
+    :color="color"
     class="align-self-center m-2"
     :style="`font-size: ${iconSize}px;`"
   />

src/components/basic/basic-icon.vue

@@ -2,7 +2,7 @@
   <i
     v-if="icon"
     class="d-flex align-items-center"
-    :class="iconColor ? 'text-' + iconColor : ''"
+    :class="color ? 'text-' + color : ''"
   >
     <svg
       class="svg-icon"
@@ -25,7 +25,7 @@ export default {
       ...util.props.string,
       required: true
     },
-    iconColor: util.props.textColor,
+    color: util.props.textColor,
   },
   computed: {
     iconName() {

src/components/basic/basic-info.vue

@@ -13,7 +13,7 @@ export default {
   name: "BasicInfo",
   props: {
     info: util.props.String,
-    infoColor: util.props.textColor,
+    color: util.props.textColor,
   }
 };
 </script>

src/components/basic/basic-label.vue

@@ -4,7 +4,7 @@
       <b-icon
         class="me-2"
         :icon="icon"
-        :icon-color="iconColor"
+        :color="iconColor"
       />
       <strong
         v-if="strong"
@@ -21,7 +21,7 @@
     </font>
     <b-info
       :info="info"
-      :info-color="infoColor"
+      :color="infoColor"
     />
   </div>
 </template>

src/components/content/GridView/b-grid-view.vue

@@ -105,7 +105,7 @@
                 :checked="isSelected(row)"
                 @input="input($event, row)"
               />
-              <base-icon
+              <basic-icon
                 v-else-if="selectStatus === enumSelect.check"
                 icon="check-circle-fill"
                 class="text-primary"
@@ -181,7 +181,6 @@ import GridHelper from './Basic/grid-helper'
 import GridPagination from './Basic/grid-pagination'
 import GridProperties from "./tools/Properties/grid-properties"
 
-import BaseIcon from "@/components/basic/basic-icon.vue"
 import BCheck from "@/components/form/Check/b-check.vue";
 export default {
   name: "BGridView",
@@ -199,7 +198,6 @@ export default {
     GridHelper,
     GridProperties,
     GridPagination,
-    BaseIcon,
     BCheck,
   },
   mixins: [ util.mixins.grid.select, ],