bri-components 1.1.5 → 1.2.0

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

@@ -1,49 +1,38 @@
 <template>
     <div class="DshEditor">
         <!-- 编辑 -->
-        <template v-if="canEdit">
-            <!-- 可编辑 -->
-            <template v-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="DshEditor-wrap-toolbar"
-                    ></div>
-
-                    <div
-                        ref="editor"
-                        class="DshEditor-wrap-text"
-                    ></div>
-
-                    <dsh-buttons
-                        class="DshEditor-wrap-btn"
-                        :list="$getOperationList(['canSave'])"
-                        @click="$dispatchEvent($event)"
-                    ></dsh-buttons>
-                </div>
-            </template>
-
-            <!-- 不可编辑 -->
+         <template v-if="canEdit">
             <div
-                v-else
                 :class="{
-                    'DshEditor-show': true,
-                    'DshEditor-show-disabled': true
+                    'DshEditor-edit': true,
+                    ...commonClass
                 }"
                 v-show="showType === 'show'"
                 v-html="showText"
+                @click="handleEdit"
             ></div>
+
+            <div
+                v-if="finalCanEdit"
+                v-show="showType === 'edit'"
+                class="DshEditor-wrap"
+            >
+                <div
+                    ref="toolbar"
+                    class="DshEditor-wrap-toolbar"
+                ></div>
+
+                <div
+                    ref="editor"
+                    class="DshEditor-wrap-text"
+                ></div>
+
+                <dsh-buttons
+                    class="DshEditor-wrap-btn"
+                    :list="$getOperationList(['canSave'])"
+                    @click="$dispatchEvent($event)"
+                ></dsh-buttons>
+            </div>
         </template>
 
         <!-- 查看 -->
@@ -52,11 +41,10 @@
             <div
                 v-if="isUnitShow"
                 :class="{
-                    'DshEditor-unit': true,
-                    'DshEditor-unit-nodata': true,
+                    'DshEditor-unit': !$isEmptyData(curVal)
                 }"
             >
-                {{ curVal ? "富文本" : emptyShowVal }}
+                {{ $isEmptyData(curVal) ? emptyShowVal : "富文本" }}
             </div>
 
             <!-- 查看页里 的查看 -->
@@ -64,9 +52,8 @@
                 v-else
                 :class="{
                     'DshEditor-show': true,
-                    'DshEditor-show-nodata': !curVal
+                    'DshEditor-show-nodata': $isEmptyData(curVal)
                 }"
-                v-show="showType === 'show'"
                 v-html="showText"
             ></div>
         </template>
@@ -106,10 +93,6 @@
                     ...this.propsObj,
                     ...this.commonDealPropsObj
                 };
-            },
-
-            editVal () {
-                return this.curVal || this.selfPropsObj._placeholder;
             }
         },
         created () {},
@@ -181,8 +164,10 @@
                 this.editor = editor;
             },
             handleEdit () {
-                this.editor.txt.html(this.value[this.propsObj._key]);
-                this.showType = "edit";
+                if (this.finalCanEdit) {
+                    this.editor.txt.html(this.value[this.propsObj._key]);
+                    this.showType = "edit";
+                }
             },
             clickSave () {
                 this.showType = "show";

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

@@ -3,6 +3,7 @@
         <!-- 编辑 -->
         <template v-if="canEdit">
             <Input
+                class="DshInput-edit"
                 v-model="value[controlKey]"
                 :type="subType"
                 :placeholder="selfPropsObj._placeholder"
@@ -36,29 +37,29 @@
 
         <!-- 查看 -->
         <template v-else>
-            <!-- 表格 里的查看 -->
-            <template v-if="isUnitShow">
-                <control-show
-                    :showVal="curVal"
-                    :emptyShowVal="emptyShowVal"
-                    :propsObj="selfPropsObj"
-                ></control-show>
-            </template>
-
-            <!-- 查看页 里的查看 (textarea单独处理) -->
-            <template v-else>
+            <!-- 查看页 的textarea单独处理 -->
+            <template v-if="!isUnitShow && subType === 'textarea' && !$isEmptyData(curVal)">
                 <p
-                    v-if="subType === 'textarea' && curVal"
                     class="DshInput-show-textarea"
-                    v-text="curVal"
+                    v-text="showText"
                 ></p>
+            </template>
 
-                <control-show
-                    v-else
-                    :showVal="curVal"
-                    :emptyShowVal="emptyShowVal"
-                    :propsObj="selfPropsObj"
-                ></control-show>
+            <!-- 表格和查看页 里的查看 -->
+            <template v-else>
+                <bri-tooltip
+                    :content="showText"
+                    maxWidth="200"
+                    :transfer="true"
+                >
+                    <div :class="{
+                        ...commonClass,
+                        'DshInput-unit': isUnitShow,
+                        'DshInput-show': !isUnitShow
+                    }">
+                        {{ showText }}
+                    </div>
+                </bri-tooltip>
             </template>
         </template>
     </div>
