bri-components 1.0.5 → 1.1.1

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

@@ -1,20 +1,19 @@
 <template>
     <div
         v-if="show"
-        :class="`DshDate ycFormItem control-${mode}`"
+        class="DshDate"
     >
-        <template v-if="finalCanEdit">
+        <template v-if="finalCanEdit || $isDisabled(canEdit, selfPropsObj)">
             <template v-if="['time'].includes(subType)">
                 <TimePicker
                     style="width: 100%;"
                     :class="{
-                        'DshDate-time-readonly': $isReadonly(canEdit, selfPropsObj),
                         'DshDate-time-disabled': $isDisabled(canEdit, selfPropsObj)
                     }"
                     v-model="val"
                     :type="subType"
                     :placeholder="selfPropsObj._placeholder"
-                    :disabled="!finalCanEdit"
+                    :disabled="$isDisabled(canEdit, selfPropsObj)"
                     :clearable="selfPropsObj._clearable"
                     :transfer="selfPropsObj._transfer"
                     @on-change="change"
@@ -25,13 +24,12 @@
                 <DatePicker
                     style="width: 100%;"
                     :class="{
-                        'DshDate-date-readonly': $isReadonly(canEdit, selfPropsObj),
                         'DshDate-date-disabled': $isDisabled(canEdit, selfPropsObj)
                     }"
                     v-model="val"
                     :type="subType"
                     :placeholder="selfPropsObj._placeholder"
-                    :disabled="!finalCanEdit"
+                    :disabled="$isDisabled(canEdit, selfPropsObj)"
                     :clearable="selfPropsObj._clearable"
                     :options="options"
                     :transfer="selfPropsObj._transfer"
@@ -40,29 +38,13 @@
             </template>
         </template>
 
-        <Ctooltip
+        <!-- 查看模式 -->
+        <control-show
             v-else
-            placement="top"
-            :transfer="true"
-            maxWidth="200"
-            :content="showVal"
-            :class="commonClass"
-        >
-            <span
-                v-if="showVal"
-                class="dsh-ellipsis hb-show-text"
-                :class="`control-${mode}-text`"
-            >
-                {{ showVal }}
-            </span>
-            <span
-                v-else
-                class="hb-nodata-text dsh-ellipsis"
-                :class="`control-${mode}-text`"
-            >
-                <span>暂无内容</span>
-            </span>
-        </Ctooltip>
+            :showVal="showVal"
+            :propsObj="selfPropsObj"
+            :isUnit="isUnit"
+        ></control-show>
     </div>
 </template>
 
@@ -140,9 +122,3 @@
         }
     };
 </script>
-
-<style lang="less">
-    .DshDate {
-        width: 100%;
-    }
-</style>

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

@@ -1,5 +1,5 @@
 <template>
-    <div :class="`DshDivider control-${mode}`">
+    <div class="DshDivider">
         <!-- <div class="DshDivider-divider-cli">
             <p>{{ propsObj._name }}</p>
         </div> -->

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

@@ -1,49 +1,49 @@
 <template>
     <div class="DshEditor">
         <!-- 有值、无值 可编辑 -->
-        <div
-            v-if="(value[propsObj._key] && finalCanEdit) || (!value[propsObj._key] && finalCanEdit)"
-            class="DshEditor-show"
-            :class="commonClass"
-            v-show="showType === 'show'"
-            v-html="value[propsObj._key]"
-            @click="handleEdit"
-        ></div>
+        <template v-if="isUnit">
+            <div v-if="value[controlKey]" class="DshEditor-unit">
+                <span class="DshEditor-unit-text">
+                    富文本
+                </span>
+            </div>
+            <span v-else class="control-notext">
+                -
+            </span>
+        </template>
+
+        <template v-else-if="finalCanEdit">
+            <div class="DshEditor-show DshEditor-edit"
+                :class="value[controlKey] ? '': 'DshEditor-edit-placeholder'"
+                v-show="showType === 'show'"
+                v-html="editVal"
+                @click="handleEdit"
+            ></div>
+            <div v-show="showType=='edit'" class="DshEditor-wrap">
+                <div
+                    ref="toolbar"
+                    class="toolbar"
+                ></div>
+                <div
+                    ref="editor"
+                    class="text"
+                ></div>
+
+                <dsh-buttons
+                    class="DshEditor-wrap-btn"
+                    :list="$getOperationList(['save'])"
+                    @click="$dispatchEvent($event)"
+                ></dsh-buttons>
+            </div>
+        </template>
 
