bri-components 1.3.96 → 1.3.98

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

@@ -13,6 +13,7 @@ export default {
         selfPropsObj () {
             return {
                 _treeForm: [],
+                ...(this.typePropsObj || {}),
                 ...this.commonPropsObj,
 
                 _maxLevel: this.commonPropsObj._maxLevel || 3 // 最大级数
@@ -56,7 +57,7 @@ export default {
                 : list.length;
             list.splice(newRowIndex, 0, newRow);
 
-            this.change("createRow", null, newRow, newRowIndex);
+            this.change("createRow", newRow, newRowIndex, null);
         },
         // 节点操作 -添加子行
         clickCreateChild (operationItem, row, rowIndex, col) {
@@ -68,7 +69,7 @@ export default {
             // 展开子级
             this.toggleExpand(row, true);
 
-            this.change("createChildRow", null, newRow, newRowIndex);
+            this.change("createChildRow", newRow, newRowIndex, null);
         },
         // 节点操作 -删除行
         clickDelete (operationItem, row, rowIndex, col) {
@@ -80,7 +81,7 @@ export default {
                     const index = parentRow.children.findIndex(childRowItem => childRowItem._id === row._id);
                     parentRow.children.splice(index, 1);
 
-                    this.change("deleteRow", null, row, rowIndex);
+                    this.change("deleteRow", row, rowIndex, null);
                 }
             });
         },
@@ -88,11 +89,11 @@ export default {
         clickDeleteChilds (operationItem, row, rowIndex, col) {
             this.$Modal.confirm({
                 title: "警告",
-                content: "确定删除该行及其所有下级吗？",
+                content: "确定删除所有下级吗？",
                 onOk: () => {
                     row.children.splice(0);
 
-                    this.change("deleteChildRows", null, row, rowIndex);
+                    this.change("deleteChildRows", row, rowIndex, null);
                 }
             });
         },

package/src/components/unit/DshListUnit.vue

@@ -1,15 +1,15 @@
 <template>
     <div class="DshListUnit">
-        <template v-if="formItem._type === 'index'">
+        <template v-if="selfFormItem._type === 'index'">
             <span>{{ indexStr || rowIndex + 1 }}</span>
         </template>
 
-        <template v-else-if="formItem.render">
+        <template v-else-if="selfFormItem.render">
             <dsh-list-render
-                :column="formItem"
+                :column="selfFormItem"
                 :row="formData"
                 :index="rowIndex"
-                :render="formItem.render"
+                :render="selfFormItem.render"
             ></dsh-list-render>
         </template>
 
@@ -19,7 +19,7 @@
                 :canEdit="canEdit"
                 :value="formData"
                 :propsObj="{
-                    ...formItem,
+                    ...selfFormItem,
                     size: 'default',
                     inTable: true
                 }"

package/src/components/unit/unitMixin.js

@@ -59,6 +59,10 @@ export default {
     computed: {
         curComponentName () {
             return componentNameMap[this.formItem._type] || "DshUndeveloped";
+        },
+
+        selfFormItem () {
+            return this.$transformDynamicProperty(this.formItem, this.formData, this.parentObj);
         }
     },
     created () { },

package/src/utils/table.js

@@ -123,7 +123,7 @@ const transformToColumns = function (form, {
                         }
                         : undefined
                     : undefined,
-                renderHeaderCell: ({ row, column }, h) => {
+                renderHeaderCell: ({ column }, h) => {
                     return getHeadRender(h, column, {
                         showRequired,
                         showDescription,