bri-components 1.4.21 → 1.4.23

package/package.json

@@ -1,6 +1,6 @@
 {
     "name": "bri-components",
-    "version": "1.4.21",
+    "version": "1.4.23",
     "author": "dengshanghui",
     "description": "a component lib for vue project",
     "main": "src/index.js",

package/src/components/controls/base/BriUpload/BriUpload.vue

@@ -20,7 +20,7 @@
     >
         <!-- 编辑 -->
         <div
-            v-if="finalCanEdit"
+            v-if="!disabled"
             :class="classes"
             @click="clickUpload"
             @drop.prevent="handleDrop"
@@ -39,6 +39,7 @@
                 @change="handleChange"
             >
 
+            <!-- 上传按钮 -->
             <slot>
                 <div :class="`BriUpload-${showMode}-add`">
                     <!-- 上传 -->
@@ -164,7 +165,7 @@
             },
             showMode () {
                 return this.isInTable
-                    ? this.selfPropsObj._inTableStyle == "list" && !this.finalCanEdit
+                    ? this.selfPropsObj._inTableStyle == "list" && this.disabled
                         ? "tableList"
                         : "inline"
                     : this.selfPropsObj._showMode;
@@ -197,7 +198,9 @@
         },
         methods: {
             clickUpload () {
-                this.$refs.input.click();
+                if (!this.disabled) {
+                    this.$refs.input.click();
+                }
             },
             clickDeteItem (fileItem, fileIndex) {
                 this.curValList.splice(fileIndex, 1);

package/src/components/controls/base/BriUpload/uploadList.vue

@@ -2,7 +2,7 @@
     <div :class="{
         uploadList: true,
         [`uploadList-${showMode}`]: true,
-        [`uploadList-${propsObj._fileType}`]: true
+        [`uploadList-${subType}`]: true
     }">
         <!-- 普通文本模式 -->
         <template v-if="showMode ==='old'">
@@ -10,14 +10,17 @@
             <div
                 v-if="files.length"
                 ref="viewerImage"
-                :class="['uploadList-list', `uploadList-list-${propsObj._fileType}`]"
+                :class="{
+                    'uploadList-list': true,
+                    [`uploadList-list-${subType}`]: true
+                }"
             >
                 <div
                     v-for="(fileItem, fileIndex) in files"
                     :key="fileItem._key || fileItem._id"
                     :class="{
-                        'item': propsObj._fileType === 'image',
-                        [`item-${propsObj._fileType}`]: true
+                        'item': subType === 'image',
+                        [`item-${subType}`]: true
                     }"
                 >
                     <!-- 展示图 -->
@@ -53,8 +56,7 @@
                 v-else
                 class="uploadList-nodata"
             >
-                <Icon type="ios-time" />
-                <span>{{ noDataText }}</span>
+                <span>{{ emptyShowVal }}</span>
             </div>
         </template>
 
@@ -64,14 +66,17 @@
             <div
                 v-if="files.length"
                 ref="viewerImage"
-                :class="['uploadList-list', `uploadList-list-${propsObj._fileType}`]"
+                :class="[
+                    'uploadList-list',
+                    `uploadList-list-${subType}`
+                ]"
             >
                 <div
                     v-for="(fileItem, fileIndex) in files"
                     :key="fileItem._key || fileItem._id"
                     :class="{
-                        'item': propsObj._fileType === 'image',
-                        [`item-${propsObj._fileType}`]: true
+                        'item': subType === 'image',
+                        [`item-${subType}`]: true
                     }"
                 >
                     <!-- 展示图 -->
@@ -107,126 +112,134 @@
                 v-else
                 class="uploadList-inline-nodata"
             >
-                <span>{{ noDataText }}</span>
+                <span>{{ emptyShowVal }}</span>
             </div>
         </template>
 
-        <div
-            v-else-if="propsObj._fileType === 'file'"
-            ref="viewerImage"
-        >
-            <dsh-dropdown
-                v-if="files.length"
-                :list="files"
-                trigger="hover"
-                class="uploadList-fileList"
+        <!-- 新展示方式 -->
+        <template v-else>
+            <!-- 文件类型 -->
+            <div
+                v-if="subType === 'file'"
+                ref="viewerImage"
             >