-        <div
-            v-else-if="value[propsObj._key] && !finalCanEdit"
-            class="DshEditor-show hb-show-text"
-            :class="commonClass"
+        <div v-else
+            class="DshEditor-show"
+            :class="$isDisabled(canEdit, selfPropsObj) ? 'DshEditor-show-disabled' : value[controlKey] ? '' : 'DshEditor-show-nodata'"
             v-show="showType === 'show'"
-            v-html="value[propsObj._key]"
-            @click="handleEdit"
+            v-html="showVal"
         ></div>
 
-        <div
-            v-else
-            class="DshEditor-show hb-nodata-text"
-        >
-            <span>暂无内容</span>
-        </div>
-        <div
-            v-show="showType=='edit'"
-            class="DshEditor-wrap"
-        >
-            <div
-                ref="toolbar"
-                class="toolbar"
-            ></div>
-            <div
-                ref="editor"
-                class="text"
-            ></div>
-
-            <dsh-buttons
-                class="DshEditor-wrap-btn"
-                :list="$getOperationList(['save'])"
-                @click="$dispatchEvent($event)"
-            ></dsh-buttons>
-        </div>
     </div>
 </template>
 
@@ -72,10 +72,25 @@
             };
         },
         computed: {
+            selfPropsObj () {
+                return {
+                    ...this.propsObj,
+                    ...this.commonDealPropsObj
+                };
+            },
+            unitVal () {
+                return this.value[this.controlKey] ? "富文本" : "-";
+            },
+            showVal () {
+                return this.value[this.controlKey] || "暂无内容";
+            },
+            editVal () {
+                return this.value[this.controlKey] || this.selfPropsObj._placeholder;
+            }
         },
         created () {},
         mounted () {
-            this.initEditor();
+            this.finalCanEdit && this.initEditor();
         },
         methods: {
             initEditor () {
@@ -142,10 +157,8 @@
                 this.editor = editor;
             },
             handleEdit () {
-                if (this.finalCanEdit) {
-                    this.editor.txt.html(this.value[this.propsObj._key]);
-                    this.showType = "edit";
-                }
+                this.editor.txt.html(this.value[this.propsObj._key]);
+                this.showType = "edit";
             },
             save () {
                 this.showType = "show";

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

@@ -1,9 +1,8 @@
 <template>
-    <div :class="`DshInput ycFormItem control-${mode}`">
+    <div :class="`DshInput`">
         <Input
-            v-if="finalCanEdit"
+            v-if="finalCanEdit || $isDisabled(canEdit, selfPropsObj)"
             :class="{
-                'DshInput-readonly': $isReadonly(canEdit, selfPropsObj),
                 'DshInput-disabled': $isDisabled(canEdit, selfPropsObj)
             }"
             v-model="value[controlKey]"
@@ -24,50 +23,23 @@
             @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>
+        <span
+            v-if="selfPropsObj._prepend"
+            slot="prepend"
+        >{{ selfPropsObj._prepend }}</span>
+        <span
+            v-if="selfPropsObj._append"
+            slot="append"
+        >{{ selfPropsObj._append }}</span>
         </Input>
 
-        <!-- 查看 和 编辑下无编辑权限 -->
-        <p
-            v-else-if="subType === 'textarea'"
-            :class="[commonClass, showVal ? 'hb-show-text' : 'hb-nodata-text', 'DshInput-textarea-show']"
-        >{{ showVal || '暂无内容' }}</p>
-
-        <Ctooltip
+        <!-- 查看模式 -->
+        <control-show
             v-else
-            placement="top"
-            :transfer="true"
-            maxWidth="200"
-            :content="showVal"
-            :class="{
-                'DshInput-notAllowed': mode === 'default',
-                'DshInput-ellipsis-readonly': mode === 'default' && $isReadonly(canEdit, selfPropsObj),
-                'DshInput-ellipsis-disabled': mode === 'default' && $isDisabled(canEdit, selfPropsObj),
-                [commonClass]: true
-            }"
-        >
-            <span
-                v-if="showVal"
-                class="dsh-ellipsis hb-show-text"
-                :class="`control-${mode}-text`"
-            >
-                {{ showVal }}
-            </span>
-            <span
-                v-else
-                class="hb-nodata-text dsh-ellipsis"
-                :class="`control-${mode}-text`"
-            >
-                <span>暂无内容</span>
-            </span>
-        </Ctooltip>
+            :showVal="showVal"
+            :propsObj="selfPropsObj"
+            :isUnit="isUnit"
+        ></control-show>
     </div>
 </template>
 
