bri-components 1.1.2 → 1.1.3

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

@@ -1,52 +1,65 @@
 <template>
-    <div :class="`DshInput`">
-        <Input
-            v-if="finalCanEdit || $isDisabled(canEdit, selfPropsObj)"
-            :class="{
-                'DshInput-disabled': $isDisabled(canEdit, selfPropsObj)
-            }"
-            v-model="value[controlKey]"
-            :type="inputType"
-            :placeholder="selfPropsObj._placeholder"
-            :disabled="!finalCanEdit"
-            :clearable="selfPropsObj._clearable"
-            :size="selfPropsObj._size"
-            :rows="selfPropsObj._rows"
-            :search="selfPropsObj._search"
-            :show-word-limit="selfPropsObj._showWordLimit"
-            :maxlength="selfPropsObj._maxlength"
-            :autosize="selfPropsObj._autosize"
-            @on-enter="onEnter"
-            @on-search="onSearch"
-            @on-focus="onFocus"
-            @on-change="onChange"
-            @on-blur="onBlur"
-            @on-clear="onClear"
-        >
-        <span
-            v-if="selfPropsObj._prepend"
-            slot="prepend"
-        >{{ selfPropsObj._prepend }}</span>
-        <span
-            v-if="selfPropsObj._append"
-            slot="append"
-        >{{ selfPropsObj._append }}</span>
-        </Input>
-        <!-- textarea特殊处理 -->
-        <p
-            v-else-if="subType === 'textarea' && showVal"
-            :class="['control-show-text', 'DshInput-textarea-show']"
-            v-text="showVal"
-        >
-        </p>
+    <div class="DshInput">
+        <!-- 编辑 -->
+        <template v-if="canEdit">
+            <Input
+                v-model="value[controlKey]"
+                :type="subType"
+                :placeholder="selfPropsObj._placeholder"
+                :disabled="!finalCanEdit"
+                :clearable="selfPropsObj._clearable"
+                :size="selfPropsObj._size"
+                :rows="selfPropsObj._rows"
+                :search="selfPropsObj._search"
+                :show-word-limit="selfPropsObj._showWordLimit"
+                :maxlength="selfPropsObj._maxlength"
+                :autosize="selfPropsObj._autosize"
+                @on-enter="onEnter"
+                @on-search="onSearch"
+                @on-focus="onFocus"
+                @on-change="onChange"
+                @on-blur="onBlur"
+                @on-clear="onClear"
+            >
+            <span
+                v-if="selfPropsObj._prepend"
+                slot="prepend"
+            >{{ selfPropsObj._prepend }}</span>
 
-        <!-- 查看模式 -->
-        <control-show
-            v-else
-            :showVal="showVal"
-            :propsObj="selfPropsObj"
-            :isUnit="isUnit"
-        ></control-show>
+            <span
+                v-if="selfPropsObj._append"
+                slot="append"
+            >{{ selfPropsObj._append }}</span>
+            </Input>
+        </template>
+
+        <!-- 查看 -->
+        <template v-else>
+            <!-- 表格 里的查看 -->
+            <template v-if="isUnitShow">
+                <control-show
+                    :showVal="curVal"
+                    :emptyShowVal="emptyShowVal"
+                    :propsObj="selfPropsObj"
+                ></control-show>
+            </template>
+
+            <!-- 查看页 里的查看 (textarea单独处理) -->
+            <template v-else>
+                <p
+                    v-if="subType === 'textarea' && curVal"
+                    class="DshInput-show-textarea"
+                    v-text="curVal"
+                ></p>
+
+                <control-show
+                    v-else
+                    :showVal="curVal"
+                    :emptyShowVal="emptyShowVal"
+                    :propsObj="selfPropsObj"
+                ></control-show>
+            </template>
+        </template>
     </div>
 </template>
 
@@ -55,7 +68,9 @@
 
     export default {
         name: "DshInput",
-        mixins: [controlMixin],
+        mixins: [
+            controlMixin
+        ],
         props: {},
         data () {
             return {
@@ -74,20 +89,12 @@
                 };
             },
             subType () {
-                return this.selfPropsObj._type;
-            },
-            inputType () {
-                return ["text", "password", "textarea", "url", "email", "number", "tel"].includes(this.subType)
-                    ? this.subType
+                return ["text", "password", "textarea", "url", "email", "number", "tel"].includes(this.selfPropsObj._type)
+                    ? this.selfPropsObj._type
                     : undefined;
-            },
-
-            showVal () {
-                return this.value[this.controlKey] || "";
             }
         },
