bri-components 1.1.4 → 1.1.6

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

@@ -3,145 +3,148 @@
         <Ctooltip
             :content="curValName"
             placement="top"
-            :transfer="true"
             maxWidth="200"
+            :transfer="true"
         >
             <!-- 编辑 -->
-            <div
-                v-if="canEdit"
-                :class="{
-                    ...commonClass,
-                    'DshCoordinates-edit': true
-                }"
-                @click="clickOpenModal"
-            >
-                <div
-                    v-if="!$isEmptyData(curVal)"
-                    class="value"
-                >
-                    <span class="value-name">
-                        {{ curValName }}
-                    </span>
-                    <Icon
-                        v-if="selfPropsObj._clearable"
-                        class="value-icon"
-                        type="md-close"
-                        @click.stop="clickDelete"
-                    />
-                </div>
-
+            <template v-if="canEdit">
                 <div
-                    v-else
-                    class="nodata"
+                    :class="{
+                        ...commonClass,
+                        'DshCoordinates-edit': true
+                    }"
+                    @click="clickOpenModal"
                 >
-                    点击获取当前位置
-                    <i class="nodata-icon bico-font bico-zuobiao"></i>
-                </div>
+                    <!-- 有值 -->
+                    <div
+                        v-if="!$isEmptyData(curVal)"
+                        class="value"
+                    >
+                        <span class="value-name">
+                            {{ curValName }}
+                        </span>
+                        <Icon
+                            v-if="selfPropsObj._clearable"
+                            class="value-icon"
+                            type="md-close"
+                            @click.stop="clickDelete"
+                        />
+                    </div>
 
-                <!-- 模态框 -->
-                <Modal
-                    class="DshCoordinates-modal"
-                    v-model="showModal"
-                    title="选择位置"
-                    :footer-hide="true"
-                    :styles="modalStyles"
-                    @on-cancel="clickCancel"
-                >
+                    <!-- 无值 -->
                     <div
-                        slot="header"
-                        class="DshCoordinates-modal-header"
+                        v-else
+                        class="nodata"
+                    >
+                        点击获取当前位置
+                        <i class="nodata-icon bico-font bico-zuobiao"></i>
+                    </div>
+
+                    <!-- 模态框 -->
+                    <Modal
+                        class="DshCoordinates-modal"
+                        v-model="showModal"
+                        title="选择位置"
+                        :footer-hide="true"
+                        :styles="modalStyles"
+                        @on-cancel="clickCancel"
                     >
-                        <Row
-                            v-if="finalCanEdit"
-                            class="edit"
-                            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="edit-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="edit-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
-                            class="show"
-                        >
-                            <Col
-                                span="6"
-                                class="show-name"
-                            >
-                            当前位置：
-                            </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-modal-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>
-            </div>
+                    </Modal>
+                </div>
+            </template>
 
             <!-- 查看 -->
             <template v-else>
@@ -149,7 +152,7 @@
                     ...commonClass,
                     'DshCoordinates-show': true
                 }">
-                    {{ showText }}
+                    {{ curValName || emptyShowVal }}
                 </span>
             </template>
         </Ctooltip>

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

@@ -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>
+            <Ctooltip
+                :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>
+            </Ctooltip>
+        </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/controlMixin.js

