bri-components 1.2.53 → 1.2.55

package/package.json

@@ -1,6 +1,6 @@
 {
     "name": "bri-components",
-    "version": "1.2.53",
+    "version": "1.2.55",
     "author": "dengshanghui",
     "description": "a component lib for vue project",
     "main": "src/index.js",
@@ -32,7 +32,7 @@
     "dependencies": {
         "ali-oss": "^6.13.1",
         "axios": "^0.23.0",
-        "bri-datas": "^1.0.42",
+        "bri-datas": "^1.0.47",
         "jshint": "^2.12.0",
         "jsonlint": "^1.6.3",
         "minio": "7.1.0",

package/src/components/controls/{BriControlInput.vue → DshControlInput.vue}

@@ -1,6 +1,6 @@
 <template>
     <div
-        class="BriControlInput"
+        class="DshControlInput"
         @mouseenter="isHover = true"
         @mouseleave="isHover = false"
     >
@@ -13,7 +13,7 @@
                     class="overflow"
                     :list="value"
                     :propsObj="{
-                        disabled: !canEdit,
+                        disabled: disabled,
                         closable: true
                     }"
                     @delete="clickDeleteItem"
@@ -47,13 +47,13 @@
         <!-- 图标 -->
         <template>
             <Icon
-                v-if="!$isEmptyData(value) && propsObj._clearable && isHover"
+                v-if="propsObj._clearable && !$isEmptyData(value) && isHover"
                 class="icon-close"
                 type="ios-close-circle"
                 @click.stop="clickClear"
             />
             <Icon
-                v-else
+                v-else-if="inputIcon"
                 class="icon-default"
                 :type="inputIcon"
             />
@@ -63,14 +63,13 @@
 
 <script>
     export default {
-        name: "BriControlInput",
+        name: "DshControlInput",
         props: {
-            canEdit: {
+            disabled: {
                 type: Boolean,
-                default: true
+                default: false
             },
             value: [Array, Object, String],
-            inputIcon: String,
             propsObj: {
                 type: Object,
                 default () {
@@ -83,7 +82,11 @@
                 isHover: false
             };
         },
-        computed: {},
+        computed: {
+            inputIcon () {
+                return this.propsObj._icon;
+            }
+        },
         created () {},
         methods: {
             clickDeleteItem (...params) {
@@ -97,7 +100,7 @@
 </script>
 
 <style lang="less" scoped>
-    .BriControlInput {
+    .DshControlInput {
         height: 32px;
         padding: 0px 0px 0px 7px;
         line-height: 24px;
@@ -133,9 +136,9 @@
     }
 </style>
 <style lang="less">
-    .BriControlInput {
+    .DshControlInput {
         .ivu-icon {
-            padding: 5px;
+            padding: 2px 5px;
             color: @placeholder-disabled-color;
         }