-        created () {
-        },
+        created () {},
         methods: {
             onSearch (...params) {
                 this.$emit("search", ...params);

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

@@ -48,12 +48,12 @@
                 :name="name"
                 :value="formatterValue"
                 :placeholder="placeholder"
-                :style="{textAlign:itemDisabled ? 'right':'left'}"
             >
             <slot name="suffix"></slot>
         </div>
     </div>
 </template>
+
 <script>
     import { findComponentUpward } from "./utils/assist";
     import Emitter from "./mixins/emitter";

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

@@ -1,15 +1,10 @@
 <template>
-    <div :class="`DshNumber`">
-        <!-- 编辑模式 组件无clearable -->
-        <template v-if="finalCanEdit">
+    <div class="DshNumber">
+        <!-- 编辑 -->
+        <template v-if="canEdit">
             <BriInputNumber
-                style="width: 100%"
-                :class="{
-                    'DshNumber-readonly': $isReadonly(canEdit, selfPropsObj),
-                    'DshNumber-disabled': $isDisabled(canEdit, selfPropsObj)
-                }"
                 v-model="value[controlKey]"
-                :placeholder="$showPlaceholder(canEdit, selfPropsObj) ? `请输入${selfPropsObj._name}` : ''"
+                :placeholder="selfPropsObj._placeholder"
                 :disabled="!finalCanEdit"
                 :formatter="formatterFunc"
                 :max="maxNum"
@@ -20,36 +15,53 @@
                 <div
                     v-if="unitStr"
                     slot="suffix"
-                    style="padding-right: 24px; padding-left: 8px; line-height: 30px; white-space: nowrap"
+                    class="DshNumber-suffix"
                 >
                     {{ unitStr }}
                 </div>
             </BriInputNumber>
         </template>
 
-        <!-- 查看模式 -->
+        <!-- 查看 -->
         <template v-else>
-            <Progress
-                v-if="selfPropsObj._showProgress"
-                :percent="value[controlKey] > 100 ? 100 : toDecimal(value[controlKey])"
-            />
-            <control-show
-                v-else
-                :showVal="String(showVal)"
-                :propsObj="selfPropsObj"
-                :isUnit="isUnit"
-            ></control-show>
+            <!-- 表格 里的查看 -->
+            <template v-if="isUnitShow">
+                <!-- 进度条模式 -->
+                <Progress
+                    v-if="selfPropsObj._showProgress"
+                    :percent="curVal > 100 ? 100 : toDecimal(curVal)"
+                />
+
+                <!-- 文字模式 -->
+                <control-show
+                    v-else
+                    :showVal="showVal"
+                    :emptyShowVal="emptyShowVal"
+                    :propsObj="selfPropsObj"
+                ></control-show>
+            </template>
+
+            <!-- 查看页 里的查看 -->
+            <template v-else>
+                <control-show
+                    :showVal="showVal"
+                    :emptyShowVal="emptyShowVal"
+                    :propsObj="selfPropsObj"
+                ></control-show>
+            </template>
         </template>
     </div>
 </template>
 
 <script>
-    import BriInputNumber from "./BriInputNumber/BriInputNumber.vue";
     import controlMixin from "../../controlMixin.js";
+    import BriInputNumber from "./BriInputNumber/BriInputNumber.vue";
 
     export default {
         name: "DshNumber",
-        mixins: [controlMixin],
+        mixins: [
+            controlMixin
+        ],
         components: {
             BriInputNumber
         },
@@ -60,22 +72,25 @@
         computed: {
             selfPropsObj () {
                 return {
-                    ...this.propsObj
+                    ...this.propsObj,
+                    ...this.commonDealPropsObj
                 };
             },
             formatterFunc () {
-                if (this.separator) {
-                    return this.$numToSeparator;
-                } else {
-                    return value => `${value}`;
-                }
+                return this.separator
+                    ? this.$numToSeparator
+                    : value => `${value}`;
             },
 
             maxNum () {
-                return this.selfPropsObj._max || this.selfPropsObj._max === 0 ? this.selfPropsObj._max : Infinity;
+                return this.selfPropsObj._max || this.selfPropsObj._max === 0
+                    ? this.selfPropsObj._max
+                    : Infinity;
             },
             minNum () {
-                return this.selfPropsObj._min || this.selfPropsObj._min === 0 ? this.selfPropsObj._min : -Infinity;
+                return this.selfPropsObj._min || this.selfPropsObj._min === 0
+                    ? this.selfPropsObj._min
+                    : -Infinity;
             },
             // round, decimal, 为其他值不处理
             round () {
@@ -111,24 +126,11 @@
         },
         created () {},
         methods: {
-            toDecimal (x) {
-                let f = parseFloat(x);
-                if (isNaN(f)) {
-                    return;
-                }
-                f = Math.round(x * 100) / 100;
-                return f;
+            toDecimal (num) {
+                return isNaN(parseFloat(num))
+                    ? undefined
+                    : Math.round(num * 100) / 100;
             }
         }
     };
 </script>
-
-<style lang="less">
-    .DshNumber {
-        width: 100%;
-
-        .ivu-input-number-disabled .ivu-input-number-input {
-            color:#999;
-        }
-    }
-</style>

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

@@ -4,13 +4,8 @@
         <!-- 最小值 -->
         <div class="DshNumberange-left">
             <BriInputNumber
-                style="width: 100%;"
-                :class="{
-                    'DshNumberange-left-readonly': $isReadonly(canEdit, propsObj),
-                    'DshNumberange-left-disabled': $isDisabled(canEdit, propsObj)
-                }"
                 v-model="value[propsObj._key][0]"
-                :placeholder="$showPlaceholder(canEdit, propsObj) ? `请输入${propsObj._name}最小值` : ''"
+                :placeholder="selfPropsObj._placeholder ? `${selfPropsObj._placeholder}最小值` : ''"
                 :disabled="!finalCanEdit"
                 :formatter="formatterFunc"
                 :max="maxNum"
@@ -22,7 +17,7 @@
                 <div
                     v-if="unitStr"
                     slot="suffix"
-                    style="padding-right: 24px; padding-left: 8px; line-height: 30px; white-space: nowrap"
+                    class="DshNumberange-suffix"
                 >
                     {{ unitStr }}
                 </div>
@@ -35,13 +30,8 @@
         <!-- 最大值 -->
         <div class="DshNumberange-right">
             <BriInputNumber
-                style="width: 100%;"
-                :class="{
-                    'DshNumberange-right-readonly': $isReadonly(canEdit, propsObj),
-                    'DshNumberange-right-disabled': $isDisabled(canEdit, propsObj)
-                }"
                 v-model="value[propsObj._key][1]"
-                :placeholder="$showPlaceholder(canEdit, propsObj) ? `请输入${propsObj._name}最大值` : ''"
+                :placeholder="selfPropsObj._placeholder ? `${selfPropsObj._placeholder}最大值` : ''"
                 :disabled="!finalCanEdit"
                 :max="maxNum"
                 :min="minNum"
@@ -52,7 +42,7 @@
                 <div
                     v-if="unitStr"
                     slot="suffix"
-                    style="padding-right: 24px; padding-left: 8px; line-height: 30px; white-space: nowrap"
+                    class="DshNumberange-suffix"
                 >
                     {{ unitStr }}
                 </div>
@@ -67,7 +57,9 @@
 
     export default {
         name: "DshNumberange",
-        mixins: [controlMixin],
+        mixins: [
+            controlMixin
+        ],
         components: {
             BriInputNumber
         },
@@ -78,9 +70,11 @@
         computed: {
             selfPropsObj () {
                 return {
-                    ...this.propsObj
+                    ...this.propsObj,
+                    ...this.commonDealPropsObj
                 };
             },
+
             formatterFunc () {
                 if (this.propsObj._separator) {
                     return this.$numToSeparator;
@@ -128,10 +122,6 @@
             }
         },
         created () {},
-        methods: {
-            change (...params) {
-                this.$emit("change", ...params);
-            }
-        }
+        methods: {}
     };
 </script>

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

@@ -8,8 +8,6 @@
                 :class="{
                     'DshSelect-radioGroup': true,
                     'DshSelect-radioGroup-useColor': selfPropsObj._useColor,
-                    'DshSelect-radioGroup-readonly': $isReadonly(canEdit, selfPropsObj),
-                    'DshSelect-radioGroup-disabled': $isDisabled(canEdit, selfPropsObj),
                     'DshSelect-radioGroup-scroll': selfPropsObj._span < 24 && !selfPropsObj._br
                 }"
                 v-model="value[controlKey]"
@@ -48,10 +46,6 @@
             <Select
                 v-else
                 v-model="value[controlKey]"
-                :class="{
-                    'DshSelect-select-readonly': $isReadonly(canEdit, selfPropsObj),
-                    'DshSelect-select-disabled': $isDisabled(canEdit, selfPropsObj)
-                }"
                 :placeholder="selfPropsObj._placeholder"
                 :multiple="selfPropsObj._multiple"
                 :disabled="!finalCanEdit"
