bri-components 1.1.2 → 1.1.4

package/src/components/controls/base/{textMultiple/MultipleInput.vue → BriInputs.vue}

@@ -1,8 +1,8 @@
 <template>
-    <div class="MutipleInput">
+    <div class="BriInputs">
         <Input
             v-show="status === 'edit'"
-            v-model="curVal"
+            v-model="curInputVal"
             icon="ios-search"
             :placeholder="selfPropsObj._placeholder"
             @on-enter="clickConfirm"
@@ -10,25 +10,25 @@
         ></Input>
         <div
             v-show="status === 'show'"
-            class="MutipleInput-show"
+            class="BriInputs-show"
         >
             <span
-                class="MutipleInput-show-content"
+                class="BriInputs-show-content"
                 @click="clickAdd"
             >
                 <span
                     v-for="(val,index) in value[controlKey]"
-                    class="MutipleInput-show-content-item"
+                    class="BriInputs-show-content-item"
                     :key="index"
                 >
                     <span
-                        class="MutipleInput-show-content-item-content"
+                        class="BriInputs-show-content-item-content"
                         @click.stop="clickEdit(val,index)"
                     >
                         {{val}}
                     </span>
                     <Icon
-                        class="MutipleInput-show-content-item-del"
+                        class="BriInputs-show-content-item-del"
                         type="ios-close"
                         size="20"
                         @click.stop="clickDelete(val)"
@@ -36,7 +36,7 @@
                 </span>
             </span>
             <Icon
-                class="MutipleInput-show-add"
+                class="BriInputs-show-add"
                 type="md-create"
                 @click="clickAdd"
             />
@@ -45,17 +45,18 @@
 </template>
 
 <script>
-    import controlMixin from "../../controlMixin.js";
+    import controlMixin from "../controlMixin.js";
 
     export default {
-        name: "MutipleInput",
-        mixins: [controlMixin],
-        props: {
-        },
+        name: "BriInputs",
+        mixins: [
+            controlMixin
+        ],
+        props: {},
         data () {
             return {
                 status: "edit", // show
-                curVal: "",
+                curInputVal: "",
                 curIndex: -1
             };
         },
@@ -72,7 +73,7 @@
         },
         methods: {
             clickConfirm () {
-                let val = this.curVal.trim();
+                let val = this.curInputVal.trim();
                 if (val && !this.value[this.controlKey].includes(val)) {
                     // 有值，且不存在于当前数组中
                     if (this.curIndex < 0) {
@@ -81,12 +82,12 @@
                         this.$set(this.value[this.controlKey], this.curIndex, val);
                     }
                 }
-                this.curVal = "";
+                this.curInputVal = "";
                 this.status = "show";
                 this.change();
             },
             clickEdit (val, index) {
-                this.curVal = val;
+                this.curInputVal = val;
                 this.curIndex = index;
                 this.status = "edit";
             },

package/src/components/controls/base/{ZUpload/YUploadImage.vue → BriUpload/BriUploadImage.vue}

@@ -1,35 +1,68 @@
 <template>
-    <div class="YUploadImage">
-        <div class="YUploadImage-set" ref="viewerImage">
+    <div class="BriUploadImage">
+        <div
+            class="BriUploadImage-set"
+            ref="viewerImage"
+        >
             <div
                 v-if="value[propsObj._key] || propsObj._default || percent"
-                :class="['YUploadImage-set-img', isAvatar ? 'YUploadImage-set-avatar' : '']"
+                :class="['BriUploadImage-set-img', isAvatar ? 'BriUploadImage-set-avatar' : '']"
                 :style="{
                     backgroundImage: `url(${$imageResize(value[propsObj._key] || propsObj._default, imageResizeConfig)})`,
                     borderRadius: propsObj.radius ? '50%' : ''
                 }"
             >
