bri-components 1.2.3 → 1.2.5

package/package.json

@@ -1,6 +1,6 @@
 {
     "name": "bri-components",
-    "version": "1.2.3",
+    "version": "1.2.5",
     "author": "dengshanghui",
     "description": "a component lib for vue project",
     "main": "src/index.js",

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

@@ -64,7 +64,6 @@ export default {
                 callback: res => {
                     this.inputType = "file";
                     if (res.ossType === "ali-oss") {
-                        console.log(this.computedOssType, res);
                         // 上传到阿里云res
                         this[this.computedOssType](file, res, callback);
                     } else if (res.ossType === "local") {
@@ -260,7 +259,6 @@ export default {
         binaryMultipartUpload (file, res, callback) {
             let type = "jpg";
             let remoteName = `${this.randomTimeStampFn()}.${type}`;
-            console.log("调binaryMultipartUpload");
             // 上传成功的回调参数
             let callbackBody = {
                 name: remoteName,
@@ -278,8 +276,22 @@ export default {
                 callbackBodyType: "application/json",
                 callbackBody: this.transferCallBody(callbackBody)
             };
-            console.log("调binaryMultipartUpload22");
-            new this.$aliOss(res.ossConfig).multipartUpload(remoteName, file, {
+
+            let newOss = {
+                ...res.ossConfig,
+                refreshSTSToken: async () => {
+                    // 向您搭建的STS服务获取临时访问凭证。
+                    return {
+                        accessKeyId: res.ossConfig.accessKeyId, // 自己账户的accessKeyId或临时秘钥
+                        accessKeySecret: res.ossConfig.accessKeySecret, // 自己账户的accessKeySecret或临时秘钥
+                        stsToken: res.ossConfig.stsToken //  从STS服务获取的安全令牌（SecurityToken）。
+                    };
+                },
+                // 刷新临时访问凭证的时间间隔，单位为毫秒。
+                refreshSTSTokenInterval: 3600 * 1000
+            };
+
+            new this.$aliOss(newOss).multipartUpload(remoteName, file, {
                 progress: (percentage) => {
                     this.inProgress(Number((percentage * 100).toFixed(0)));
                     this.handleProgress && this.handleProgress(percentage, file);

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

@@ -35,7 +35,8 @@
                                 class="overflow"
                                 :list="curValNameList"
                                 :propsObj="{
-                                    disabled: !finalCanEdit
+                                    disabled: !finalCanEdit,
+                                    closable: true
                                 }"
                                 @delete="deleteItem"
                             ></dsh-tags>

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

@@ -1,18 +1,16 @@
 <template>
-    <div
-        class="DshCheckbox"
-        ref="dshCheckboxRef"
-    >
+    <div class="DshCheckbox">
+        <!-- 编辑 -->
         <template v-if="canEdit">
-            <!-- 平铺 -->
+            <!-- 平铺方式 -->
             <template v-if="showType === 'flat'">
                 <CheckboxGroup
                     :class="{
-                    'DshCheckbox-group': true,
-                    'DshCheckbox-group-color': useColor,
-                    'DshCheckbox-group-disabled': !canEdit,
-                    'DshCheckbox-group-scroll': selfPropsObj._span < 24 && !selfPropsObj._br,
-                }"
+                        'DshCheckbox-group': true,
+                        'DshCheckbox-group-color': useColor,
+                        'DshCheckbox-group-disabled': !canEdit,
+                        'DshCheckbox-group-scroll': selfPropsObj._span < 24 && !selfPropsObj._br,
+                    }"
                     v-model="curValList"
                 >
                     <!-- 有选项 -->
@@ -22,19 +20,23 @@
                             :key="index"
                             :class="[
                                 'DshCheckbox-item',
-                                getItemColorClass(item.color),
+                                getItemColorClass(item),
                                 selfPropsObj.class,
                                 item.class
                             ]"
                             :style="getItemStyle(item)"
                             :label="item._key"
-                            :border="useColor"
                             :disabled="getItemDisabled(item)"
+                            :border="useColor"
                             @click.native="clickOpenTip(item)"
                         >
                             <slot :item="item"></slot>
+
                             <span>{{ item.name || item._name }}</span>
                         </Checkbox>
+
+                        <!-- tip项弹框提示 -->
+                        <dsh-render :render="tipModalRender"></dsh-render>
                     </template>
 
                     <!-- 无选项 -->
@@ -46,7 +48,7 @@
                 </CheckboxGroup>
             </template>
 
-            <!-- 下拉 -->
+            <!-- 下拉方式 -->
             <template v-else>
                 <Select
                     v-model="curValList"
@@ -65,12 +67,12 @@
                         :label="item.name || item._name"
                         :disabled="getItemDisabled(item)"
                     >
-                        <Checkbox :value="curValList.includes(item._key)"></Checkbox>
+                        <Checkbox :value="getItemSelectStatus(item)"></Checkbox>
 
                         <slot :item="item"></slot>
 
                         <span>{{ item.name || item._name }}</span>
-                        <span style="float:right;paddingRight:20px">
+                        <span style="float:right; padding-right:20px">
                             {{ item.rightName }}
                         </span>
                     </Option>
@@ -92,7 +94,7 @@
                 }">
                     <!-- 有值 -->
                     <dsh-tags
-                        v-if="!$isEmptyData(curValList)"
+                        v-if="!$isEmptyData(curValObjList)"
                         class="text"
                         :list="curValObjList"
                     ></dsh-tags>
@@ -104,9 +106,6 @@
                 </div>
             </bri-tooltip>
         </template>
-
-        <!-- tip项弹框提示 -->
-        <dsh-render :render="tipModalRender"></dsh-render>
     </div>
 </template>
 
@@ -129,6 +128,9 @@
         computed: {
             selfPropsObj () {
                 return {
+                    _optionKind: "dropdown", // 'flat'、'dropdown'
+                    _useColor: false,
+                    colorMap: resourceData.colorMap,
                     _filterable: true,
                     _transfer: true,
                     _data: [],
@@ -137,10 +139,6 @@
                     ...this.commonDealPropsObj
                 };
             },
-            listData () {
-                return (this.selfPropsObj._data || []).concat(this.initListData);
-            },
-
             showType () {
                 return this.selfPropsObj._optionKind;
             },
@@ -148,48 +146,55 @@
                 return this.selfPropsObj._useColor;
             },
             colorMap () {
-                return this.selfPropsObj.colorMap || resourceData.colorMap;
+                return this.selfPropsObj.colorMap;
             },
 
+            listData () {
+                return this.selfPropsObj._data.concat(this.initListData);
+            },
             // 已选择项的对象列表
             curValObjList () {
-                return this.listData
-                    .filter(item => this.curValList.includes(item._key))
-                    .map(item => {
-                        return {
-                            ...item,
-                            style: this.getItemStyle(item),
-                            color: undefined
-                        };
+                return this.curValList.map(key => {
+                    const obj = this.listData.find(item => item._key === key) || {
+                        _key: key,
+                        name: `温馨提示：选项${key}已找不到`
+                    };
+                    return {
+                        ...obj,
+                        style: this.getItemStyle(obj),
+                        color: undefined
+                    };
                 });
             },
             showMultipleVal () {
-                return this.curValObjList.map(item => item.name).join("、");
+                return this.$isEmptyData(this.curValList)
+                    ? this.emptyShowVal
+                    : this.curValObjList.map(item => item.name || item._name).join("、");
             }
         },
         created () {},
         methods: {
-            getItemColorClass (color) {
-                return this.colorMap[color] ? color : "color-1";
+            getItemColorClass (item) {
+                return this.colorMap[item.color] ? item.color : "color-1";
             },
             getItemStyle (item) {
-                const getColor = (color) => {
-                    return this.colorMap[color] || this.colorMap["color-1"];
-                };
-                const getBgColor = (color) => {
-                    return this.$getColor(getColor(color), 0.1);
-                };
+                const color = this.colorMap[item.color] || this.colorMap["color-1"];
                 return {
-                    background: this.useColor ? getBgColor(item.color) : undefined,
-                    color: this.useColor ? getColor(item.color) : undefined
+                    background: this.useColor ? this.$getColor(color, 0.1) : undefined,
+                    color: this.useColor ? color : undefined
                 };
             },
+            // 获取某项的置灰状态
             getItemDisabled (item) {
                 return !!(
                     !this.finalCanEdit ||
                     item._disabled ||
-                    this.curValList.length >= this.selfPropsObj._max && !this.curValList.includes(item._key)
+                    this.curValList.length >= this.selfPropsObj._max && !this.getItemSelectStatus(item)
                 );
+            },
+            // 获取某项的选中状态
+            getItemSelectStatus (item) {
+                return this.curValList.includes(item._key);
             }
         }
     };

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

@@ -1,7 +1,7 @@
 <template>
     <div class="DshCoordinates">
         <bri-tooltip
-            :content="showText"
+            :content="showVal"
             placement="top"
             maxWidth="200"
             :transfer="true"
@@ -9,20 +9,30 @@
             <div
                 :class="{
                     ...commonClass,
-                    'DshCoordinates-edit': true
+                    'DshCoordinates-edit': canEdit,
+                    'DshCoordinates-unit': !canEdit && isUnitShow,
+                    'DshCoordinates-show': !canEdit && !isUnitShow
                 }"
-                @click.stop="clickOpenModal"
+                @click.stop="clickInput"
             >
                 <div class="text">
-                    {{ showText }}
+                    {{ showVal }}
                 </div>
 
-                <Icon
-                    v-if="finalCanEdit && selfPropsObj._clearable"
-                    class="icon-close"
-                    type="ios-close-circle"
-                    @click.stop="clickDelete"
-                />
+                <!-- 图标 -->
+                <template>
+                    <Icon
+                        v-if="!$isEmptyData(curVal) && selfPropsObj._clearable && isHover"
+                        class="icon-close"
+                        type="ios-close-circle"
+                        @click.stop="clickClear"
+                    />
+                    <Icon
+                        v-else
+                        class="icon-default"
+                        :type="inputIcon"
+                    />
+                </template>
             </div>
         </bri-tooltip>
 
@@ -81,7 +91,7 @@
                             :value="curVal.name"
                             :readonly="true"
                             :clearable="true"
-                            @on-clear="clickClear"
+                            @on-clear="clickModalClear"
                             @click.native="clickMapFitView"
                         />
                         </Col>
@@ -167,9 +177,6 @@
                     this.value[this.controlKey] = val;
                 }
             },
-            showText () {
-                return this.$isEmptyData(this.curVal) ? this.emptyShowVal : this.curVal.name;
-            },
             curLnglat: {
                 get () {
                     return this.curVal.lnglat || [];
@@ -187,16 +194,24 @@
             },
             kind () {
                 return this.selfPropsObj._showType;
+            },
+            inputIcon () {
+                return "ios-map-outline";
+            },
+
+            showVal () {
+                return this.$isEmptyData(this.curVal)
+                    ? this.emptyShowVal
+                    : this.curVal.name;
             }
         },
         data () {
             return {
-                // 确认前的value
+                showModal: false,
                 cloneValue: {
                     name: "",
                     lnglat: []
                 },
-                showModal: false,
                 modalStyles: {
                     height: document.body.clientHeight * 0.96 + "px",
                     width: document.body.clientWidth * 0.96 + "px",
@@ -206,22 +221,20 @@
                     kind: "keyword",
                     searchText: ""
                 },
+
                 // 地图相应控件
                 map: null,
                 placeSearch: null,
                 mouseTool: null,
-                // 标记点
-                marker: null,
-                // 标记图形
-                plot: null,
-                // 提示信息
-                searchMessage: ""
+                marker: null, // 标记点
+                plot: null, // 标记图形
+                searchMessage: "" // 提示信息
             };
         },
         created () {},
         methods: {
             // 打开窗体
-            clickOpenModal () {
+            clickInput () {
                 if (this.finalCanEdit) {
                     this.showModal = true;
                     this.cloneValue = this.$deepCopy(this.curVal);
@@ -238,7 +251,7 @@
                 this.curVal = this.cloneValue;
             },
             // 点击删除
-            clickDelete () {
+            clickClear () {
                 this.curVal = {
                     name: "",
                     lnglat: []
@@ -246,7 +259,7 @@
                 this.$emit("change", []);
             },
             // 清除已选内容
-            clickClear () {
+            clickModalClear () {
                 this.curVal = {
                     name: "",
                     lnglat: []

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

@@ -38,7 +38,7 @@
         <!-- 查看 -->
         <template v-else>
             <bri-tooltip
-                :content="showText"
+                :content="showVal"
                 maxWidth="200"
                 :transfer="true"
             >
@@ -47,7 +47,7 @@
                     'DshDate-unit': isUnitShow,
                     'DshDate-show': !isUnitShow
                 }">
-                    {{ showText }}
+                    {{ showVal }}
                 </div>
             </bri-tooltip>
         </template>

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

@@ -4,11 +4,11 @@
          <template v-if="canEdit">
             <div
                 :class="{
-                    'DshEditor-edit': true,
-                    ...commonClass
+                    ...commonClass,
+                    'DshEditor-edit': true
                 }"
                 v-show="showType === 'show'"
-                v-html="showText"
+                v-html="showVal"
                 @click="handleEdit"
             ></div>
 
@@ -55,7 +55,7 @@
                     'DshEditor-show': true,
                     'DshEditor-show-nodata': $isEmptyData(curVal)
                 }"
-                v-html="showText"
+                v-html="showVal"
             ></div>
         </template>
     </div>

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

@@ -41,14 +41,14 @@
             <template v-if="!isUnitShow && subType === 'textarea' && !$isEmptyData(curVal)">
                 <p
                     class="DshInput-show-textarea"
-                    v-text="showText"
+                    v-text="showVal"
                 ></p>
             </template>
 
             <!-- 表格和查看页 里的查看 -->
             <template v-else>
                 <bri-tooltip
-                    :content="showText"
+                    :content="showVal"
                     maxWidth="200"
                     :transfer="true"
                 >
@@ -57,7 +57,7 @@
                         'DshInput-unit': isUnitShow,
                         'DshInput-show': !isUnitShow
                     }">
-                        {{ showText }}
+                        {{ showVal }}
                     </div>
                 </bri-tooltip>
             </template>

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

@@ -3,30 +3,7 @@
         <!-- <div :class="suffixClasses">
             <slot name="suffix"></slot>
         </div> -->
-        <div
-            v-if="numberAdjust"
-            :class="handlerClasses"
-            :style="handlerStyle"
-        >
-            <a
-                @click="up"
-                :class="upClasses"
-            >
-                <span
-                    :class="innerUpClasses"
-                    @click="preventDefault"
-                ></span>
-            </a>
-            <a
-                @click="down"
-                :class="downClasses"
-            >
-                <span
-                    :class="innerDownClasses"
-                    @click="preventDefault"
-                ></span>
-            </a>
-        </div>
+
         <div
             :class="inputWrapClasses"
             style="display:flex"
@@ -49,7 +26,32 @@
                 :value="formatterValue"
                 :placeholder="placeholder"
             >
-            <slot name="suffix"></slot>
+
+            <slot name="suffix">
+                <div
+                    :class="handlerClasses"
+                    :style="handlerStyle"
+                >
+                    <a
+                        @click="up"
+                        :class="upClasses"
+                    >
+                        <span
+                            :class="innerUpClasses"
+                            @click="preventDefault"
+                        ></span>
+                    </a>
+                    <a
+                        @click="down"
+                        :class="downClasses"
+                    >
+                        <span
+                            :class="innerDownClasses"
+                            @click="preventDefault"
+                        ></span>
+                    </a>
+                </div>
+            </slot>
         </div>
     </div>
 </template>
@@ -175,10 +177,6 @@
                     return {};
                 }
             },
-            numberAdjust: {
-                type: Boolean,
-                default: true
-            },
             isPositive: {
                 type: Boolean,
                 default: false

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

@@ -4,14 +4,13 @@
         <template v-if="canEdit">
             <BriInputNumber
                 class="DshNumber-edit"
-                v-model="value[controlKey]"
+                v-model="curVal"
                 :placeholder="selfPropsObj._placeholder"
                 :disabled="!finalCanEdit"
                 :formatter="formatterFunc"
                 :max="maxNum"
                 :min="minNum"
                 :precision="digit"
-                :numberAdjust="selfPropsObj._numberAdjust || !unitStr"
                 @on-change="change"
             >
                 <div
@@ -28,25 +27,20 @@
         <template v-else>
             <!-- 单元格的查看 进度条模式 -->
             <template v-if="isUnitShow && selfPropsObj._showProgress">
-                <Progress
-                    v-if="selfPropsObj._showProgress"
-                    :percent="curVal > 100 ? 100 : toDecimal(curVal)"
-                />
+                <Progress :percent="progressNum" />
             </template>
 
             <!-- 单元格和查看页的查看 -->
             <template v-else>
                 <bri-tooltip
-                    :content="showText"
+                    :content="showVal"
                     maxWidth="200"
                     :transfer="true"
                 >
                     <div :class="{
                         ...commonClass,
-                        'DshInput-unit': isUnitShow,
-                        'DshInput-show': !isUnitShow
                     }">
-                        {{ showText }}
+                        {{ showVal }}
                     </div>
                 </bri-tooltip>
             </template>
@@ -121,19 +115,21 @@
                 return this.selfPropsObj._separator;
             },
 
-            showText () {
+            // 进度条方式使用(此处先这样，实际是进度条使用要受0-100的数值范围限制)
+            progressNum () {
+                return this.$isEmptyData(this.curVal) || this.curVal < 0
+                    ? 0
+                    : this.curVal > 100
+                        ? 100
+                        : Math.round(this.curVal * 100) / 100;
+            },
+            showVal () {
                 return this.$isEmptyData(this.curVal)
                     ? this.emptyShowVal
-                    : this.$numToStrAndUnit(this.value[this.controlKey], this.selfPropsObj);
+                    : this.$numToStrAndUnit(this.curVal, this.selfPropsObj);
             }
         },
         created () {},
-        methods: {
-            toDecimal (num) {
-                return isNaN(parseFloat(num))
-                    ? undefined
-                    : Math.round(num * 100) / 100;
-            }
-        }
+        methods: {}
     };
 </script>