@@ -89,13 +83,13 @@
         >
             <div
                 v-if="curSelectItem"
-                class="DshCheckbox-value-wrapper"
+                class="DshSelect-value-wrapper"
                 :style="{
                     justifyContent: flatShowAlign
                 }"
             >
                 <span
-                    class="DshCheckbox-value dsh-ellipsis"
+                    class="DshSelect-value dsh-ellipsis"
                     :style="{
                         background: selfPropsObj._useColor ? getBgColor(curSelectItem.color, 0.1) : '',
                         color: selfPropsObj._useColor ? getColor(curSelectItem.color) : ''
@@ -106,12 +100,7 @@
                 v-else
                 class="control-nodata-text dsh-ellipsis"
             >
-                <template v-if="isUnit">
-                    -
-                </template>
-                <template v-else>
-                    暂无内容
-                </template>
+                {{ emptyShowVal }}
             </div>
         </Ctooltip>
 
@@ -127,7 +116,10 @@
 
     export default {
         name: "DshSelect",
-        mixins: [controlMixin, selectMixin],
+        mixins: [
+            controlMixin,
+            selectMixin
+        ],
         props: {},
         data () {
             return {
@@ -186,7 +178,11 @@
                 return this.valStr;
             },
             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 () {

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

@@ -2,8 +2,8 @@
     <div class="YSerialNumber">
         <dsh-input
             :value="value"
-            :propsObj="propsObj"
-            :canEdit="false"
+            :propsObj="selfPropsObj"
+            :canEdit="canEdit"
         ></dsh-input>
     </div>
 </template>
@@ -18,7 +18,14 @@
         data () {
             return {};
         },
-        computed: {},
+        computed: {
+            selfPropsObj () {
+                return {
+                    ...this.propsObj,
+                    canEdit: false
+                };
+            }
+        },
         created () {},
         methods: {}
     };

package/src/components/controls/base/ZUpload/index.vue

@@ -1,9 +1,9 @@
 <template>
     <y-upload-image
         v-if="propsObj._kind === 'uploadImage'"
-        :propsObj="propsObj"
         :value="value"
         ossType="putUpload"
+        :propsObj="propsObj"
         @change="change"
     ></y-upload-image>
 
@@ -13,8 +13,10 @@
             prefixCls,
             'ZUpload',
             `ZUpload-${showType}`,
-            { 'ZUpload-readonly': $isReadonly(canEdit, propsObj) },
-            { 'ZUpload-disabled': $isDisabled(canEdit, propsObj) },
+            {
+                'ZUpload-readonly': !canEdit,
+                'ZUpload-disabled': !finalCanEdit
+            }
         ]"
     >
         <!-- 上传 -->
@@ -62,17 +64,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,15 +82,18 @@
 </template>
 
 <script>
-    import YUploadImage from "./YUploadImage.vue";
-    import uploadList from "./upload-list.vue";
     import controlMixin from "../../controlMixin.js";
     import uploadMixin from "./uploadMixin.js";
+    import YUploadImage from "./YUploadImage.vue";
+    import uploadList from "./upload-list.vue";
 
     const prefixCls = "ivu-upload";
     export default {
         name: "Upload",
-        mixins: [controlMixin, uploadMixin],
+        mixins: [
+            controlMixin,
+            uploadMixin
+        ],
         components: {
             YUploadImage,
             uploadList

package/src/components/controls/base/ZUpload/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/uploadMixin.js

@@ -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);