@@ -107,7 +79,8 @@
                 return this.value[this.controlKey] || "";
             }
         },
-        created () {},
+        created () {
+        },
         methods: {
             onSearch (...params) {
                 this.$emit("search", ...params);

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

@@ -106,9 +106,8 @@
         <div
             v-else
             :class="{'DshLabels-view':true,
-                'DshLabels-view-readonly': mode === 'default' && $isReadonly(canEdit, selfPropsObj),
-                'DshLabels-view-disabled': mode === 'default' && $isDisabled(canEdit, selfPropsObj),
-                [commonClass]:true
+                'DshLabels-view-readonly': $isReadonly(canEdit, selfPropsObj),
+                'DshLabels-view-disabled': $isDisabled(canEdit, selfPropsObj),
             }"
         >
             <template v-if="val.length">
@@ -126,7 +125,12 @@
                 v-else
                 class="DshLabels-view-nodata"
             >
-                <span>暂无数据</span>
+                <template v-if="isUnit">
+                    -
+                </template>
+                <template v-else>
+                    暂无内容
+                </template>
             </div>
         </div>
     </div>

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

@@ -1,5 +1,5 @@
 <template>
-    <div :class="`DshNumber ycFormItem control-${mode}`">
+    <div :class="`DshNumber`">
         <!-- 编辑模式 组件无clearable -->
         <template v-if="finalCanEdit">
             <BriInputNumber
@@ -33,26 +33,12 @@
                 v-if="selfPropsObj._showProgress"
                 :percent="value[controlKey] > 100 ? 100 : toDecimal(value[controlKey])"
             />
-            <Ctooltip
+            <control-show
                 v-else
-                placement="top"
-                :transfer="true"
-                :content="String(showVal)"
-                :class="commonClass"
-            >
-                <span
-                    v-if="$isFormItemHasData(showVal)"
-                    class="dsh-ellipsis hb-show-text"
-                >
-                    {{ showVal }}
-                </span>
-                <span
-                    v-else
-                    class="dsh-ellipsis hb-nodata-text"
-                >
-                    <span>暂无内容</span>
-                </span>
-            </Ctooltip>
+                :showVal="String(showVal)"
+                :propsObj="selfPropsObj"
+                :isUnit="isUnit"
+            ></control-show>
         </template>
     </div>
 </template>

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

@@ -1,6 +1,6 @@
 <template>
     <!-- 组件无clearable -->
-    <div :class="`DshNumberange ycFormItem control-${mode}`">
+    <div class="DshNumberange">
         <!-- 最小值 -->
         <div class="DshNumberange-left">
             <BriInputNumber

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

@@ -32,7 +32,13 @@
             <div
                 v-else
                 class="DshPackage-nodata"
-            ><span>暂无数据</span>
+            >
+                <template v-if="isUnit">
+                    -
+                </template>
+                <template v-else>
+                    暂无内容
+                </template>
             </div>
         </div>
     </div>

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

@@ -1,5 +1,5 @@
 <template>
-    <div :class="`DshSelect ycFormItem control-${mode}`">
+    <div class="DshSelect">
         <!-- optionKind值 'flat'、'dropdown' -->
         <template v-if="canEdit">
             <!-- 平铺 -->
@@ -82,7 +82,6 @@
 
         <Ctooltip
             v-else
-            :class="commonClass"
             :content="valStr"
             maxWidth="200"
             placement="top"
@@ -91,9 +90,12 @@
             <div
                 v-if="curSelectItem"
                 class="DshCheckbox-value-wrapper"
+                :style="{
+                    justifyContent: flatShowAlign
+                }"
             >
                 <span