@@ -87,6 +88,7 @@
                     _autosize: {
                         minRows: 2
                     },
+
                     ...this.propsObj,
                     ...this.commonDealPropsObj
                 };

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

@@ -3,6 +3,7 @@
         <!-- 编辑 -->
         <template v-if="canEdit">
             <BriInputNumber
+                class="DshNumber-edit"
                 v-model="value[controlKey]"
                 :placeholder="selfPropsObj._placeholder"
                 :disabled="!finalCanEdit"
@@ -10,13 +11,13 @@
                 :max="maxNum"
                 :min="minNum"
                 :precision="digit"
-                :numberAdjust="selfPropsObj._numberAdjust"
+                :numberAdjust="selfPropsObj._numberAdjust || !unitStr"
                 @on-change="change"
             >
                 <div
                     v-if="unitStr"
                     slot="suffix"
-                    class="DshNumber-suffix"
+                    class="DshNumber-edit-suffix"
                 >
                     {{ unitStr }}
                 </div>
@@ -25,30 +26,29 @@
 
         <!-- 查看 -->
         <template v-else>
-            <!-- 表格 里的查看 -->
-            <template v-if="isUnitShow">
-                <!-- 进度条模式 -->
+            <!-- 单元格的查看 进度条模式 -->
+            <template v-if="isUnitShow && selfPropsObj._showProgress">
                 <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>
+                <bri-tooltip
+                    :content="showText"
+                    maxWidth="200"
+                    :transfer="true"
+                >
+                    <div :class="{
+                        ...commonClass,
+                        'DshInput-unit': isUnitShow,
+                        'DshInput-show': !isUnitShow
+                    }">
+                        {{ showText }}
+                    </div>
+                </bri-tooltip>
             </template>
         </template>
     </div>
@@ -73,7 +73,6 @@
         computed: {
             selfPropsObj () {
                 return {
-                    _numberAdjust: true,
                     ...this.propsObj,
                     ...this.commonDealPropsObj
                 };
@@ -122,8 +121,10 @@
                 return this.selfPropsObj._separator;
             },
 
-            showVal () {
-                return this.$numToStrAndUnit(this.value[this.controlKey], this.selfPropsObj);
+            showText () {
+                return this.$isEmptyData(this.curVal)
+                    ? this.emptyShowVal
+                    : this.$numToStrAndUnit(this.value[this.controlKey], this.selfPropsObj);
             }
         },
         created () {},

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

@@ -74,7 +74,7 @@
             </Select>
         </template>
 
-        <Ctooltip
+        <bri-tooltip
             v-else
             :content="valStr"
             maxWidth="200"
@@ -102,7 +102,7 @@
             >
                 {{ emptyShowVal }}
             </div>
-        </Ctooltip>
+        </bri-tooltip>
 
         <!-- tip项弹框提示 -->
         <dsh-render :render="tipModalRender"></dsh-render>
@@ -203,12 +203,14 @@
                         ..._customData.params
                     },
                     callback: data => {
-                        this.initListData.push(...data.list.map(item => (
-                            {
-                                _key: item[_customData._key || "_key"],
-                                name: item[_customData._name || "name"]
-                            }
-                        )));
+                        this.initListData.push(
+                            ...data.list.map(item => (
+                                {
+                                    _key: item[_customData._key || "_key"],
+                                    name: item[_customData._name || "name"]
+                                }
+                            ))
+                        );
                     }
                 });
             },

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

@@ -1,48 +1,44 @@
 <template>
-    <div
-        class="DshSwitch"
-        :style="{ textAlign: propsObj._textAlign, width: '100%' }"
-    >
-        <!-- 组件无clearable -->
-        <i-switch
-            v-if="finalCanEdit"
-            v-model="value[propsObj._key]"
-            :size="propsObj._size"
-            :disabled="!finalCanEdit"
-            @on-change="change"
-        >
-            <span
-                slot="open"
-                style="font-size: 12px;"
-            >{{ propsObj._openText }}</span>
-            <span slot="close">{{ propsObj._closeText }}</span>
-        </i-switch>
-        <!-- 查看 和 编辑下无编辑权限 -->
-        <Ctooltip
-            v-else
-            placement="top"
-            :transfer="true"
-            maxWidth="200"
-            :content="showVal"
-        >
-            <div
-                class="DshCheckbox-value-wrapper"
-                :style="{
-                        textAlign: propsObj._textAlign,
-                        flexGrow: 1,
-                        display: 'flex',
-                        justifyContent: getFlexLayout(propsObj._textAlign)
-                    }"
+    <!-- 该组件无clearable -->
+    <div class="DshSwitch">
+        <!-- 编辑 -->
+        <template v-if="canEdit">
+            <i-switch
+                v-model="curVal"
+                :disabled="!finalCanEdit"
+                :size="propsObj._size"
+                @on-change="change"
             >
