bri-components 1.4.7-0 → 1.4.8

package/README.md

@@ -28,3 +28,57 @@ npm test
 ```
 
 For a detailed explanation on how things work, check out the [guide](http://vuejs-templates.github.io/webpack/) and [docs for vue-loader](http://vuejs.github.io/vue-loader).
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+保证npm登录状态
+npm login
+
+~前端正常npm包发布流程~
+bri-components:(此包简单，不用压缩）
+npm version patch
+npm publish
+
+bri-datas和bri-utils:
+第一次操作的，先准备以下（之后发包不用重复操作）
+-package.json里改成"main": "lib/bri-datas.min.js"（指向压缩文件）
+-git stash save
+发包步骤
+npm version patch
+git stash apply
+npm run lib:prod
+npm publish
+git push
+git reset origin/dev --hard
+
+
+~前端项目应急npm包发布流程~(尽量避免发应急包)
+需发布npm预发布号的包：
+找到项目包使用包的version
+git checkout -b <branch name> <version name>（eg: git checkout -b dsh v1.4.7）
+git push --set-upstream origin <branch name>
+修改 => commit
+发包(此时用npm version release)
+git checkout dev
+git merge <branch name>
+git branch <branch name> -d
+git push origin <branch name> -d
+git checkout dev
+
+
+除外需将所有tag推向remote（偶尔操作一下即可）
+git push --tags
+
+另：修改npm包前最好先git pull（频繁发包，这种习惯log记录清晰）

package/package.json

@@ -1,6 +1,6 @@
 {
     "name": "bri-components",
-    "version": "1.4.7-0",
+    "version": "1.4.8",
     "author": "dengshanghui",
     "description": "a component lib for vue project",
     "main": "src/index.js",
@@ -61,7 +61,7 @@
         "babel-preset-stage-2": "^6.22.0",
         "babel-register": "^6.22.0",
         "chalk": "^2.0.1",
-        "chromedriver": "^2.27.2",
+        "chromedriver": "^120.0.0",
         "compression-webpack-plugin": "^1.1.12",
         "copy-webpack-plugin": "^4.0.1",
         "cross-spawn": "^5.0.1",

package/src/components/controls/base/BriUpload/uploadList.vue

@@ -363,6 +363,7 @@
 
                         return h("Input", {
                             props: {
+                                // value: fileItem.name.substring(0, lastIndex),
                                 value: fileName,
                                 autofocus: true,
                                 placeholder: "请输入名称"
@@ -372,6 +373,7 @@
                             },
                             on: {
                                 input: (val) => {
+                                    // fileItem.name = val + formate;
                                     fileName = val;
                                 }
                             }

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

@@ -147,7 +147,7 @@
                     _showWordLimit: this.propsObj._showWordLimit || (!!this.propsObj._maxlength || this.propsObj._maxlength === 0),
                     _autosize: {
                         minRows: 2,
-                        maxRows: this.isUnitUpdate ? 10 : 20
+                        maxRows: this.isUnitUpdate ? 40 : 30
                     },
 
                     ...this.propsObj,
@@ -192,6 +192,7 @@
             // 参数event
             onChange (event) {
                 this.changeStatus = true;
+                this.quickChange();
 
                 clearTimeout(this.timer);
                 this.timer = setTimeout(() => {

package/src/components/controls/mixins/controlMixin.js

@@ -306,6 +306,9 @@ export default {
         refChange (...params) {
             this.$emit("refChange", this.value[this.controlKey]);
         },
+        quickChange (...params) {
+            this.$emit("quickChange", this.value[this.controlKey]);
+        },
 
         // 点击输入框
         clickInput () {

package/src/components/controls/senior/flatTable.vue

@@ -22,6 +22,7 @@
                     :tableDataObj="curVal"
                     :data="curVal.list"
                     :rowDefault="curVal.rowDefault"
+                    :rowspanMap="curVal.rowspanMap"
                     :columns="subForm"
                     :propsObj="defaultPropsObj"
                     :allFormList="allFormList"
@@ -37,8 +38,9 @@
                 :canEdit="finalCanEdit"
                 :tableDataObj="curVal"
                 :data="curVal.list"
-                :compareData="curVal.oldList"
                 :rowDefault="curVal.rowDefault"
+                :rowspanMap="curVal.rowspanMap"
+                :compareData="curVal.oldList"
                 :columns="subForm"
                 :propsObj="propsObj"
                 :allFormList="allFormList"

package/src/components/controls/senior/selectUsers/selectUsers.vue

@@ -1,70 +1,24 @@
 <template>
-    <div class="selectUsers">
+    <!-- 编辑 -->
+    <div
+        v-if="canEdit"
+        class="selectUsers"
+    >
         <bri-tooltip
             :content="showVal"
-            placement="top"
             :transfer="true"
-            maxWidth="200"
         >
             <div @click="clickInput">
                 <slot>
-                    <!-- 编辑 -->
                     <dsh-control-input
-                        v-if="canEdit"
                         :class="commonClass"
                         :value="curValList"
                         :disabled="selfPropsObj._disabled"
+                        :heightAuto="isHeightAuto"
                         :propsObj="selfPropsObj"
                         @deleteItem="clickDeleteItem"
                         @clear="clickClear"
                     ></dsh-control-input>
-
-                    <!-- 表格查看 -->
-                    <div
-                        v-else-if="isUnitShow"
-                        :class="{
-                            ...commonClass,
-                            'selectUsers-unit': true
-                        }"
-                    >
-                        <template v-if="!$isEmptyData(curValList)">
-                            <template v-for="item in curValList">
-                                <img
-                                    :src="item.avatarurl ? $imageResize(item.avatarurl, imageResizeConfig) : $imageSrcMap.system.boy"
-                                    :key="item._key"
-                                    class="selectUsers-unit-img"
-                                />
-                                <span
-                                    :key="item._key + 'span'"
-                                    class="selectUsers-unit-text"
-                                >
-                                    {{ item.name || item.realname || item.mobile }}
-                                </span>
-                            </template>
-                        </template>
-
-                        <template v-else>
-                            {{ emptyShowVal }}
-                        </template>
-                    </div>
-
-                    <!-- 弹窗查看 -->
-                    <div
-                        v-else
-                        :class="{
-                            ...commonClass
-                        }"
-                    >
-                        <dsh-tags
-                            v-if="!$isEmptyData(curValList)"
-                            class="text"
-                            :list="curValList"
-                        ></dsh-tags>
-
-                        <template v-else>
-                            {{ emptyShowVal }}
-                        </template>
-                    </div>
                 </slot>
             </div>
         </bri-tooltip>
@@ -198,6 +152,79 @@
             ></dsh-buttons>
         </dsh-modal>
     </div>
+
+    <!-- 查看 -->
+    <div
+        v-else
+        class="selectUsers-show"
+    >
+        <!-- 有值 -->
+        <template v-if="!$isEmptyData(curValList)">
+            <!-- 单元格查看 -->
+            <bri-tooltip
+                v-if="isUnitShow"
+                :content="showVal"
+                :transfer="true"
+            >
+                <div :class="{
+                    ...commonClass,
+                    'selectUsers-show-unit': true
+                }">
+                    <template v-for="item in curValList">
+                        <img
+                            :src="item.avatarurl ? $imageResize(item.avatarurl, imageResizeConfig) : $imageSrcMap.system.boy"
+                            :key="item._key"
+                            class="selectUsers-show-unit-img"
+                        />
+                        <span
+                            :key="item._key + 'span'"
+                            class="selectUsers-show-unit-text"
+                        >
+                            {{ item.name || item.realname || item.mobile }}
+                        </span>
+                    </template>
+                </div>
+            </bri-tooltip>
+
+            <!-- 表单查看 -->
+            <template v-else>
+                <!-- 高度自由时 -->
+                <dsh-tags
+                    v-if="isHeightAuto"
+                    :class="{
+                        ...commonClass,
+                        'selectUsers-show-auto': true
+                    }"
+                    itemClass="selectUsers-show-auto-tag"
+                    :list="curValObjList"
+                ></dsh-tags>
+
+                <!-- 高度不自由（不换行） -->
+                <bri-tooltip
+                    v-else
+                    :content="showVal"
+                    :transfer="true"
+                >
+                    <dsh-tags
+                        :class="{
+                            ...commonClass,
+                            'selectUsers-show-ellipsis': true
+                        }"
+                        itemClass="selectUsers-show-ellipsis-tag"
+                        :list="curValObjList"
+                    ></dsh-tags>
+                </bri-tooltip>
+            </template>
+        </template>
+
+        <!-- 无值 -->
+        <div
+            v-else
+            :class="commonClass"
+        >
+            {{ emptyShowVal }}
+        </div>
+    </div>
 </template>
 
 <script>
@@ -306,11 +333,15 @@
             isCompAdmin () {
                 return (JSON.parse(sessionStorage.getItem("userData")) || {}).isCompAdmin || this.selfPropsObj._isCompAdmin;
             },
+
             curCheckAll () {
                 return this.userList.length && this.userList.every(userItem =>
                     this.newValList.some(newItem => newItem._key === userItem._key)
                 );
             },
+            curValObjList () {
+                return this.curValList;
+            },
             showVal () {
                 return this.$isEmptyData(this.curValList)
                     ? this.emptyShowVal
@@ -490,18 +521,6 @@
                                     ]
                                     : []
                             ),
-                            ...(
-                                this.highSearch && this.isCompAdmin
-                                    ? [
-                                        {
-                                            is_leaf: true,
-                                            level: 1,
-                                            name: "离职人员",
-                                            _key: "_resign"
-                                        }
-                                    ]
-                                    : []
-                            ),
                             {
                                 is_leaf: true,
                                 level: 1,
@@ -516,6 +535,18 @@
                                             : this.listFilterVals.includes(item._key)
                                     )
                                     : data.list
+                            ),
+                            ...(
+                                this.isCompAdmin
+                                    ? [
+                                        {
+                                            is_leaf: true,
+                                            level: 1,
+                                            name: "离职人员",
+                                            _key: "_resign"
+                                        }
+                                    ]
+                                    : []
                             )
                         ];
 
@@ -542,27 +573,40 @@
     };
 </script>
 
-<style lang="less">
+<style lang="less" scoped>
+    @import url("../../control.less");
+
     .selectUsers {
         width: 100%;
 
-        &-unit {
-            .dsh-ellipsis();
-            padding-left: 5px;
-
-            &-img {
-                width: 18px;
-                height: 18px;
-                vertical-align: middle;
-                margin-left: -5px;
-                border-radius: 50%;
+        #control-show();
+        &-show {
+            &-auto,
+            &-ellipsis {
+                margin: 5px 0px;
             }
 
-            &-text {
-                vertical-align: middle;
+            &-unit {
+                .dsh-ellipsis();
+                padding-left: 5px;
+
+                &-img {
+                    width: 18px;
+                    height: 18px;
+                    vertical-align: middle;
+                    margin-left: -5px;
+                    border-radius: 50%;
+                }
+
+                &-text {
+                    vertical-align: middle;
+                }
             }
         }
-
+    }
+</style>
+<style lang="less">
+    .selectUsers {
         // 弹框部分
         &-modal {
             &-wrap {

package/src/components/form/DshForm.vue

@@ -356,7 +356,7 @@
                     (!["select", "checkbox"].includes(formItem._type)) // 考虑到选项用数字类型时，应该type: "number"
                 ) {
                     rules.push({
-                        message: `${formItem._name}数据格式有错!`,
+                        message: `"${formItem._name}"数据格式有错!`,
                         trigger: "blur, change",
                         type: "string",
                         ...ruleConfig,
@@ -366,7 +366,7 @@
                                 [arr[0]]: {
                                     ...arr[1],
                                     required: false,
-                                    message: `${formItem._name}${arr[1].message || ""}`
+                                    message: `"${formItem._name}"${arr[1].message || ""}`
                                 }
                             };
                         }, ruleConfig.fields)
@@ -376,7 +376,7 @@
                 // 必填校验
                 if (formItem._required) {
                     rules.push({
-                        message: `${formItem._name}为必填项!`,
+                        message: `"${formItem._name}"为必填项!`,
                         trigger: "blur, change",
                         type: "string",
                         required: true,
@@ -386,7 +386,7 @@
                                 ...obj,
                                 [arr[0]]: {
                                     ...arr[1],
-                                    message: `${formItem._name}${arr[1].message || ""}`
+                                    message: `"${formItem._name}"${arr[1].message || ""}`
                                 }
                             };
                         }, ruleConfig.fields)
@@ -396,7 +396,7 @@
                 // 格式校验（不依赖必填）
                 if (ruleConfig.regs && ruleConfig.regs.length) {
                     rules.push({
-                        message: formItem._regMessage || `${formItem._name}格式不正确!`,
+                        message: formItem._regMessage || `"${formItem._name}"格式不正确!`,
                         trigger: "blur, change",
                         type: "string",
                         transform: (val) => {
@@ -411,7 +411,7 @@
                 // 对比校验（横向同类型字段对比）-暂时只number和date对比校验
                 if (formItem._saveRuleConfigs && formItem._saveRuleConfigs.length) {
                     const ruleObj = {
-                        message: `${formItem._name}对比不通过!`,
+                        message: `"${formItem._name}"对比不通过!`,
                         trigger: "blur, change",
                         type: "string",
                         transform: (val) => {
@@ -428,7 +428,7 @@
                 // 对比校验（层级表格的层级对比）-暂时只number和date对比校验
                 if (this.inTableType === "treeTable" && ["downToUp", "upToDown"].includes(formItem._writeSort)) {
                     const ruleObj = {
-                        message: `${formItem._name}层级对比不通过!`,
+                        message: `"${formItem._name}"层级对比不通过!`,
                         trigger: "blur, change",
                         type: "string",
                         transform: (val) => {

package/src/components/list/DshFlatTable.vue

@@ -50,7 +50,7 @@
         <!-- 表格展示模式 -->
         <template v-else>
             <bri-table
-                v-show="showListData.length"
+                v-show="showListData.length && !isSearching"
                 ref="briTable"
                 class="DshFlatTable-main"
                 :columns="showColumns"
@@ -60,6 +60,17 @@
                 @changeSelect="changeSelect"
                 @selectAll="changeSelect"
             ></bri-table>
+            <bri-table
+                v-show="showListData.length && isSearching"
+                ref="briTable"
+                class="DshFlatTable-main"
+                :columns="showColumns"
+                :data="showListData"
+                :footer-data="footerData"
+                :propsObj="tablePropsObj"
+                @changeSelect="changeSelect"
+                @selectAll="changeSelect"
+            ></bri-table>
             <bri-table
                 v-show="!showListData.length"
                 class="DshFlatTable-main"

package/src/components/list/mixins/DshCascaderTableMixin.js

@@ -215,7 +215,7 @@ export default {
         /* ----------- 方法 ---------- */
         selfBodyCellClass ({ row, rowIndex, column }) {
             return `${["tree"].includes(column.colType)
-                ? " bri-table-td-merge"
+                ? " bri-table-td-noborder"
                 : ""
             }`;
         },
@@ -244,8 +244,7 @@ export default {
             return {
                 ...this.getThStyle({ column }),
                 paddingTop: undefined,
-                paddingBottom: undefined,
-                backgroundColor: "#ffffff"
+                paddingBottom: undefined
             };
         },
         // 单元格 -获取行合并数
@@ -286,13 +285,22 @@ export default {
                         : "未选择算法";
             }
         },
-        // 列本身是否可编辑 -针对表头列
-        getTypeColCanEdit ({ row, rowIndex, column }) {
+        // 加工单元格对应的配置
+        getSelfResetCol ({ row, rowIndex, column }) {
+            return column.colType === "tree"
+                ? {
+                    _heightAuto: true,
+                    _placeholder: " "
+                }
+                : {};
+        },
+        // 单元格本身是否可编辑性 -针对表头列
+        getSelfColCanEdit ({ row, rowIndex, column }) {
             return (this.getIsDftRow(row) ? !this.dftReadonlyTreeColKeys.includes(column._key) : true) && // 默认行的某列是否可编辑
             (row.__old__ === true ? !this.oldReadonlyTreeColKeys.includes(column._key) : true); // 老数据行里某些列不可编辑
         },
         // getNewRowData时，额外补充的行相关的数据（针对层级属性的列）
-        getRowOtherDft (level, list = []) {
+        getSelfNewRowData (level, list = []) {
             const column = this.treeForm[level - 1];
             const dftVal = column._default;
             const initDftVal = this.initDftValMap[column._type];