bri-components 1.1.2 → 1.1.4

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

@@ -6,154 +6,161 @@
             :transfer="true"
             maxWidth="200"
         >
-            <!-- 编辑模式 -->
+            <!-- 编辑 -->
             <div
-                v-if="finalCanEdit"
-                class="DshCoordinates-wrap"
+                v-if="canEdit"
+                :class="{
+                    ...commonClass,
+                    'DshCoordinates-edit': true
+                }"
                 @click="clickOpenModal"
             >
                 <div
-                    v-if="curLnglat.length"
-                    class="DshCoordinates-text"
+                    v-if="!$isEmptyData(curVal)"
+                    class="value"
                 >
-                    <span class="dsh-ellipsis">
-                        {{ curVal.name }}
+                    <span class="value-name">
+                        {{ curValName }}
                     </span>
                     <Icon
-                        v-if="finalCanEdit && selfPropsObj._clearable"
-                        class="DshCoordinates-text-icon"
+                        v-if="selfPropsObj._clearable"
+                        class="value-icon"
                         type="md-close"
                         @click.stop="clickDelete"
                     />
                 </div>
 
-                <span
+                <div
                     v-else
-                    class="DshCoordinates-notext"
+                    class="nodata"
                 >
                     点击获取当前位置
-                    <i class="DshCoordinates-wrap-zuobiao bico-font bico-zuobiao"></i>
-                </span>
-            </div>
-
-            <!-- 查看模式 -->
-            <span
-                v-else
-                :class="{
-                        ...commonClass,
-                        'DshCoordinates-show': !isUnit
-                        }"
-            >
-                {{ showText }}
-            </span>
-        </Ctooltip>
+                    <i class="nodata-icon bico-font bico-zuobiao"></i>
+                </div>
 
-        <!-- 模态框 -->
-        <template v-if="canEdit">
-            <Modal
-                class="DshCoordinates-modal clearFlex-modal"
-                v-model="showModal"
-                title="选择位置"
-                :footer-hide="true"
-                :styles="modalStyles"
-                @on-cancel="clickCancel"
-            >
-                <div
-                    slot="header"
-                    class="DshCoordinates-modal-header"
+                <!-- 模态框 -->
+                <Modal
+                    class="DshCoordinates-modal"
+                    v-model="showModal"
+                    title="选择位置"
+                    :footer-hide="true"
+                    :styles="modalStyles"
+                    @on-cancel="clickCancel"
                 >
-                    <Row
-                        v-if="finalCanEdit"
-                        type="flex"
-                        justify="center"
-                        align="bottom"
+                    <div
+                        slot="header"
+                        class="DshCoordinates-modal-header"
                     >
-                        <Col span="8">
-                        <div>
-                            <RadioGroup v-model="formData.kind">
-                                <Radio label="keyword">按关键字搜索</Radio>
-                                <Radio label="coordinate">按坐标搜索</Radio>
-                            </RadioGroup>
-                        </div>
-                        <Row class="dsh-margin-top5">
-                            <Col span="16">
-                            <Input
-                                v-model="formData.searchText"
-                                placeholder="请输入..."
-                                :clearable="true"
-                                @on-enter="clickSearch"
-                            />
-                            <span class="DshCoordinates-message">{{ searchMessage }}</span>
+                        <Row
+                            v-if="finalCanEdit"
+                            class="edit"
+                            type="flex"
+                            justify="center"
+                            align="bottom"
+                        >
+                            <Col span="8">
+                            <div>
+                                <RadioGroup v-model="formData.kind">
+                                    <Radio label="keyword">按关键字搜索</Radio>
+                                    <Radio label="coordinate">按坐标搜索</Radio>
+                                </RadioGroup>
+                            </div>
+                            <Row class="dsh-margin-top5">
+                                <Col span="16">
+                                <Input
+                                    v-model="formData.searchText"
+                                    placeholder="请输入..."
+                                    :clearable="true"
+                                    @on-enter="clickSearch"
+                                />
+                                <span class="edit-message">{{ searchMessage }}</span>
+                                </Col>
+                                <Col span="8">&nbsp;
+                                <Button
+                                    type="primary"
+                                    @click="clickSearch"
+                                >搜索</Button>
+                                </Col>
+                            </Row>
                             </Col>
-                            <Col span="8">&nbsp;
-                            <Button
-                                type="primary"
-                                @click="clickSearch"
-                            >搜索</Button>
+
+                            <Col span="8">
+                            <div class="edit-text">坐标获取结果</div>
+                            <Row class="dsh-margin-top5">
+                                <Col span="16">
+                                <Input
+                                    :value="curVal.name"
+                                    :readonly="true"
+                                    :clearable="true"
+                                    @on-clear="clickClear"
+                                    @click.native="clickMapFitView"
+                                />
+                                </Col>
+                                <Col span="8">&nbsp;
+                                <Button
+                                    type="primary"
+                                    @click="clickConfirm"
+                                >确认</Button>
+                                </Col>
+                            </Row>
                             </Col>
                         </Row>
-                        </Col>
 