-                    class="DshCheckbox-value hb-show-color-text dsh-ellipsis"
+                    class="DshCheckbox-value dsh-ellipsis"
                     :style="{
                         background: selfPropsObj._useColor ? getBgColor(curSelectItem.color, 0.1) : '',
                         color: selfPropsObj._useColor ? getColor(curSelectItem.color) : ''
@@ -102,9 +104,14 @@
             </div>
             <div
                 v-else
-                class="hb-nodata-text dsh-ellipsis"
+                class="control-nodata-text dsh-ellipsis"
             >
-                <span>暂无内容</span>
+                <template v-if="isUnit">
+                    -
+                </template>
+                <template v-else>
+                    暂无内容
+                </template>
             </div>
         </Ctooltip>
 
@@ -177,6 +184,9 @@
             },
             showVal () {
                 return this.valStr;
+            },
+            flatShowAlign () {
+                return !this.propsObj._align || this.propsObj._align == "left" || !this.isUnit ? "flex-start" : this.propsObj._align == "right" ? "flex-end" : "center";
             }
         },
         created () {

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

@@ -1,7 +1,6 @@
 <template>
     <div
-        class="DshSwitch ycFormItem"
-        :class="`control-${mode}`"
+        class="DshSwitch"
         :style="{ textAlign: propsObj._textAlign, width: '100%' }"
     >
         <!-- 组件无clearable -->
@@ -26,9 +25,6 @@
             maxWidth="200"
             :content="showVal"
         >
-            <!--  <span class="dsh-ellipsis" :class="`control-${mode}-text`">
-                {{ showVal }}
-            </span> -->
             <div
                 class="DshCheckbox-value-wrapper"
                 :style="{
@@ -39,7 +35,7 @@
                     }"
             >
                 <span
-                    class="DshCheckbox-value hb-show-color-text dsh-ellipsis"
+                    class="DshCheckbox-value control-show-color-text dsh-ellipsis"
                     :style="{
                         background: value[controlKey] ? '#ECF3FD' : '#FEF6EB',
                         color: value[controlKey] ? '#3D84EE' : '#F4A135'

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

@@ -1,7 +1,6 @@
 <template>
     <div class="YSerialNumber">
         <dsh-input
-            :mode="canEdit ? 'default' : mode"
             :value="value"
             :propsObj="propsObj"
             :canEdit="false"

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

@@ -11,12 +11,10 @@
         v-else
         :class="[
             prefixCls,
-            'ycFormItem',
             'ZUpload',
             `ZUpload-${showType}`,
-            { 'ZUpload-readonly': mode === 'default' && $isReadonly(canEdit, propsObj) },
-            { 'ZUpload-disabled': mode === 'default' && $isDisabled(canEdit, propsObj) },
-            commonClass
+            { 'ZUpload-readonly': $isReadonly(canEdit, propsObj) },
+            { 'ZUpload-disabled': $isDisabled(canEdit, propsObj) },
         ]"
     >
         <!-- 上传 -->