@@ -45,14 +45,34 @@ export default {
         controlKey () {
             return this.propsObj._key;
         },
-        curVal () {
-            return this.value[this.controlKey];
+        // 值为不是[]类型用的
+        curVal: {
+            get () {
+                return this.value[this.controlKey];
+            },
+            set (val) {
+                this.value[this.controlKey] = val;
+            }
+        },
+        // 值为[]类型用的
+        curValList: {
+            get () {
+                return this.value[this.controlKey] || [];
+            },
+            set (val) {
+                this.value[this.controlKey] = val;
+                this.change();
+            }
         },
         emptyShowVal () {
-            return this.isUnitShow ? "--" : "暂无内容";
+            return this.canEdit
+                ? this.commonDealPropsObj._placeholder
+                : this.isUnitShow
+                    ? "--"
+                    : "暂无内容";
         },
         showText () {
-            return this.curVal || this.emptyShowVal;
+            return this.$isEmptyData(this.curVal) ? this.curVal : this.emptyShowVal;
         },
 
         isUnitShow () {
@@ -101,10 +121,10 @@ export default {
     },
     methods: {
         change (...params) {
-            this.$emit("change", this.curVal);
+            this.$emit("change", this.value[this.controlKey]);
         },
         refChange (...params) {
-            this.$emit("refChange", this.curVal);
+            this.$emit("refChange", this.value[this.controlKey]);
         }
     }
 };

package/src/components/form/DshDefaultSearch.vue

@@ -53,7 +53,7 @@
             v-if="canUseFold"
             class="DshDefaultSearch-fold"
         >
-            <div class="DshDefaultSearch-fold-zhanwei"></div>
+            <!-- <div class="DshDefaultSearch-fold-zhanwei"></div> -->
             <Icon
                 :class="[
                     'DshDefaultSearch-fold-icon',

package/src/components/form/DshForm.vue

@@ -325,6 +325,10 @@
         &-item-FormItem {
             margin-bottom: 0px!important;
         }
+
+        .ivu-form-item-content {
+            line-height: normal;
+        }
         .ivu-form-item-error-tip {
             top: 90%;
             left: 15px;

package/src/components/list/BriTable.vue

@@ -136,7 +136,6 @@
             // 全选配置项
             checkboxOption () {
                 return {
-                    selectedRowKeys: [],
                     // 行选择改变事件
                     selectedRowChange: ({ row, isSelected, selectedRowKeys }) => {
                         this.$emit(

package/src/components/other/BriSvg.vue

@@ -0,0 +1,28 @@
+<template>
+    <svg class="bri" aria-hidden="true">
+        <use :href="href"></use>
+    </svg>
+</template>
+
+<script>
+
+    export default {
+        name: "imgscg",
+        components: {},
+        props: {
+            src: String
+        },
+        computed: {
+            // 这是一种全新的使用方式，应该说这才是未来的主流，也是平台目前推荐的用法
+            // 浏览器渲染 SVG 的性能一般，还不如 png。
+            href () {
+                return `#bri-${this.src}`;
+            }
+        },
+        data () {
+            return {};
+        },
+        created () {},
+        methods: {}
+    };
+</script>

package/src/components/other/DshEditPanel.vue

@@ -1,8 +1,18 @@
 <template>
     <div class="DshEditPanel">
-        <Form class="DshEditPanel-form" :model="value" :label-width="80" label-position="left">
+        <Form
+            class="DshEditPanel-form"
+            :model="value"
+            :label-width="80"
+            label-position="left"
+        >
             <FormItem label="应用名称">
-                <Input v-model="value.name" placeholder="请输入应用名称" autofocus @on-blur="onBlur(value)" />
+                <Input
+                    v-model="value.name"
+                    placeholder="请输入应用名称"
+                    autofocus
+                    @on-blur="onBlur(value)"
+                />
             </FormItem>
 
             <FormItem label="主题颜色">
@@ -13,7 +23,12 @@
                         class="DshEditPanel-colors-item"
                         @click="$dispatchEvent(operationMap.updateColor, colorItem.color, colorKey, value)"
                     >
-                        <div class="DshEditPanel-colors-item-content" :style="{ backgroundColor: colorItem.color }"></div>
+                        <div
+                            class="DshEditPanel-colors-item-content"
+                            :style="{
+                                backgroundColor: colorItem.color
+                            }"
+                        ></div>
                         <Icon
                             v-if="colorItem.color === value.color"
                             class="DshEditPanel-colors-item-icon"
@@ -36,7 +51,12 @@
                         }"
                         @click="$dispatchEvent(operationMap.updateIcon, iconItem, iconIndex, value)"
                     >
-                        <div class="DshEditPanel-icons-item-content" :style="{backgroundImage: 'url('+ $appData.themeColors[value.color].bgUrl +')'}">
+                        <div
+                            class="DshEditPanel-icons-item-content"
+                            :style="{
+                                backgroundImage: `url(${$appData.themeColors[value.color].bgUrl})`
+                            }"
+                        >
                             <Icon :custom="'bico-font ' + iconItem"></Icon>
                         </div>
                     </div>
@@ -47,7 +67,7 @@
         <!-- 操作按钮 -->
         <dsh-buttons
             class="bri-footer"
-            :list="$getOperationList(['cancel', 'confirm'])"
+            :list="$getOperationList(['canCancel', 'canConfirm'])"
             @click="$dispatchEvent($event)"
         ></dsh-buttons>
     </div>
@@ -55,8 +75,8 @@
 
 <script>
     export default {
-        components: {},
         name: "DshEditPanel",
+        components: {},
         props: {
             value: {
                 type: Object,
@@ -78,14 +98,14 @@
                         type: "updateIcon",
                         event: "clickUpdateIcon"
                     },
-                    cancel: {
+                    canCancel: {
                         name: "取消",
-                        type: "cancel",
+                        type: "canCancel",
                         event: "clickCancel"
                     },
-                    confirm: {
+                    canConfirm: {
                         name: "确定",
-                        type: "confirm",
+                        type: "canConfirm",
                         btnType: "primary",
                         event: "clickConfirm"
                     }
@@ -107,7 +127,9 @@
             },
 
             onBlur (value) {
-                value.name || (value.name = value.oldName || "未命名");
+                if (!value.name) {
+                    value.name = value.oldName || "未命名";
+                }
             },
             // 点击修改应用主题色
             clickUpdateColor (item, colorItem, colorKey, appObj) {