-                <img :data-original="value[propsObj._key]" style="display:none">
-                <div v-if="value[propsObj._key] && propsObj._canAction" class="YUploadImage-set-action">
-                    <Icon class="YUploadImage-set-img-action" type="ios-eye-outline" size="16" @click.native="handlePreview"></Icon>
-                    <Icon class="YUploadImage-set-img-action" type="ios-trash-outline" size="16" @click.native="handleRemove"></Icon>
+                <img
+                    :data-original="value[propsObj._key]"
+                    style="display:none"
+                >
+                <div
+                    v-if="value[propsObj._key] && propsObj._canAction"
+                    class="BriUploadImage-set-action"
+                >
+                    <Icon
+                        class="BriUploadImage-set-img-action"
+                        type="ios-eye-outline"
+                        size="16"
+                        @click.native="handlePreview"
+                    ></Icon>
+                    <Icon
+                        class="BriUploadImage-set-img-action"
+                        type="ios-trash-outline"
+                        size="16"
+                        @click.native="handleRemove"
+                    ></Icon>
                 </div>
                 <!-- 上传进度 -->
-                <div  v-if="percent" class="YUploadImage-set-img-circle">
+                <div
+                    v-if="percent"
+                    class="BriUploadImage-set-img-circle"
+                >
                     <i-circle
                         class="circle"
                         :percent="percent"
                         :stroke-color="percentColor"
                     >
-                        <Icon v-if="percent == 100" type="ios-checkmark"></Icon>
+                        <Icon
+                            v-if="percent == 100"
+                            type="ios-checkmark"
+                        ></Icon>
                         <span v-else>{{ percent }}%</span>
                     </i-circle>
                 </div>
 
             </div>
             <div class="wrap">
-                <Button type="default" class="btn-cancel-outline z-default">点击上传</Button>
-                <input id="fileupload" class="file" :type="inputType" @change="setImage" />
+                <Button
+                    type="default"
+                    class="btn-cancel-outline z-default"
+                >点击上传</Button>
+                <input
+                    id="fileupload"
+                    class="file"
+                    :type="inputType"
+                    @change="setImage"
+                />
             </div>
         </div>
 
@@ -43,7 +76,10 @@
             :footer-hide="true"
             @on-visible-change="visibleChange"
         >
-            <div class="avatar-modal" style="width:400px;margin: 0 auto;">
+            <div
+                class="avatar-modal"
+                style="width:400px;margin: 0 auto;"
+            >
                 <dsh-cropper
                     style="width: 400px;height: 400px;"
                     ref="cropper"
@@ -54,7 +90,10 @@
                 </dsh-cropper>
                 <div class="avatar-modal-footer bri-footer">
                     <Button @click="cancelAvatarModal()">取消</Button>
-                    <Button type="primary" @click="photoSubmit()">保存</Button>
+                    <Button
+                        type="primary"
+                        @click="photoSubmit()"
+                    >保存</Button>
                 </div>
             </div>
         </Modal>