@@ -55,11 +53,11 @@
                         <span v-else-if="showType=='old'">{{ percent }}%</span>
                     </i-circle>
                     <template v-else>
-                        <Icon
-                            v-if="['inline'].includes(showType)"
-                            custom="bico-font bico-upload1"
-                        />
-                        <span>上传</span>
+                        <dsh-icons
+                            :list="$getOperationList([propsObj._fileType === 'image' ? 'add' : 'upload'])"
+                            @click="handleClick"
+                        ></dsh-icons>
+                        <span v-if="showType!='inline'">点击上传{{ propsObj._fileType === 'image' ? "图片" : "文件" }}</span>
                     </template>
                 </div>
             </slot>
@@ -74,6 +72,7 @@
                 :isReadonly="$isReadonly(canEdit, propsObj)"
                 :isDisabled="$isDisabled(canEdit, propsObj)"
                 :finalCanEdit="finalCanEdit"
+                :isUnit="isUnit"
                 @on-file-remove="handleRemove"
                 @on-file-preview="handlePreview"
             ></upload-list>
@@ -171,6 +170,14 @@
         },
         data () {
             return {
+                operationMap: {
+                    upload: {
+                        customIcon: "bico-upload1"
+                    },
+                    add: {
+                        icon: "md-add"
+                    }
+                },
                 prefixCls: prefixCls,
                 dragOver: false,
                 tempIndex: 1
@@ -229,7 +236,6 @@
         },
         methods: {
             handleClick () {
-                if (this.itemDisabled) return;
                 this.$refs.input.click();
             },
             handleChange (e) {

package/src/components/controls/base/ZUpload/upload-list.vue

@@ -56,7 +56,7 @@
                 class="uploadList-nodata"
             >
                 <Icon type="ios-time" />
-                <span>未上传文件</span>
+                <span>{{ noText }}</span>
             </div>
         </template>
         <!-- 自定义新的展示方式 -->
@@ -90,7 +90,7 @@
                     ></dsh-icons>
                 </div>
             </div>
-            <span v-else>未上传文件</span>
+            <span v-else class="uploadList-inline-nodata">{{ noText }}</span>
         </template>
     </div>
 </template>
@@ -114,7 +114,8 @@
             isReadonly: Boolean,
             isDisabled: Boolean,
             finalCanEdit: Boolean,
-            propsObj: Object
+            propsObj: Object,
+            isUnit: Boolean
         },
         computed: {
             operationMap () {
@@ -145,15 +146,19 @@
             },
             imageResizeConfig () {
                 return {};
-                // this.propsObj._imageResizeConfig || (this.showType == "inline" ? {
-                //     m: "lfit",
-                //     w: 34,
-                //     h: 37
-                // } : {
-                //     m: "lfit",
-                //     w: 76,
-                //     h: 50
-                // });
+            },
+            noText () {
+                if (this.files && this.files.length) {
+                    return "";
+                } else {
+                    if (this.finalCanEdit) {
+                        return `未上传${this.propsObj._fileType === "image" ? "图片" : "文件"} `;
+                    } else if (this.isUnit) {
+                        return "-";
+                    } else {
+                        return "暂无内容";
+                    }
+                }
             }
         },
         data () {

package/src/components/controls/base/ZUpload/uploadMixin.js

@@ -97,11 +97,7 @@ export default {
                 }
             })
                 .then(response => {
-                    const newResponse = {
-                        data: response,
-                        res: {}
-                    };
-                    this.handleSuccess && this.handleSuccess(newResponse, newResponse.data, file);
+                    this.handleSuccess && this.handleSuccess(response, response.data, file);
                     callback && callback(response.data);
                 }).catch(error => {
                     this.handleError && this.handleError(error, {}, file);