-                <div :class="{
-                    'uploadList-fileList-fileName': true,
-                    'uploadList-fileList-fileName-edit': canEdit
-                }">
-                    {{ files.length }}个
-                    <Icon
-                        v-if="canEdit"
-                        type="ios-arrow-down"
-                    />
-                </div>
-
-                <div
-                    slot="dropdownItem"
-                    slot-scope="{ dropdownItem, dropdownIndex }"
-                    class="uploadList-fileList-fileItem"
-                >
-                    <img
-                        v-if="dropdownItem.mimetype.includes('image')"
-                        :data-original="dropdownItem.url"
-                        :src="$imageResize(dropdownItem.url, imageResizeConfig)"
-                        :alt="dropdownItem.name"
-                        class="fileItem-img"
+                <!-- 有值 -->
+                <template v-if="files.length">
+                    <dsh-dropdown
+                        :list="files"
+                        trigger="hover"
+                        class="uploadList-fileList"
                     >
-                    <img
-                        v-else
-                        :src="getFileImage(dropdownItem)"
-                        :alt="dropdownItem.name"
-                        class="fileItem-img"
+                        <div :class="{
+                            'uploadList-fileList-fileName': true,
+                            'uploadList-fileList-fileName-edit': canEdit
+                        }">
+                            {{ files.length }}个
+                            <Icon
+                                v-if="canEdit"
+                                type="ios-arrow-down"
+                            />
+                        </div>
+
+                        <div
+                            slot="dropdownItem"
+                            slot-scope="{ dropdownItem, dropdownIndex }"
+                            class="uploadList-fileList-fileItem"
+                        >
+                            <img
+                                v-if="dropdownItem.mimetype.includes('image')"
+                                :data-original="dropdownItem.url"
+                                :src="$imageResize(dropdownItem.url, imageResizeConfig)"
+                                :alt="dropdownItem.name"
+                                class="fileItem-img"
+                            >
+                            <img
+                                v-else
+                                :src="getFileImage(dropdownItem)"
+                                :alt="dropdownItem.name"
+                                class="fileItem-img"
+                            >
+
+                            <p class="fileItem-name-title">{{ dropdownItem.name }}</p>
+
+                            <dsh-icons
+                                class="fileItem-action"
+                                item-class="fileItem-action-icon"
+                                :list="$getOperationList(getBtns(dropdownItem))"
+                                @click="$dispatchEvent($event, dropdownItem, dropdownIndex)"
+                            ></dsh-icons>
+                        </div>
+                    </dsh-dropdown>
+
+                    <!-- <div
+                        v-for="(fileItem) in files"
+                        :key="fileItem._key || fileItem._id"
+                        :class="{
+                            'item': subType === 'image',
+                            [`item-${subType}`]: true
+                        }"
                     >
-                    <p class="fileItem-name-title">{{ dropdownItem.name }}</p>
-                    <dsh-icons
-                        class="fileItem-action"
-                        item-class="fileItem-action-icon"
-                        :list="$getOperationList(getBtns(dropdownItem))"
-                        @click="$dispatchEvent($event, dropdownItem, dropdownIndex)"
-                    ></dsh-icons>
-                </div>
-            </dsh-dropdown>
-
-            <span
-                v-else
-                class="uploadList-inline-nodata"
-            >
-                {{ noDataText }}
-            </span>
-
-            <div
-                v-for="(fileItem) in files"
-                :key="fileItem._key || fileItem._id"
-                :class="{
-                    'item': propsObj._fileType === 'image',
-                    [`item-${propsObj._fileType}`]: true
-                }"
-            >
+                        <img
+                            v-if="fileItem.mimetype.includes('image')"
+                            :data-original="fileItem.url"
+                            :src="$imageResize(fileItem.url, imageResizeConfig)"
+                            :alt="fileItem.name"
+                            style="display: none;"
+                        >
+                    </div> -->
+                </template>
 
