修复表格bug

src/packages/hs-dialog-table/src/index.vue

@@ -21,7 +21,7 @@
         :config='hsTableConfig'
         :data='hsTableData'
         :elInfo='hsTableEl'
-        fromWhere='hdrDtl'
+        :editable='true'
         @handleClick='handleClick'
         @toolClick='tableItemClick'
         v-bind="$attrs"

src/packages/hs-table/src/ItemComponentChild.vue

@@ -13,7 +13,7 @@
         @keyup.enter.native="enterInput"
         style="width:100%"
         clearable
-        :disabled='getDisabled||isFromHdrDtl'
+        :disabled='getDisabled||isEditable'
         size='mini'
         v-model="formParms[item.prop]"
       ></el-input>
@@ -22,9 +22,9 @@
       <hs-input
         :prop='item.prop'
         v-model="formParms[item.prop]"
-        :allSourceData='item.allSourceData'
+        :config='item.config'
         :elInfo='item.elInfo'
-        :disabled='getDisabled||isFromHdrDtl'
+        :disabled='getDisabled||isEditable'
         :formData='formParms'
       ></hs-input>
     </template>
@@ -33,7 +33,7 @@
         style="width:100%"
         type='textarea'
         clearable
-        :disabled='getDisabled||isFromHdrDtl'
+        :disabled='getDisabled||isEditable'
         v-model="formParms[item.prop]"
       ></el-input>
     </template>
@@ -41,7 +41,7 @@
     <template v-else-if="item.showType==='elDatePicker'">
       <el-date-picker
         clearable
-        :disabled='getDisabled||isFromHdrDtl'
+        :disabled='getDisabled||isEditable'
         style="width:100%"
         size='mini'
         v-model="formParms[item.prop]"
@@ -56,7 +56,7 @@
     <template v-else-if="item.showType==='elDatePickerDatetime'">
       <el-date-picker
         clearable
-        :disabled='getDisabled||isFromHdrDtl'
+        :disabled='getDisabled||isEditable'
         style="width:100%"
         size='mini'
         v-model="formParms[item.prop]"
@@ -68,10 +68,10 @@
     <template v-else-if="item.showType==='hsSwitch'">
       <hs-switch
         :prop='item.prop'
-        :allSourceData='item.allSourceData'
+        :config='item.config'
         :elInfo='item.elInfo'
         v-model="formParms[item.prop]"
-        :disabled='getDisabled||isFromHdrDtl'
+        :disabled='getDisabled||isEditable'
       >
       </hs-switch>
     </template>
@@ -79,7 +79,7 @@
       <el-checkbox
         style="width:100%"
         size='mini'
-        :disabled='getDisabled||isFromHdrDtl'
+        :disabled='getDisabled||isEditable'
         v-model="formParms[item.prop]"
       >
       </el-checkbox>
@@ -88,9 +88,9 @@
       <hs-computed
         :prop='item.prop'
         v-model="formParms[item.prop]"
-        :allSourceData='item.allSourceData'
+        :config='item.config'
         :elInfo='item.elInfo'
-        :disabled='getDisabled||isFromHdrDtl'
+        :disabled='getDisabled||isEditable'
         :formData='formParms'
         v-on="$listeners"
         v-bind="$attrs"
@@ -102,10 +102,11 @@
         parentType='table'
         v-model="formParms[item.prop]"
         :prop='item.prop'
-      :allSourceData='item.allSourceData'
+        :config='item.config'
+        :data='item.data'
         :elInfo='item.elInfo'
         :formData='formParms'
-      :disabled='getDisabled||isFromHdrDtl'
+        :disabled='getDisabled||isEditable'
         v-on="$listeners"
         v-bind="$attrs"
       >
@@ -115,9 +116,9 @@
       <hs-input-number
         :prop='item.prop'
         v-model="formParms[item.prop]"
-        :allSourceData='item.allSourceData'
+        :config='item.config'
         :elInfo='item.elInfo'
-        :disabled='getDisabled||isFromHdrDtl'
+        :disabled='getDisabled||isEditable'
         :formData='formParms'
         v-bind="$attrs"
         v-on="$listeners"
@@ -127,9 +128,9 @@
       <hs-popover-textarea
         :prop='item.prop'
         v-model="formParms[item.prop]"
-        :allSourceData='item.allSourceData'
+        :config='item.config'
         :elInfo='item.elInfo'
-        :disabled='getDisabled||isFromHdrDtl'
+        :disabled='getDisabled||isEditable'
         :formData='formParms'
         v-bind="$attrs"
         v-on="$listeners"
@@ -139,9 +140,9 @@
       <hs-lookup
         :prop='item.prop'
         v-model="formParms[item.prop]"
-        :allSourceData='item.allSourceData'
+        :config='item.config'
         :elInfo='item.elInfo'
