eztech-core-components 1.0.45 → 1.0.46

package/comps/CardList.vue

@@ -8,7 +8,7 @@
     </div>
     <card-item
       v-for="item in list"
-      :key="item[pk_field_name]"
+      :key="item._id"
       :item="item"
       :name-field="nameField"
       :note-field="noteField"
@@ -30,10 +30,6 @@ export default {
       type: Array,
       default: () => { return [] }
     },
-    pk_field_name: {
-      type: String,
-      default: '_id'
-    },
     loading: {
       type: Boolean,
       default: false

package/comps/CoreAutocomplete.vue

@@ -17,7 +17,6 @@ export default {
     value: { type: [String], default: null },
     table_name: { type: String, default: null },
     ref_column: { type: String, default: null },
-    pk_field_name: { type: String, default: '_id' },
     projectId: { type: [String, Number], default: '5' },
     disabled: { type: Boolean, default: false },
     size: { type: String, default: null },

package/comps/CoreForm.vue

@@ -93,7 +93,6 @@
           :project-id="projectId"
           :root-api-id="rootApiId"
           :root-temp-id="rootTempId"
-          :pk_field_name="pk_field_name"
           :default-size="defaultSize"
           :temp="temp"
           :group="group"
@@ -177,7 +176,6 @@
                     :ref="`REF_GROUP_${group.name}`"
                     :table="table"
                     :project-id="projectId"
-                    :pk_field_name="pk_field_name"
                     :default-size="defaultSize"
                     :root-api-id="rootApiId"
                     :root-temp-id="rootTempId || tempId || temp?._id"
@@ -266,7 +264,6 @@ export default {
     rules: { type: Object, default: () => { return {} } },
     labelWidth: { type: String, default: '140px' },
     formLabelPosition: { type: String, default: null },
-    pk_field_name: { type: String, default: '_id' },
     showPkid: { type: Boolean, default: false },
     projectId: { type: String, default: null },
     fullWidth: { type: Boolean, default: false },
@@ -322,7 +319,7 @@ export default {
       return this.table?.form_label_position || 'left'
     },
     visibleLog () {
-      return !this.hideLog && this.temp && this.temp[this.pk_field_name]
+      return !this.hideLog && this.temp && this.temp._id
     },
     groupTitles () {
       const list = []

package/comps/CoreFormDialog.vue

@@ -4,7 +4,7 @@
       v-loading="loadingForm"
       v-el-drag-dialog
       :visible.sync="visible"
-      :title="title || (temp && !temp[pk_field_name] ? (buttons.textCreate || 'Бүртгэх') : (buttons.textEdit || 'Харах'))"
+      :title="title || (temp && !temp._id ? (buttons.textCreate || 'Бүртгэх') : (buttons.textEdit || 'Харах'))"
       :width="width"
       :append-to-body="appendToBody"
       :close-on-click-modal="false"
@@ -83,7 +83,6 @@ export default {
     saving: { type: Boolean, default: false },
     restoringPassword: { type: Boolean, default: false },
     width: { type: String, default: '700px' },
-    pk_field_name: { type: String, default: '_id' },
     loadingForm: { type: Boolean, default: false },
     readOnly: { type: Boolean, default: false },
     sizeButton: { type: String, default: null },
@@ -95,10 +94,10 @@ export default {
   },
   computed: {
     isCreate () {
-      return this.temp && !this.temp[this.pk_field_name]
+      return this.temp && !this.temp._id
     },
     isEdit () {
-      return this.temp && this.temp[this.pk_field_name]
+      return this.temp && this.temp._id
     },
     visible: {
       get () {

package/comps/CoreFormFields.vue

@@ -169,7 +169,6 @@
                   :temp="temp"
                   :project-id="projectId"
                   :root-temp-id="rootTempId"
-                  :pk_field_name="pk_field_name"
                   :default-size="defaultSize"
                   :loading="searching"
                   :disabled="checkDisabledColumn(col)"
@@ -189,7 +188,7 @@
         >
       </div>
     </div>
-    <custom-table-logs v-if="isShow && group.name === 'LOG' && table?._id && temp" :project_id="projectId" :table_id="table._id" :pk_id="temp[pk_field_name]" />
+    <custom-table-logs v-if="isShow && group.name === 'LOG' && table?._id && temp" :project_id="projectId" :table_id="table._id" :pk_id="temp._id" />
   </div>
 </template>
 <script>
@@ -199,7 +198,7 @@ export default {
   name: 'CoreFormFields',
   props: [
     'group', 'parentTemp', 'rootTempId', 'rootApiId',
-    'temp', 'pk_field_name', 'defaultSize', 'table',
+    'temp', 'defaultSize', 'table',
     'projectId', 'searching', 'refColumns', 'disabled',
     'isSubMenu', 'showPkid', 'level', 'isLocaleLabel',
     'noPadding', 'noPaddingAll', 'parentFormCol',
@@ -244,7 +243,7 @@ export default {
         const localVal = r.localVal
         const operation = r.operation
         let tempVal = get(this.temp, localKey)
-        if (tempVal && typeof tempVal === 'object' && has(tempVal, this.pk_field_name)) {
+        if (tempVal && typeof tempVal === 'object' && has(tempVal, '_id')) {
           tempVal = type === 'number' ? Number(tempVal._id) : tempVal._id
         }
         if (operation === 'ne' && localVal !== tempVal) {

package/comps/CoreFormItem.vue

@@ -4,7 +4,6 @@
     ref="refComponent"
     v-bind="componentProps"
     v-model="modelValue"
-    :pk_field_name="pk_field_name"
     :size="defaultSize"
     :loading="loading"
     :project-id="projectId"
@@ -28,7 +27,6 @@ export default {
     temp: { type: Object, default: () => { return null } },
     projectId: { type: String, default: null },
     rootTempId: { type: String, default: null },
-    pk_field_name: { type: String, default: '_id' },
     loading: { type: Boolean, default: false },
     defaultSize: { type: String, default: null },
     disabled: { type: Boolean, default: null },

package/comps/CoreFormItemCopy.vue

@@ -122,7 +122,6 @@ export default {
     col: { type: Object, default: () => { return null } },
     temp: { type: Object, default: () => { return null } },
     projectId: { type: String, default: null },
-    pk_field_name: { type: String, default: '_id' },
     searching: { type: Boolean, default: false },
     defaultSize: { type: String, default: null }
   },

package/comps/CoreFormSub.vue

@@ -6,7 +6,6 @@
       :columns="columns"
       :rules="rules"
       :table="table"
-      :pk_field_name="project.pk_field_name"
       :show-pkid="showPkid"
       :has-password="hasPassword"
       :project-id="project._id"

package/comps/CoreFormTable.vue

@@ -12,7 +12,6 @@
       :current-page="currentPage"
       :list-page="listPage"
       :search="search"
-      :pk_field_name="project.pk_field_name"
       :sub-column="subColumn"
       :current-row-id="id"
       :loading-excel="loadingExcel"
@@ -52,7 +51,6 @@
     <core-form-dialog
       :temp="temp"
       :saving="saving"
-      :pk_field_name="project.pk_field_name"
       :has-password="hasPassword"
       :loading-form="loadingForm"
       default-size="small"
@@ -72,7 +70,6 @@
         :columns="columns"
         :rules="rules"
         :table="table"
-        :pk_field_name="project.pk_field_name"
         :has-password="hasPassword"
         :project-id="project._id"
         :root-api-id="rootApiId"

package/comps/CoreFormTableInline.vue

@@ -34,7 +34,6 @@
                   :parent-temp="parentTemp"
                   :temp="scope.row"
                   :project-id="projectId"
-                  :pk_field_name="pk_field_name"
                   default-size="small"
                   :disabled="disabled || col.disabled || col.form?.col_readonly || !buttons.textEdit || readOnly"
                   @temp-change="($event) => handleChangeRow(scope.$index, col, $event)"
@@ -182,8 +181,8 @@ export default {
         for (const key in obj) {
           if (typeof obj[key] === 'object' && Array.isArray(obj[key])) {
             newObj[key] = obj[key].map(c => getObj(c))
-          } else if (typeof obj[key] === 'object' && has(obj[key], this.pk_field_name)) {
-            newObj[key] = obj[key][this.pk_field_name]
+          } else if (typeof obj[key] === 'object' && has(obj[key], '_id')) {
+            newObj[key] = obj[key]._id
           } else {
             newObj[key] = obj[key]
           }

package/comps/CoreFormTableList.vue

@@ -43,7 +43,6 @@
                   :parent-temp="parentTemp || scope.row"
                   :temp="scope.row"
                   :project-id="projectId"
-                  :pk_field_name="pk_field_name"
                   default-size="small"
                   :disabled="disabled || col.disabled || col.form?.col_readonly || ['duration_days', 'duration_total'].includes(col.col_field)"
                   @temp-change="($event) => handleChangeRow(scope.$index, col, $event)"
@@ -158,8 +157,8 @@ export default {
         for (const key in obj) {
           if (typeof obj[key] === 'object' && Array.isArray(obj[key])) {
             newObj[key] = obj[key].map(c => getObj(c))
-          } else if (typeof obj[key] === 'object' && has(obj[key], this.pk_field_name)) {
-            newObj[key] = obj[key][this.pk_field_name]
+          } else if (typeof obj[key] === 'object' && has(obj[key], '_id')) {
+            newObj[key] = obj[key]._id
           } else {
             newObj[key] = obj[key]
           }

package/comps/CoreInputNumber.vue

@@ -8,7 +8,6 @@
     :controls-position="controlsPosition"
     :precision="precision"
     :size="size"
-    :pk_field_name="pk_field_name"
     :disabled="disabled"
     @change="$emit('change', $event)"
     @keydown.native.enter="$emit('keydown-enter', $event)"
@@ -26,7 +25,6 @@ export default {
     controlsPosition: { type: String, default: 'right' },
     precision: { type: Number, default: null },
     size: { type: String, default: null },
-    pk_field_name: { type: String, default: '_id' }
   },
   computed: {
     modelValue: {

package/comps/CoreSelect.vue

@@ -11,7 +11,7 @@
     :remote-method="handleDebounce"
     :multiple="isMultiple"
     :size="size"
-    :value-key="pk_field_name"
+    value-key="_id"
     :placeholder="placeholder"
     @clear="handleClear"
     @visible-change="handleVisibleChange"
@@ -20,7 +20,7 @@
   >
     <el-option
       v-for="item of list"
-      :key="item[pk_field_name]"
+      :key="item._id"
       :label="get(item, columnName)"
       :value="item"
       :style="{ color: columnName1 && columnName1.toLowerCase().includes('color') ? item[columnName1] : null }"
@@ -47,7 +47,6 @@ export default {
     value: { type: [String, Array, Number, Object], default: null },
     table_name: { type: String, default: null },
     ref_column: { type: String, default: null },
-    pk_field_name: { type: String, default: '_id' },
     projectId: { type: [String, Number], default: null },
     col_multiple: { type: [Boolean, Number, String], default: false },
     trigger_fields: { type: String, default: '' },
@@ -109,7 +108,7 @@ export default {
           }
           return this.value.split(',')
         } else {
-          return this.value && this.value[this.pk_field_name] ? this.value : null
+          return this.value && this.value._id ? this.value : null
         }
       },
       set (val) {
@@ -134,10 +133,10 @@ export default {
             let newValue = get(newVal, tempKey)
             let oldValue = get(oldVal, tempKey)
             if (newValue && typeof newValue === 'object') {
-              newValue = newValue[this.pk_field_name]
+              newValue = newValue._id
             }
             if (oldValue && typeof oldValue === 'object') {
-              oldValue = oldValue[this.pk_field_name]
+              oldValue = oldValue._id
             }
             if (!isEqual(newValue, oldValue)) {
               if (oldValue) {
@@ -174,10 +173,10 @@ export default {
       if (this.isMultiple) {
         vals = this.value ? [...this.value] : []
       } else if (typeof this.value === 'object') {
-        vals = this.value && this.value[this.pk_field_name] ? [this.value] : []
+        vals = this.value && this.value._id ? [this.value] : []
       }
       for (const val of vals) {
-        if (!this.list.some(c => c[this.pk_field_name] === val[this.pk_field_name])) {
+        if (!this.list.some(c => c._id === val._id)) {
           this.list.unshift(val)
         }
       }
@@ -207,7 +206,7 @@ export default {
               const vals = newValue.map(c => c._id)
               triggerSearch[localKey] = { val: vals, t: type, op: operation }
             } else if (newValue) {
-              const val = typeof newValue === 'object' ? newValue[this.pk_field_name] : newValue
+              const val = typeof newValue === 'object' ? newValue._id : newValue
               if (localKey === 'reg_type_id' && this.table_name === 'ref_reg_sub_types' && this.isSearch && val === '5') {
                 triggerSearch[localKey] = { val: '7,8,9,10,5', t: type, op: 'in' }
               } else {
@@ -226,9 +225,9 @@ export default {
             locale_id: this.parentTemp?.locale_id
           }
         })
-        const list = this.value ? (this.isMultiple ? [...this.value] : (this.value[this.pk_field_name] ? [this.value] : [])) : []
+        const list = this.value ? (this.isMultiple ? [...this.value] : (this.value._id ? [this.value] : [])) : []
         for (const r of data.list) {
-          const index = list.findIndex(c => c[this.pk_field_name] === r[this.pk_field_name])
+          const index = list.findIndex(c => c._id === r._id)
           if (index > -1) {
             list.splice(index, 1)
           }

package/comps/CoreSelectGroupList.vue

@@ -330,7 +330,7 @@ export default {
             const vals = newValue.map(c => c._id)
             triggerSearch[localKey] = { val: vals, t: type, op: operation }
           } else {
-            const val = typeof newValue === 'object' ? newValue[this.pk_field_name] : newValue
+            const val = typeof newValue === 'object' ? newValue._id : newValue
             triggerSearch[localKey] = { val, t: type, op: operation }
           }
         } else {

package/comps/CoreSelectOrgEmp.vue

@@ -62,7 +62,6 @@
       :temp="temp"
       :saving="saving"
       :restoring-password="restoringPassword"
-      :pk_field_name="project.pk_field_name"
       :has-password="hasPassword"
       :default-size="defaultSize"
       :size-button="defaultSize"
@@ -81,7 +80,6 @@
         :rules="rules"
         :table="table"
         :loading-form="loadingForm"
-        :pk_field_name="project.pk_field_name"
         :project-id="project._id"
         :has-password="hasPassword"
         :default-size="defaultSize"

package/comps/CoreSelectTable.vue

@@ -17,7 +17,6 @@
           :current-page="currentPage"
           :list-page="listPage"
           :search="search"
-          :pk_field_name="project.pk_field_name"
           :current-row-id="id"
           :init-current-row="currentRow"
           :loading-excel="loadingExcel"
@@ -61,7 +60,6 @@
       :temp="temp"
       :saving="saving"
       :restoring-password="restoringPassword"
-      :pk_field_name="project.pk_field_name"
       :has-password="hasPassword"
       :default-size="defaultSize"
       :size-button="defaultSize"
@@ -80,7 +78,6 @@
         :rules="rules"
         :table="table"
         :loading-form="loadingForm"
-        :pk_field_name="project.pk_field_name"
         :project-id="project._id"
         :has-password="hasPassword"
         :default-size="defaultSize"
@@ -228,7 +225,7 @@ export default {
             const vals = newValue.map(c => c._id)
             triggerSearch[localKey] = { val: vals, t: type, op: operation }
           } else {
-            const val = typeof newValue === 'object' ? newValue[this.pk_field_name] : newValue
+            const val = typeof newValue === 'object' ? newValue._id : newValue
             triggerSearch[localKey] = { val, t: type, op: operation }
           }
         } else {

package/comps/CoreTable.vue

@@ -224,7 +224,7 @@
             <div
               v-else
               :class="['size-5 rounded-full border bg-white cursor-pointer', {
-                '!border-coreBlue border-[6px]': currentRow && scope.row[pk_field_name] === currentRow[pk_field_name]
+                '!border-coreBlue border-[6px]': currentRow && scope.row._id === currentRow._id
               }]"
             />
           </div>
@@ -247,7 +247,7 @@
       <el-table-column v-if="selectedList" width="35" label="#">
         <template slot-scope="scope">
           <div @click.prevent="$emit('selection-change', scope.row)">
-            <el-checkbox :value="selectedList.some(c => c[pk_field_name] === scope.row[pk_field_name])" />
+            <el-checkbox :value="selectedList.some(c => c._id === scope.row._id)" />
           </div>
         </template>
       </el-table-column>
@@ -367,7 +367,6 @@
       <card-list
         :list="list"
         :columns="columns"
-        :pk_field_name="pk_field_name"
         :loading="loading"
         @update="$emit('update', $event)"
         @delete="$emit('delete', $event)"
@@ -471,7 +470,6 @@ export default {
     api_id: { type: [String, Number], default: null },
     api_title: { type: [String, Number], default: null },
     hasHandbook: { type: Boolean, default: false },
-    pk_field_name: { type: String, default: '_id' },
     fill_field: { type: String, default: '' },
     showPkid: { type: Boolean, default: false },
     loading: { type: Boolean, default: false },
@@ -822,9 +820,9 @@ export default {
       const { row } = props
       let classNames = ''
       if (this.multiple) {
-        classNames = [this.currentRows.some(c => c[this.pk_field_name] === row[this.pk_field_name]) ? 'current-row' : '']
+        classNames = [this.currentRows.some(c => c._id === row._id) ? 'current-row' : '']
       } else {
-        classNames = [this.currentRow && row[this.pk_field_name] === this.currentRow[this.pk_field_name] ? 'current-row' : '']
+        classNames = [this.currentRow && row._id === this.currentRow._id ? 'current-row' : '']
       }
       const dangerDay = 0
       const warningDay = 2

package/comps/CoreTableColumnRow.vue

@@ -4,7 +4,6 @@
       :col="col"
       :temp="scope.row"
       project-id="5"
-      pk_field_name="_id"
       default-size="small"
       com-type="inline"
       @temp-change="modelValue = $event"

package/comps/Custom/EmployeeSelect.vue

@@ -215,7 +215,7 @@ export default {
             const vals = newValue.map(c => c._id)
             triggerSearch[localKey] = { val: vals, t: type, op: operation }
           } else {
-            const val = typeof newValue === 'object' ? newValue[this.pk_field_name] : newValue
+            const val = typeof newValue === 'object' ? newValue._id : newValue
             triggerSearch[localKey] = { val, t: type, op: operation }
           }
         } else {

package/comps/Custom/UserSelect.vue

@@ -147,8 +147,7 @@ export default {
       type: [Boolean, Number, String],
       default: false
     },
-    trigger_fields: { type: String, default: null },
-    pk_field_name: { type: String, default: null }
+    trigger_fields: { type: String, default: null }
   },
   data () {
     return {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "eztech-core-components",
-  "version": "1.0.45",
+  "version": "1.0.46",
   "publishConfig": {
     "access": "public"
   },

package/utils/table-helper.js

@@ -40,9 +40,6 @@ export const tableComputed = {
   localeId () {
     return this.tempLocaleId || this.locale?._id || (this.locales?.length ? this.locales[0]._id : null)
   },
-  pk_field_name () {
-    return this.project ? this.project.pk_field_name : '_id'
-  },
   url () {
     return this.customUrl || `${this.subUrl || ''}${this.projectId}/${this.tableName}`
   },
@@ -399,7 +396,7 @@ export const tableMethods = {
     this.selectedList = []
   },
   handleSelectionChange (row) {
-    const index = this.selectedList.findIndex(c => c[this.pk_field_name] === row[this.pk_field_name])
+    const index = this.selectedList.findIndex(c => c._id === row._id)
     if (index > -1) {
       this.selectedList.splice(index, 1)
     } else {
@@ -591,7 +588,7 @@ export const tableMethods = {
   setParentVal (obj) {
     if (this.subColumn && obj) {
       if (this.inlineParentTemp) {
-        obj[this.subColumn.col_field] = cloneDeep(this.inlineParentTemp) // ? this.parentRow[this.pk_field_name] : null
+        obj[this.subColumn.col_field] = cloneDeep(this.inlineParentTemp)
       } else {
         obj[this.subColumn.col_field] = cloneDeep(this.parentRow)
       }
@@ -685,7 +682,7 @@ export const tableMethods = {
           this.$nuxt.error({ statusCode: 402 })
         }
         const temp = {
-          [this.pk_field_name]: data[this.pk_field_name],
+          _id: data._id,
           work_families: data.work_families,
           employee_history_text: data.employee_history_text,
           employee_degree_text: data.employee_degree_text,
@@ -717,7 +714,7 @@ export const tableMethods = {
           this.resetedTemp()
         }
       } else if (this.isFormSub) {
-        this.search[this.subColumn.col_field] = { val: this.parentRow ? this.parentRow[this.pk_field_name] : 'null', t: 'number', op: 'eq' }
+        this.search[this.subColumn.col_field] = { val: this.parentRow ? this.parentRow._id : 'null', t: 'number', op: 'eq' }
         const trigger_fields = getTriggerFields(this.subColumn.trigger_fields)
         for (const { localKey, localVal, type, operation } of trigger_fields) {
           if (localVal.includes('#')) {
@@ -740,7 +737,7 @@ export const tableMethods = {
           // this.$nuxt.error({ statusCode: 402 })
         }
         const temp = {
-          [this.pk_field_name]: data[this.pk_field_name],
+          _id: data._id,
           work_families: data.work_families,
           employee_history_text: data.employee_history_text,
           employee_degree_text: data.employee_degree_text,
@@ -761,8 +758,8 @@ export const tableMethods = {
         if (this.isXypLog) {
           temp.xyp_log_id = data.xyp_log_id ?? null
         }
-        if (this.parentRow && has(this.parentRow, this.pk_field_name)) {
-          temp[this.subColumn.col_field] = this.parentRow[this.pk_field_name]
+        if (this.parentRow && has(this.parentRow, '_id')) {
+          temp[this.subColumn.col_field] = this.parentRow._id
         }
         this.temp = Object.assign({}, this.defaultTemp, temp)
         if (this.resetedTemp) {
@@ -794,14 +791,14 @@ export const tableMethods = {
     this.updateGroupName = updateGroupName
     this.tid = row.tid
     setTimeout(() => {
-      this.id = row[this.pk_field_name]
+      this.id = row._id
     }, 100)
   },
   handleCurrentRowChange (row) {
     if (Array.isArray(row)) {
       this.currentRows = row
     } else {
-      this.currentRowId = row[this.pk_field_name]
+      this.currentRowId = row._id
       this.currentRow = row
     }
   },
@@ -972,7 +969,7 @@ export const tableMethods = {
       if (this.locales?.length && data.locale_id !== this.localeId) {
         // console.log('Хэлний сонголтын тоог нэмнэ.')
       } else if (has(this.data, 'list')) {
-        const index = this.data.list.findIndex(c => c[this.pk_field_name] === data[this.pk_field_name])
+        const index = this.data.list.findIndex(c => c._id === data._id)
         if (index > -1) {
           this.list.splice(index, 1, data)
         } else {
@@ -982,7 +979,6 @@ export const tableMethods = {
         this.data.list.sort(this.handleListSort)
       }
       this.set_unsaved_changes(false)
-      // this.currentRowId = data[this.pk_field_name]
       if (this.handleSaved) {
         this.handleSaved(data)
       } else {
@@ -1002,7 +998,7 @@ export const tableMethods = {
   handleListSort (a, b) {
     const getOrder = (ind = 0) => {
       if ((this.sorts?.length || 0) <= ind) {
-        return Number(get(a, this.pk_field_name)) - Number(get(b, this.pk_field_name))
+        return Number(get(a, '_id')) - Number(get(b, '_id'))
       }
       const sort = this.sorts[ind]
       let aVal = get(a, sort.prop)
@@ -1036,7 +1032,7 @@ export const tableMethods = {
           ref_column: 'name'
         })
         this.loading = true
-        await this.$axios.delete(`${this.urlDelete || this.url}/${row[this.pk_field_name]}`, {
+        await this.$axios.delete(`${this.urlDelete || this.url}/${row._id}`, {
           data: { ...data, tid: row.tid }
         })
       } else {
@@ -1045,11 +1041,11 @@ export const tableMethods = {
           inputErrorMessage: '300 тэмдэгтээс хэтрэхгүй тэмдэгт бичнэ үү.'
         })
         this.loading = true
-        await this.$axios.delete(`${this.urlDelete || this.url}/${row[this.pk_field_name]}`, {
+        await this.$axios.delete(`${this.urlDelete || this.url}/${row._id}`, {
           data: { description: result.value, tid: row.tid }
         })
       }
-      const index = this.list.findIndex(c => c[this.pk_field_name] === row[this.pk_field_name])
+      const index = this.list.findIndex(c => c._id === row._id)
       if (index > -1) {
         this.count--
         this.list.splice(index, 1)
@@ -1074,7 +1070,7 @@ export const tableMethods = {
         await this.beforeGetList()
       }
       if (this.subColumn) {
-        this.search[this.subColumn.col_field] = { val: this.parentRow[this.pk_field_name], t: 'number', op: 'eq' }
+        this.search[this.subColumn.col_field] = { val: this.parentRow._id, t: 'number', op: 'eq' }
         const trigger_fields = getTriggerFields(this.subColumn.trigger_fields)
         for (const { localKey, localVal, type, operation } of trigger_fields) {
           if (localVal.includes('#')) {
@@ -1134,7 +1130,7 @@ export const tableMethods = {
         this.count = 0
         return
       }
-      this.search[this.subColumn.col_field] = { val: this.parentRow ? this.parentRow[this.pk_field_name] : 'null', t: 'number', op: 'eq' }
+      this.search[this.subColumn.col_field] = { val: this.parentRow ? this.parentRow._id : 'null', t: 'number', op: 'eq' }
       const trigger_fields = getTriggerFields(this.subColumn.trigger_fields)
       for (const { localKey, localVal, type, operation } of trigger_fields) {
         if (localVal.includes('#')) {