@@ -66,8 +105,10 @@
     import Viewer from "viewerjs";
 
     export default {
-        name: "YUploadImage",
-        mixins: [uploadMixin],
+        name: "BriUploadImage",
+        mixins: [
+            uploadMixin
+        ],
         components: {},
         props: {
             value: Object,

package/src/components/controls/base/{ZUpload → BriUpload}/index.vue

@@ -1,20 +1,21 @@
 <template>
-    <y-upload-image
+    <bri-upload-image
         v-if="propsObj._kind === 'uploadImage'"
-        :propsObj="propsObj"
         :value="value"
-        ossType="putUpload"
+        :propsObj="propsObj"
         @change="change"
-    ></y-upload-image>
+    ></bri-upload-image>
 
     <div
         v-else
         :class="[
             prefixCls,
-            'ZUpload',
-            `ZUpload-${showType}`,
-            { 'ZUpload-readonly': $isReadonly(canEdit, propsObj) },
-            { 'ZUpload-disabled': $isDisabled(canEdit, propsObj) },
+            'BriUpload',
+            `BriUpload-${showType}`,
+            {
+                'BriUpload-readonly': !canEdit,
+                'BriUpload-disabled': !finalCanEdit
+            }
         ]"
     >
         <!-- 上传 -->
@@ -38,11 +39,11 @@
                 :disabled="!canClickUpload"
             >
             <slot>
-                <div :class="`ZUpload-${showType}-imageadd`">
+                <div :class="`BriUpload-${showType}-imageadd`">
 
                     <i-circle
                         v-if="percent"
-                        :class="`ZUpload-${showType}-circle`"
+                        :class="`BriUpload-${showType}-circle`"
                         :percent="percent"
                         :stroke-color="percentColor"
                     >
@@ -62,17 +63,16 @@
                 </div>
             </slot>
         </div>
+
         <!-- 列表 -->
         <slot name="list">
             <upload-list
                 v-if="showUploadList"
-                :propsObj="propsObj"
-                :showType="showType"
+                :canEdit="finalCanEdit"
                 :files="val"
-                :isReadonly="$isReadonly(canEdit, propsObj)"
-                :isDisabled="$isDisabled(canEdit, propsObj)"
-                :finalCanEdit="finalCanEdit"
-                :isUnit="isUnit"
+                :emptyShowVal="emptyShowVal"
+                :showType="showType"
+                :propsObj="propsObj"
                 @on-file-remove="handleRemove"
                 @on-file-preview="handlePreview"
             ></upload-list>
@@ -81,17 +81,20 @@
 </template>
 
 <script>
-    import YUploadImage from "./YUploadImage.vue";
-    import uploadList from "./upload-list.vue";
     import controlMixin from "../../controlMixin.js";
     import uploadMixin from "./uploadMixin.js";
+    import BriUploadImage from "./BriUploadImage.vue";
+    import uploadList from "./upload-list.vue";
 
     const prefixCls = "ivu-upload";
     export default {
         name: "Upload",
-        mixins: [controlMixin, uploadMixin],
+        mixins: [
+            controlMixin,
+            uploadMixin
+        ],
         components: {
-            YUploadImage,
+            BriUploadImage,
             uploadList
         },
         props: {
@@ -228,7 +231,7 @@
                         [`${prefixCls}-select`]: this.type === "select",
                         [`${prefixCls}-drag`]: this.type === "drag",
                         [`${prefixCls}-dragOver`]: this.type === "drag" && this.dragOver,
-                        [`ZUpload-${this.showType}-wrapper`]: true
+                        [`BriUpload-${this.showType}-wrapper`]: true
                     }
                 ];
             }

package/src/components/controls/base/{ZUpload → BriUpload}/upload-list.vue

@@ -90,10 +90,14 @@
                     ></dsh-icons>
                 </div>
             </div>
-            <span v-else class="uploadList-inline-nodata">{{ noText }}</span>
+            <span
+                v-else
+                class="uploadList-inline-nodata"
+            >{{ noText }}</span>
         </template>
     </div>
 </template>
+
 <script>
     import Viewer from "viewerjs";
     import axios from "axios";