-        :disabled='getDisabled||isFromHdrDtl'
+        :disabled='getDisabled||isEditable'
         :formData='formParms'
         v-on="$listeners"
         v-bind="$attrs"
@@ -152,10 +153,10 @@
       <hs-tags-select
         v-model="formParms[item.prop]"
         :prop='item.prop'
-      :allSourceData='item.allSourceData'
+        :config='item.config'
         :elInfo='item.elInfo'
         :formData='formParms'
-      :disabled='getDisabled||isFromHdrDtl'
+        :disabled='getDisabled||isEditable'
         v-on="$listeners"
         v-bind="$attrs"
       >
@@ -165,7 +166,7 @@
       <hs-tags-table
         v-model="formParms[item.prop]"
         :prop='item.prop'
-      :allSourceData='item.allSourceData'
+        :config='item.config'
         :elInfo='item.elInfo'
         :formData='formParms'
         :disabled='getDisabled'
@@ -178,10 +179,10 @@
       <hs-tags-from
         v-model="formParms[item.prop]"
         :prop='item.prop'
-      :allSourceData='item.allSourceData'
+        :config='item.config'
         :elInfo='item.elInfo'
         :formData='formParms'
-      :disabled='getDisabled||isFromHdrDtl'
+        :disabled='getDisabled||isEditable'
         v-on="$listeners"
         v-bind="$attrs"
       >
@@ -190,9 +191,9 @@
     <template v-else-if="item.showType==='hsSelectList'">
       <hs-select-list
         v-model="formParms[item.prop]"
-        :allSourceData='item.allSourceData'
+        :config='item.config'
         :elInfo='item.elInfo'
-        :disabled='getDisabled||isFromHdrDtl'
+        :disabled='getDisabled||isEditable'
         :formData='formParms'
         :prop='item.prop'
         v-on="$listeners"
@@ -203,9 +204,9 @@
     <template v-else-if="item.showType==='hsDragList'">
       <hs-drag-list
         v-model="formParms[item.prop]"
-        :allSourceData='item.allSourceData'
+        :config='item.config'
         :elInfo='item.elInfo'
-        :disabled='getDisabled||isFromHdrDtl'
+        :disabled='getDisabled||isEditable'
         :formData='formParms'
         :prop='item.prop'
         v-on="$listeners"
@@ -216,9 +217,9 @@
     <template v-else-if="item.showType==='hsInputSelect'">
       <hs-input-select
         v-model="formParms[item.prop]"
-        :allSourceData='item.allSourceData'
+        :config='item.config'
         :elInfo='item.elInfo'
-        :disabled='getDisabled||isFromHdrDtl'
+        :disabled='getDisabled||isEditable'
         :formData='formParms'
         :prop='item.prop'
         v-on="$listeners"
@@ -244,13 +245,13 @@ export default {
     }
   },
   computed: {
-    // 为什么加这个 因为有变态需求是列表上要修改, 原本是列表上一律不允许修改
-    isFromHdrDtl() {
-      const fromWhere = this.$attrs.fromWhere
-      if (fromWhere === 'importPage') {
+    // 为什么加这个 因为有变态需求是列表上要修改, 原本是列表上一律不允许修改 Editable
+    isEditable() {// 是否可编辑
+      const editable = this.$attrs.editable
+      if (editable) {
         return false
       } else {
-        return fromWhere !== 'hdrDtl'
+        return true
       }
     },
     getDisabled() {

src/packages/hs-table/src/child.vue

@@ -109,9 +109,9 @@
               ></i>
               <childItem
                 v-else
-                :fromWhere='fromWhere'
                 v-bind="$attrs"
                 v-on="$listeners"
+                :editable='editable'
                 :item='column'
                 :prop="column.prop"
                 :formParms='scope.row'
@@ -136,9 +136,9 @@
                   <childItem
                     :item='item'
                     :formParms='scope.row'
+                    :editable='editable'
                     v-bind="$attrs"
                     v-on="$listeners"
-                    :fromWhere='fromWhere'
                   >
                   </childItem>
                 </template>
@@ -185,7 +185,7 @@ export default {
     getSourceData: {
       type: Function
     },
-    fromWhere: {
+    editable: {
       default: 'list'
     },
     // 数据
@@ -444,7 +444,7 @@ export default {
           ? disabledLogicOperation
           : false
       const type = typeof disabled
-      const innerStatus = this.disabled && this.fromWhere === 'hdrDtl'
+      const innerStatus = this.disabled && this.editable
       const data = { row, item }
       if (disabledLevel === 1) {
         if (type === 'boolean' || type === 'undefined') {
@@ -462,8 +462,7 @@ export default {
     },
     getBindEntity() {
       const bindEntity = this.tableConfig.bindEntity
-      if (bindEntity) return bindEntity
-      if (this.fromWhere === 'hdrDtl') return 'dtl'
+      return bindEntity || 'dtl'
     },
     clickToolLabel(item) {
       const { click } = item