-                        <Col span="8">
-                        <div class="DshCoordinates-modal-header-text">坐标获取结果</div>
-                        <Row class="dsh-margin-top5">
-                            <Col span="16">
+                        <Row
+                            v-else
+                            class="show"
+                        >
+                            <Col
+                                span="6"
+                                class="show-name"
+                            >
+                            当前位置：
+                            </Col>
+                            <Col span="12">
                             <Input
                                 :value="curVal.name"
                                 :readonly="true"
-                                :clearable="true"
-                                @on-clear="clickClear"
                                 @click.native="clickMapFitView"
                             />
                             </Col>
-                            <Col span="8">&nbsp;
-                            <Button
-                                type="primary"
-                                @click="clickConfirm"
-                            >确认</Button>
+                            <Col span="6">
                             </Col>
                         </Row>
-                        </Col>
-                    </Row>
+                    </div>
 
-                    <Row v-else>
-                        <Col
-                            span="6"
-                            class="textRight dsh-padding-top10"
-                        >当前位置：</Col>
-                        <Col span="12">
-                        <Input
-                            :value="curVal.name"
-                            :readonly="true"
-                            @click.native="clickMapFitView"
-                        />
-                        </Col>
-                        <Col span="6">
-                        </Col>
-                    </Row>
-                </div>
+                    <transition>
+                        <div
+                            v-if="showModal"
+                            id="mapContain"
+                            class="DshCoordinates-modal-map"
+                        ></div>
+                    </transition>
 
-                <transition>
                     <div
-                        v-if="showModal"
-                        id="mapContain"
-                        class="DshCoordinates-map"
+                        ref="divCoordinate"
+                        style="display: none; position:absolute;background:#fff;padding: 5px 10px"
                     ></div>
-                </transition>
-                <div
-                    ref="divCoordinate"
-                    style="display: none; position:absolute;background:#fff;padding: 5px 10px"
-                ></div>
-            </Modal>
-        </template>
+                </Modal>
+            </div>
+
+            <!-- 查看 -->
+            <template v-else>
+                <span :class="{
+                    ...commonClass,
+                    'DshCoordinates-show': true
+                }">
+                    {{ showText }}
+                </span>
+            </template>
+        </Ctooltip>
     </div>
 </template>
 
 <script>
     import controlMixin from "../controlMixin.js";
+
     const plotStrokeColor = "#4575EF";
     const plotFillColor = "#4575EF";