@@ -101,6 +105,10 @@
     export default {
         name: "uploadList",
         props: {
+            canEdit: {
+                type: Boolean,
+                default: true
+            },
             files: {
                 type: Array,
                 default () {
@@ -111,11 +119,13 @@
                 type: String,
                 default: "old" // inline, old, normal
             },
-            isReadonly: Boolean,
-            isDisabled: Boolean,
-            finalCanEdit: Boolean,
-            propsObj: Object,
-            isUnit: Boolean
+            emptyShowVal: String,
+            propsObj: {
+                type: Object,
+                default () {
+                    return {};
+                }
+            }
         },
         computed: {
             operationMap () {
@@ -125,7 +135,7 @@
                         icon: "ios-trash-outline",
                         size: "16",
                         event: "handleRemove",
-                        canShow: this.finalCanEdit
+                        canShow: this.canEdit
                     },
                     download: {
                         name: "下载",
@@ -151,19 +161,16 @@
                 if (this.files && this.files.length) {
                     return "";
                 } else {
-                    if (this.finalCanEdit) {
+                    if (this.canEdit) {
                         return `未上传${this.propsObj._fileType === "image" ? "图片" : "文件"} `;
-                    } else if (this.isUnit) {
-                        return "-";
                     } else {
-                        return "暂无内容";
+                        return this.emptyShowVal;
                     }
                 }
             }
         },
         data () {
-            return {
-            };
+            return {};
         },
         methods: {
             getBtns (canPreview) {

package/src/components/controls/base/{ZUpload → BriUpload}/uploadMixin.js

@@ -1,4 +1,5 @@
 import axios from "axios";
+
 const minio = require("minio");
 const stream = require("stream");
 export default {
@@ -25,8 +26,7 @@ export default {
             percent: 0
         };
     },
-    created () {
-    },
+    created () {},
     computed: {
         computedGroupKey () {
             return this.propsObj.groupKey || this.groupKey;
@@ -97,7 +97,11 @@ export default {
                 }
             })
                 .then(response => {
-                    this.handleSuccess && this.handleSuccess(response, response.data, file);
+                    const newResponse = {
+                        data: response,
+                        res: {}
+                    };
+                    this.handleSuccess && this.handleSuccess(newResponse, newResponse.data, file);
                     callback && callback(response.data);
                 }).catch(error => {
                     this.handleError && this.handleError(error, {}, file);

package/src/components/controls/base/{DshCascader.vue → DshCascader/DshCascader.vue}

@@ -1,7 +1,7 @@
 <template>
     <div :class="`DshCascader`">
         <!-- 编辑和disabled模式 -->
-        <template v-if="finalCanEdit  || $isDisabled(canEdit, selfPropsObj)">
+        <template v-if="canEdit">
             <!-- 多选 多选模式的filterable必须是false，不然出bug -->
             <template v-if="useMultiple === true">
                 <Cascader
@@ -21,7 +21,8 @@
                 >
                     <dsh-control-define
                         :value="valTags"
-                        :canEdit="finalCanEdit"
+                        :canEdit="canEdit"
+                        :finalCanEdit="finalCanEdit"
                         :propsObj="{
                             ...selfPropsObj,
                             _multiplerow: selfPropsObj._span == 24 || !selfPropsObj._span
@@ -45,7 +46,7 @@
                         >
                             <span :class="{
                                 'DshCascader-single-val-text': true,
-                                'DshCascader-single-val-text-disabled': $isDisabled(canEdit, propsObj),
+                                'DshCascader-single-val-text-disabled': !finalCanEdit,
                             }">
                                 {{ $getTreeLinealDatas(value[controlKey], cascaderData, "name").join("/") }}
                             </span>
@@ -82,16 +83,16 @@
                     v-else
                     style="width: 100%;"
                     :class="{
-                        'DshCascader-disabled': $isDisabled(canEdit, selfPropsObj)
+                        'DshCascader-disabled': !finalCanEdit
                     }"
                     :value="value[controlKey]"
                     :data="renderCascaderData"
                     :placeholder="selfPropsObj._placeholder"
-                    :disabled="$isDisabled(canEdit, selfPropsObj)"
+                    :disabled="!finalCanEdit"
                     :change-on-select="selfPropsObj._changeOnSelect"
                     :clearable="selfPropsObj._clearable"
                     :size="selfPropsObj._size"
-                    :filterable="selfPropsObj._filterable && !$isDisabled(canEdit, selfPropsObj)"
+                    :filterable="selfPropsObj._filterable && finalCanEdit"
                     :transfer="selfPropsObj._transfer"
                     :transfer-class-name="selfPropsObj._transferClassName"
                     :load-data="loadData"
@@ -103,19 +104,23 @@
         </template>
 
         <!-- 查看模式 -->
-        <control-show
+        <dsh-control-define
             v-else
-            :showVal="showVal"
-            :propsObj="selfPropsObj"
-            :isUnit="isUnit"
-        ></control-show>
+            :value="valTags"
+            :canEdit="canEdit"
+            :finalCanEdit="finalCanEdit"
+            :propsObj="{
+                ...selfPropsObj,
+                _multiplerow: selfPropsObj._span == 24 || !selfPropsObj._span
+            }"
+        ></dsh-control-define>
     </div>
 </template>
 
 <script>
     import { regionData } from "bri-datas";
-    import controlMixin from "../controlMixin.js";
-    import InfoCascader from "../../other/InfoCascader";
+    import controlMixin from "../../controlMixin.js";
+    import InfoCascader from "./InfoCascader.vue";
 
     const loop = function (data = [], level, parentCode, filterVals = []) {
         if (data && filterVals.length) {
@@ -144,7 +149,9 @@
 
     export default {
         name: "DshCascader",
-        mixins: [controlMixin],
+        mixins: [
+            controlMixin
+        ],
         components: {
             InfoCascader
         },
@@ -215,19 +222,19 @@
                 return this.value[this.controlKey]
                     ? this.value[this.controlKey].map(item => this.$getTreeLinealDatas(item, this.cascaderData, "name").join("/"))
                     : [];
-            },
-
-            selfModalPropsObj () {
-                return {
-                    mode: "default",
-                    title: this.selfPropsObj._placeholder
-                };
-            },
-            showVal () {
-                return this.useMultiple
-                    ? this.valTags.join("、")
-                    : this.$getTreeLinealDatas(this.value[this.controlKey], this.cascaderData, "name").join(["region"].includes(this.selfPropsObj._type) ? "" : "/");
             }
+
+            // selfModalPropsObj () {
+            //     return {
+            //         mode: "default",
+            //         title: this.selfPropsObj._placeholder
+            //     };
+            // },
+            // showVal () {
+            //     return this.useMultiple
+            //         ? this.valTags.join("、")
+            //         : this.$getTreeLinealDatas(this.value[this.controlKey], this.cascaderData, "name").join(["region"].includes(this.selfPropsObj._type) ? "" : "/");
+            // }
         },
         created () {
             this.init();

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

@@ -52,10 +52,6 @@
             <Select
                 v-else
                 v-model="value[controlKey]"
-                :class="{
-                    'DshCheckbox-select-readonly': $isReadonly(canEdit, selfPropsObj),
-                    'DshCheckbox-select-disabled': $isDisabled(canEdit, selfPropsObj)
-                }"
                 :multiple="true"
                 :placeholder="selfPropsObj._placeholder"
                 :disabled="!finalCanEdit"
@@ -105,16 +101,12 @@
                     }"
                 >{{ col.name }}</span>
             </div>
+
             <div
                 v-else
-                class="control-nodata-text dsh-ellipsis"
+                class="control-notext dsh-ellipsis"
             >
-                <template v-if="isUnit">
-                    -
-                </template>
-                <template v-else>
-                    暂无内容
-                </template>
+                {{ emptyShowVal }}
             </div>
         </Ctooltip>
 
@@ -131,7 +123,10 @@
     // optionKind值 'flat'、'dropdown'
     export default {
         name: "DshCheckbox",
-        mixins: [controlMixin, selectMixin],
+        mixins: [
+            controlMixin,
+            selectMixin
+        ],
         props: {},
         data () {
             return {
@@ -169,24 +164,26 @@
             listData () {
                 return (this.selfPropsObj._data || []).concat(this.initListData);
             },
-
             showVal () {
                 return this.colData.map(col => col.name).join("、");
             },
             // 选项数据
             colData () {
-                return this.listData.filter(item => (this.value[this.controlKey] || []).includes(item._key));
+                return this.listData.filter(item => (this.curVal || []).includes(item._key));
             },
             flatShowAlign () {
-                return !this.propsObj._align || this.propsObj._align == "left" || !this.isUnit ? "flex-start" : this.propsObj._align == "right" ? "flex-end" : "center";
+                return !this.propsObj._align || this.propsObj._align == "left" || !this.isUnitShow
+                    ? "flex-start"
+                    : this.propsObj._align == "right"
+                        ? "flex-end"
+                        : "center";
             }
         },
-        created () {
-        },
+        created () {},
         methods: {
             // 下拉框的选择
             select (item) {
-                let val = this.value[this.controlKey];
+                let val = this.curVal;
                 if (val.includes(item.value)) {
                     let itemIndex = val.findIndex(valItem => valItem === item.value);
                     val.splice(itemIndex, 1);
@@ -199,9 +196,9 @@
 
             isDisabled (item) {
                 return !!(
+                    !this.finalCanEdit ||
                     item._disabled ||
-                    this.value[this.controlKey] && this.value[this.controlKey].length >= this.selfPropsObj._max && !this.value[this.controlKey].includes(item._key) ||
-                    !this.finalCanEdit
+                    this.curVal && this.curVal.length >= this.selfPropsObj._max && !this.curVal.includes(item._key)
                 );
             }
         }