-                <img
-                    v-if="fileItem.mimetype.includes('image')"
-                    :data-original="fileItem.url"
-                    :src="$imageResize(fileItem.url, imageResizeConfig)"
-                    :alt="fileItem.name"
-                    style="display: none;"
+                <!-- 无值 -->
+                <span
+                    v-else
+                    class="uploadList-inline-nodata"
                 >
+                    {{ emptyShowVal }}
+                </span>
             </div>
-        </div>
 
-        <!-- 新展示方式 -->
-        <template v-else>
-            <!-- 有值 -->
-            <div
-                v-if="files.length"
-                ref="viewerImage"
-                class="uploadList-inline-list"
-            >
+            <!-- 图片类型 -->
+            <template v-else>
+                <!-- 有值 -->
                 <div
-                    v-for="(fileItem, fileIndex) in files"
-                    :key="fileItem.url"
-                    class="item"
+                    v-if="files.length"
+                    ref="viewerImage"
+                    class="uploadList-inline-list"
                 >
-                    <img
-                        v-if="fileItem.mimetype.includes('image')"
-                        :data-original="fileItem.url"
-                        :src="$imageResize(fileItem.url, imageResizeConfig)"
-                        :alt="fileItem.name"
-                    >
-                    <img
-                        v-else
-                        :src="getFileImage(fileItem)"
-                        :alt="fileItem.name"
+                    <div
+                        v-for="(fileItem, fileIndex) in files"
+                        :key="fileItem.url"
+                        class="item"
                     >
+                        <img
+                            v-if="fileItem.mimetype.includes('image')"
+                            :data-original="fileItem.url"
+                            :src="$imageResize(fileItem.url, imageResizeConfig)"
+                            :alt="fileItem.name"
+                        >
+                        <img
+                            v-else
+                            :src="getFileImage(fileItem)"
+                            :alt="fileItem.name"
+                        >
 
-                    <dsh-icons
-                        class="item-action"
-                        item-class="item-action-icon"
-                        :list="$getOperationList(getBtns(fileItem))"
-                        @click="$dispatchEvent($event, fileItem, fileIndex)"
-                    ></dsh-icons>
+                        <dsh-icons
+                            class="item-action"
+                            item-class="item-action-icon"
+                            :list="$getOperationList(getBtns(fileItem))"
+                            @click="$dispatchEvent($event, fileItem, fileIndex)"
+                        ></dsh-icons>
+                    </div>
                 </div>
-            </div>
 
-            <!-- 无值 -->
-            <span
-                v-else
-                class="uploadList-inline-nodata"
-            >
-                {{ noDataText }}
-            </span>
+                <!-- 无值 -->
+                <span
+                    v-else
+                    class="uploadList-inline-nodata"
+                >
+                    {{ emptyShowVal }}
+                </span>
+            </template>
         </template>
     </div>
 </template>
@@ -261,14 +274,14 @@
             isShowEditIcon: Boolean,
             emptyShowVal: String
         },
+        data () {
+            return {
+                imageResizeConfig: {}
+            };
+        },
         computed: {
-            imageResizeConfig () {
-                return {};
-            },
-            noDataText () {
-                return this.canEdit
-                    ? `未上传${this.propsObj._fileType === "image" ? "图片" : "文件"}`
-                    : this.emptyShowVal;
+            subType () {
+                return this.propsObj._fileType;
             },
 
             allOperationMap () {
@@ -317,9 +330,6 @@
                 );
             }
         },