-
     let polygonOpt = {
         fillColor: plotFillColor,
         fillOpacity: 0.4,
@@ -168,7 +175,9 @@
 
     export default {
         name: "DshCoordinates",
-        mixins: [controlMixin],
+        mixins: [
+            controlMixin
+        ],
         computed: {
             curVal: {
                 get () {
@@ -236,7 +245,7 @@
         methods: {
             // 打开窗体
             clickOpenModal () {
-                if (this.canEdit || this.curLnglat.length) {
+                if (this.canEdit) {
                     this.showModal = true;
                     this.cloneValue = this.$deepCopy(this.curVal);
                     this.getMap();
@@ -338,7 +347,7 @@
                 this.mouseTool = new AMap.MouseTool(this.map);
                 this.mouseTool.on("draw", this.handleMouseToolCallback);
                 // 设置默认坐标
-                if (this.curLnglat.length) {
+                if (!this.$isEmptyData(this.curVal)) {
                     this.handleAddMarker(this.curLnglat, true);
 
                     if (this.kind === "multipleMarker") { // 多选打开绘图功能

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

@@ -3,17 +3,15 @@
         v-if="show"
         class="DshDate"
     >
-        <template v-if="finalCanEdit || $isDisabled(canEdit, selfPropsObj)">
+        <!-- 编辑 -->
+        <template v-if="canEdit">
             <template v-if="['time'].includes(subType)">
                 <TimePicker
                     style="width: 100%;"
-                    :class="{
-                        'DshDate-time-disabled': $isDisabled(canEdit, selfPropsObj)
-                    }"
                     v-model="val"
                     :type="subType"
                     :placeholder="selfPropsObj._placeholder"
-                    :disabled="$isDisabled(canEdit, selfPropsObj)"
+                    :disabled="!finalCanEdit"
                     :clearable="selfPropsObj._clearable"
                     :transfer="selfPropsObj._transfer"
                     @on-change="change"
@@ -23,13 +21,10 @@
             <template v-else>
                 <DatePicker
                     style="width: 100%;"
-                    :class="{
-                        'DshDate-date-disabled': $isDisabled(canEdit, selfPropsObj)
-                    }"
                     v-model="val"
                     :type="subType"
                     :placeholder="selfPropsObj._placeholder"
-                    :disabled="$isDisabled(canEdit, selfPropsObj)"
+                    :disabled="!finalCanEdit"
                     :clearable="selfPropsObj._clearable"
                     :options="options"
                     :transfer="selfPropsObj._transfer"
@@ -38,13 +33,14 @@
             </template>
         </template>
 
-        <!-- 查看模式 -->
-        <control-show
-            v-else
-            :showVal="showVal"
-            :propsObj="selfPropsObj"
-            :isUnit="isUnit"
-        ></control-show>
+        <!-- 查看 -->
+        <template v-else>
+            <control-show
+                :showVal="curVal"
+                :emptyShowVal="emptyShowVal"
+                :propsObj="selfPropsObj"
+            ></control-show>
+        </template>
     </div>
 </template>
 
@@ -53,21 +49,24 @@
 
     export default {
         name: "DshDate",
-        mixins: [controlMixin],
-        props: {
-            allFormList: {
-                type: Array,
-                default () {
-                    return [];
-                }
-            }
-        },
+        mixins: [
+            controlMixin
+        ],
+        props: {},
         data () {
             return {
                 show: true
             };
         },
         computed: {
+            selfPropsObj () {
+                return {
+                    _transfer: true,
+                    ...this.propsObj,
+                    ...this.commonDealPropsObj
+                };
+            },
+
             val: {
                 get () {
                     const val = this.value[this.controlKey];
@@ -77,14 +76,6 @@
                     this.value[this.controlKey] = this.$transformDate(val, "-", this.subType);
                 }
             },
-
-            selfPropsObj () {
-                return {
-                    _transfer: true,
-                    ...this.propsObj,
-                    ...this.commonDealPropsObj
-                };
-            },
             subType () {
                 return this.selfPropsObj._dateType;
             },
@@ -103,10 +94,6 @@
                         return !resultObj.bool;
                     }
                 };
-            },
-
-            showVal () {
-                return this.value[this.controlKey] || "";
             }
         },
         created () {},

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

@@ -96,7 +96,9 @@
 
     export default {
         name: "DshDaterange",
-        mixins: [controlMixin],
+        mixins: [
+            controlMixin
+        ],
         props: {},
         data () {
             return {

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

@@ -1,83 +1,101 @@
 <template>
     <div class="DshEditor">
-        <!-- 有值、无值 可编辑 -->
-        <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-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>
 
-        <template v-else-if="finalCanEdit">
+                <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>
+
+            <!-- 不可编辑 -->
             <div
-                class="DshEditor-show DshEditor-edit"
-                :class="value[controlKey] ? '': 'DshEditor-edit-placeholder'"
+                v-else
+                :class="{
+                    'DshEditor-show': true,
+                    'DshEditor-show-disabled': true
+                }"
                 v-show="showType === 'show'"
-                v-html="editVal"
-                @click="handleEdit"
+                v-html="showText"
             ></div>
+        </template>
+
+        <!-- 查看 -->
+        <template v-else>
+            <!-- 单元格里 的查看 -->
             <div
-                v-show="showType=='edit'"
-                class="DshEditor-wrap"
+                v-if="isUnitShow"
+                :class="{
+                    'DshEditor-unit': true,
+                    'DshEditor-unit-nodata': true,
+                }"
             >
-                <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>
+                {{ curVal ? "富文本" : emptyShowVal }}
             </div>
-        </template>
-
-        <div
-            v-else
-            class="DshEditor-show"
-            :class="$isDisabled(canEdit, selfPropsObj) ? 'DshEditor-show-disabled' : value[controlKey] ? '' : 'DshEditor-show-nodata'"
-            v-show="showType === 'show'"
-            v-html="showVal"
-        ></div>
 
+            <!-- 查看页里 的查看 -->
+            <div
+                v-else
+                :class="{
+                    'DshEditor-show': true,
+                    'DshEditor-show-nodata': !curVal
+                }"
+                v-show="showType === 'show'"
+                v-html="showText"
+            ></div>
+        </template>
     </div>
 </template>
 
 <script>
     import controlMixin from "../controlMixin.js";
-    import uploadMixin from "./ZUpload/uploadMixin.js";
+    import uploadMixin from "./BriUpload/uploadMixin.js";
     import E from "wangeditor";
 
     export default {
         name: "DshEditor",
-        mixins: [controlMixin, uploadMixin],
+        mixins: [
+            controlMixin,
+            uploadMixin
+        ],
         props: {},
         data () {
             return {
                 editor: null,
                 showType: "show",
                 operationMap: {
-                    save: {
+                    canSave: {
                         name: "完成",
-                        type: "save",
+                        type: "canSave",
                         btnType: "primary",
                         size: "default",
-                        event: "save"
+                        event: "clickSave"
                     }
                 }
             };
@@ -89,14 +107,9 @@
                     ...this.commonDealPropsObj
                 };
             },
-            unitVal () {
-                return this.value[this.controlKey] ? "富文本" : "-";
-            },
-            showVal () {
-                return this.value[this.controlKey] || "暂无内容";
-            },
+
             editVal () {
-                return this.value[this.controlKey] || this.selfPropsObj._placeholder;
+                return this.curVal || this.selfPropsObj._placeholder;
             }
         },
         created () {},
@@ -171,7 +184,7 @@
                 this.editor.txt.html(this.value[this.propsObj._key]);
                 this.showType = "edit";
             },
-            save () {
+            clickSave () {
                 this.showType = "show";
             },
             // 插入代码