bri-components 1.4.12 → 1.4.14

package/package.json

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

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

@@ -10,7 +10,7 @@
                 class="DshNumber-edit"
                 v-model="curVal"
                 :placeholder="selfPropsObj._placeholder"
-                :disabled="!finalCanEdit"
+                :disabled="selfPropsObj._disabled"
                 :formatter="formatterFunc"
                 :max="maxNum"
                 :min="minNum"

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

@@ -99,11 +99,11 @@ export default {
             const selectControlTypes = ["coordinates", "date", "switch", "select", "checkbox", "file", "region", "regions", "cascader", "cascaders", "users", "departments", "reference"];
             return {
                 // TODO: 此处的请输入可能还有请选择之类的，待处理
-                _placeholder: this.canEdit && this.propsObj._enterType !== "calculate"
+                _placeholder: this.canEdit && this.propsObj._enterType !== "calculate" && this.propsObj._disabled !== true
                     ? (this.propsObj._placeholder || `${selectControlTypes.includes(this.controlType) ? "选择" : "输入"}${this.propsObj._name}`)
                     : undefined,
                 _clearable: this.finalCanEdit && (this.propsObj._clearable === undefined ? true : this.propsObj._clearable),
-                _disabled: this.propsObj._disabled || ["serialNumber"].includes(this.controlType) || !this.finalCanEdit
+                _disabled: this.propsObj._disabled || !this.finalCanEdit
             };
         },
         // 是否为多选模式

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

@@ -282,7 +282,7 @@ export default {
         },
         changeVal (operationItem, row, rowIndex, column, params) {
             this.$set(this.ruleRecordMap, this.getMixKey(row, column), { showRuleMessage: true });
-            if (!["text", "textarea", "idcard", "email", "phone", "url", "password", "serialNumber"].includes(column._key)) {
+            if (!["text", "textarea", "idcard", "email", "phone", "url", "password"].includes(column._key)) {
                 this.dealSameRowsVal({ row, rowIndex, column });
             }
 

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

@@ -1424,6 +1424,7 @@ export default {
                 !(["cascaderTable"].includes(this.controlType) && ["level", "children"].includes(column._key)) && // 层级表格的固定字段不可编辑
                 column._enterType !== "calculate" && // 计算的不可编辑
                 column._readonly !== true && // 只读
+                column._disabled !== true && // 只读
                 column.canEdit !== false; // 字段本身编辑权限 考虑为undefined时候
         },