-        data () {
-            return {};
-        },
         methods: {
             // 点击删除某项
             clickDeleteItem (operationItem, fileItem, fileIndex) {

package/src/components/controls/base/DshInput/DshInput.vue

@@ -141,7 +141,6 @@
         computed: {
             selfPropsObj () {
                 return {
-                    _search: false,
                     _textType: "default", // ["default", "url"]
                     _readonly: ["serialNumber"].includes(this.controlType),
                     _showWordLimit: this.propsObj._showWordLimit || (!!this.propsObj._maxlength || this.propsObj._maxlength === 0),
@@ -149,6 +148,7 @@
                         minRows: 2,
                         maxRows: this.isUnitUpdate ? 40 : 30
                     },
+                    _search: false,
 
                     ...this.propsObj,
                     ...this.commonDealPropsObj
@@ -170,35 +170,48 @@
         },
         created () {},
         methods: {
-            onSearch (...params) {
-                this.$emit("search");
+            onEnter (event) {
+                this.$emit("enter");
+
                 this.$emit("inputChange");
+                this.enterStatus = true; // 点击回车时，先走onEnter立马走了onSearch
             },
+            onSearch (...params) {
+                // 点击回车时，先走onEnter立马走了onSearch
+                if (this.enterStatus !== true) {
+                    this.$emit("search");
+                    this.$emit("inputChange");
+                } else {
+                    this.enterStatus = false;
+                }
+            },
+
             // 无参数
             onFocus () {
-                this.changeStatus = false;
+                this.$emit("focus");
+
+                // this.changeStatus = false;
             },
             // 无参数
             onBlur () {
                 this.$emit("blur");
-                if (this.changeStatus === true) {
-                    this.change();
-                }
-            },
-            onEnter (event) {
-                this.$emit("enter");
-                this.$emit("inputChange");
+
+                // if (this.changeStatus === true) {
+                //     this.change();
+                // }
             },
             // 参数event
             onChange (event) {
-                this.changeStatus = true;
-                this.quickChange();
-
+                this.quickChange(); // 立马触发
                 clearTimeout(this.timer);
                 this.timer = setTimeout(() => {
+                    this.change();
                     this.$emit("inputChange");
                 }, 1000);
+
+                // this.changeStatus = true;
             },
+
             onClear () {
                 this.change();
             },

package/src/components/controls/base/DshNumber/BriInputNumber/BriInputNumber.vue

@@ -309,12 +309,16 @@
                 } else if (type === "down") {
                     val = addNum(val, -step);
                 }
+
                 this.setValue(val, "step");
             },
             setValue (val, setType) {
                 // 如果 step 是小数，且没有设置 precision，是有问题的
-                if (val && !isNaN(this.precision)) val = Number(Number(val).toFixed(this.precision));
+                if (val && !isNaN(this.precision)) {
+                    val = Number(Number(val).toFixed(this.precision));
+                }
 
+                // 处理最大值最小值
                 const {min, max} = this;
                 if (val !== null) {
                     if (val > max) {
@@ -324,20 +328,13 @@
                     }
                 }
 
+                // emit事件
                 this.$nextTick(() => {
                     this.transferValue = val;
                     if (setType && setType === "step") {
                         this.$emit("input", val);
                         this.$emit("on-change", val);
                         this.dispatch("FormItem", "on-form-change", val);
-                    } else {
-                        clearTimeout(this.timer);
-                        this.timer = setTimeout(() => {
-                            this.currentValue = val;
-                            this.$emit("input", val);
-                            this.$emit("on-change", val);
-                            this.dispatch("FormItem", "on-form-change", val);
-                        }, 600);
                     }
                 });
             },
@@ -348,6 +345,10 @@
             blur () {
                 this.focused = false;
                 if (this.transferValue !== this.currentValue) {
+                    this.currentValue = this.transferValue;
+                    this.$emit("input", this.transferValue);
+                    this.$emit("on-change", this.transferValue);
+                    this.dispatch("FormItem", "on-form-change", this.transferValue);
                     this.focused = false;
                     this.$emit("on-blur");
                     if (!findComponentUpward(this, ["DatePicker", "TimePicker", "Cascader", "Search"])) {
@@ -365,31 +366,35 @@
                 }
             },
             change (event) {
-                if (event.type == "change" && this.activeChange) return;
-
-                if (event.type == "input" && !this.activeChange) return;
+                if (event.type == "change" && this.activeChange) {
 
-                let val = event.target.value.trim();
-                if (this.parser) {
-                    val = this.parser(val);
-                }
+                } else if (event.type == "input" && !this.activeChange) {
 
-                const isEmptyString = val.length === 0;
-                if (isEmptyString) {
-                    this.setValue(null);
-                    return;
-                }
-                if (event.type == "input" && val.match(/^-?\.?$|\.$/)) return; // prevent fire early if decimal. If no more input the change event will fire later
+                } else {
+                    let val = event.target.value.trim();
+                    if (this.parser) {
+                        val = this.parser(val);
+                    }
 
-                // eslint认为\为无用的转义符(-不需要转义)
-                // if (event.type == "input" && val.match(/^\-?\.?$|\.$/)) return; // prevent fire early if decimal. If no more input the change event will fire later
-                val = Number(val);
+                    const isEmptyString = val.length === 0;
+                    if (isEmptyString) {
+                        this.setValue(null);
+                    } else {
+                        if (event.type == "input" && val.match(/^-?\.?$|\.$/)) {
+                            // prevent fire early if decimal. If no more input the change event will fire later
+                        } else {
+                            // eslint认为\为无用的转义符(-不需要转义)
+                            // if (event.type == "input" && val.match(/^\-?\.?$|\.$/)) return; // prevent fire early if decimal. If no more input the change event will fire later
+                            val = Number(val);
 
-                if (!isNaN(val)) {
-                    // this.currentValue = val;
-                    this.setValue(val);
-                } else {
-                    event.target.value = this.currentValue;
+                            if (!isNaN(val)) {
+                                // this.currentValue = val;
+                                this.setValue(val);
+                            } else {
+                                event.target.value = this.currentValue;
+                            }
+                        }
+                    }
                 }
             },
             changeVal (val) {

package/src/components/controls/base/DshNumber/DshNumber.vue

@@ -15,7 +15,6 @@
                 :max="maxNum"
                 :min="minNum"
                 :precision="digit"
-                @on-change="change"
             >
                 <div
                     v-if="unitStr"

package/src/components/controls/mixins/cascaderPickerMixin.js

@@ -82,6 +82,12 @@ export default {
         nameKey () {
             return this.selfPropsObj._nameKey;
         },
+        disabled () {
+            return this.selfPropsObj._disabled;
+        },
+        clearable () {
+            return this.selfPropsObj._clearable;
+        },
         resourceKey () {
             return this.selfPropsObj._resourceKey;
         },
@@ -164,8 +170,6 @@ export default {
         clickInput (e) {
             if (!this.disabled) {
                 this.showModal = true;
-            } else {
-                e.stopPropagation();
             }
         },
         clickCancel () {

package/src/components/controls/mixins/controlMixin.js

@@ -101,7 +101,7 @@ export default {
                 // TODO: 此处的请输入可能还有请选择之类的，待处理
                 _placeholder: this.canEdit && this.propsObj._enterType !== "calculate" && this.propsObj._disabled !== true && this.propsObj._readonly !== true
                     ? (this.propsObj._placeholder || `${selectControlTypes.includes(this.controlType) ? "选择" : "输入"}${this.propsObj._name}`)
-                    : undefined,
+                    : "",
                 _clearable: this.finalCanEdit && !this.propsObj._disabled && !this.propsObj._readonly && (this.propsObj._clearable === undefined ? true : this.propsObj._clearable),
                 _disabled: !this.finalCanEdit || !!this.propsObj._disabled || !!this.propsObj._readonly
             };
@@ -110,7 +110,9 @@ export default {
         multipleMode () {
             return this.isOnDftSearch || this.isOnSearch
                 ? true
-                : ["checkbox", "regions", "cascaders"].includes(this.controlType) || !!this.selfPropsObj._multiple;
+                : ["checkbox", "regions", "cascaders"].includes(this.controlType)
+                    ? true
+                    : !!this.selfPropsObj && !!this.selfPropsObj._multiple;
         },
         // 是否高度自由（在表格内且_heightAuto为true，2.详情页内且独占一行）
         isHeightAuto () {

package/src/components/controls/mixins/selectMixin.js

@@ -114,10 +114,10 @@ export default {
         }
     },
     created () {
-        this.init();
+        this.selectMixinInit();
     },
     methods: {
-        init () {
+        selectMixinInit () {
             this.getListData();
         },