-                <span
-                    class="DshCheckbox-value control-show-color-text dsh-ellipsis"
-                    :style="{
-                        background: value[controlKey] ? '#ECF3FD' : '#FEF6EB',
-                        color: value[controlKey] ? '#3D84EE' : '#F4A135'
-                    }"
-                >{{ showVal }}</span>
-            </div>
-        </Ctooltip>
+                <span slot="open">
+                    {{ propsObj._openText }}
+                </span>
+                <span slot="close">
+                    {{ propsObj._closeText }}
+                </span>
+            </i-switch>
+        </template>
+
+        <!-- 查看 -->
+        <template v-else>
+            <bri-tooltip
+                :content="showText"
+                placement="top"
+                :transfer="true"
+                maxWidth="200"
+            >
+                <div class="DshSwitch-show">
+                    <span
+                        class="DshSwitch-show-name"
+                        :style="{
+                            background: curVal ? '#ECF3FD' : '#FEF6EB',
+                            color: curVal ? '#3D84EE' : '#F4A135'
+                        }"
+                    >
+                        {{ showText }}
+                    </span>
+                </div>
+            </bri-tooltip>
+        </template>
     </div>
 </template>
 
@@ -51,58 +47,20 @@
 
     export default {
         name: "DshSwitch",
-        mixins: [controlMixin],
+        mixins: [
+            controlMixin
+        ],
         data () {
             return {};
         },
         computed: {
-            showVal () {
+            showText () {
                 return this.value[this.controlKey]
                     ? this.propsObj._openText
                     : this.propsObj._closeText;
             }
         },
-        created () {
-        },
-        methods: {
-            getFlexLayout (align) {
-                let map = {
-                    left: "flex-start",
-                    center: "center",
-                    right: "flex-end"
-                };
-                if (align) {
-                    return map[align];
-                } else {
-                    return "flex-start";
-                }
-            }
-        }
+        created () {},
+        methods: {}
     };
 </script>
-
-<style lang="less" scoped>
-    .DshSwitch {
-
-    }
-</style>
-<style lang="less">
-    .DshSwitch {
-        .ivu-switch {
-            width: 50px;
-        }
-        .ivu-switch-checked:after {
-            left: 29px;
-        }
-        .ivu-switch-inner {
-            color: #fff;
-            font-size: 12px;
-            position: absolute;
-            left: auto;
-            right: 4px;
-        }
-        .ivu-switch-checked .ivu-switch-inner {
-            left: 3px;
-        }
-    }
-</style>

package/src/components/controls/controlMap.js

@@ -58,7 +58,7 @@ const pathMap = {
         // DshSelect: "./base/DshSelect.vue", // 全局已注册
         // DshCheckbox: "./base/DshCheckbox.vue", // 全局已注册
         // DshCascader: "./base/DshCascader/DshCascader.vue", // 全局已注册
-        BriUpload: "./base/BriUpload/index.vue",
+        BriUpload: "./base/BriUpload/BriUpload.vue",
         DshCoordinates: "./base/DshCoordinates.vue",
         DshEditor: "./base/DshEditor.vue",
         DshDivider: "./base/DshDivider.vue",

package/src/components/controls/controlMixin.js

@@ -1,9 +1,5 @@
-import controlShow from "./controlShow.vue";
-
 export default {
-    components: {
-        controlShow
-    },
+    components: {},
     props: {
         canEdit: {
             type: Boolean,
@@ -72,7 +68,7 @@ export default {
                     : "暂无内容";
         },
         showText () {
-            return this.$isEmptyData(this.curVal) ? this.curVal : this.emptyShowVal;
+            return this.$isEmptyData(this.curVal) ? this.emptyShowVal : this.curVal;
         },
 
         isUnitShow () {
@@ -93,12 +89,13 @@ export default {
         },
         commonClass () {
             return {
-                "dsh-ellipsis": true,
                 "control-edit": this.canEdit && this.finalCanEdit,
                 "control-disabled": this.canEdit && !this.finalCanEdit,
                 "control-unit": !this.canEdit && this.isUnitShow,
                 "control-show": !this.canEdit && !this.isUnitShow,
-                "control-notext": this.$isEmptyData(this.curVal)
+
+                "dsh-ellipsis": true,
+                "control-notext": !this.isUnitShow && this.$isEmptyData(this.curVal)
             };
         },