vue2-client 1.9.167 → 1.9.168

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "vue2-client",
-  "version": "1.9.167",
+  "version": "1.9.168",
   "private": false,
   "scripts": {
     "serve": "SET NODE_OPTIONS=--openssl-legacy-provider && vue-cli-service serve --no-eslint",

package/src/base-client/components/common/XFormTable/XFormTable.vue

@@ -610,8 +610,8 @@ export default {
      * @param actionType 操作类型
      * @param fun 向上级传递的事件
      */
-    action (record, id, actionType, fun = 'action') {
-      this.$emit(fun, record, id, actionType)
+    action (record, id, actionType, fun = 'action', index) {
+      this.$emit(fun, record, id, actionType, index)
     },
     treeOnChecked (checkedKeys, deepNodes, deepKeys) {
       this.$emit('treeOnChecked', checkedKeys, deepNodes, deepKeys)

package/src/base-client/components/common/XFormTable/demo.vue

@@ -25,7 +25,7 @@ export default {
   data () {
     return {
       // 查询配置文件名
-      queryParamsName: 'outpatientRegistrationCRUD',
+      queryParamsName: 'routineButtonCRUD',
       // 查询配置左侧tree
       // xTreeConfigName: 'addressType',
       // 新增表单固定值

package/src/base-client/components/common/XTable/XTable.vue

@@ -247,7 +247,7 @@
               </a-dropdown>
             </template>
             <template v-if="!item.actionArr || item.actionArr.length === 0">
-              <a @click="action(record, item.dataIndex)">{{ item.slotValue }}</a>
+              <a @click="action(record, item.dataIndex,'action', index)">{{ item.slotValue }}</a>
             </template>
           </span>
         </template>
@@ -579,7 +579,17 @@ export default {
       this.$emit('gotoUserDetail', key, value, record)
     },
     getFromItem (model, text, record, index) {
-      const aa = this.formItems.find(item => item.model === model && item.editRow)
+      const aa = this.formItems.reduce((acc, item) => {
+        if (item.type === 'group') {
+          const foundItem = item.groupItems.find(_item => _item.model === model && _item.editRow)
+          if (foundItem) {
+            acc = foundItem
+          }
+        } else if (item.model === model && item.editRow) {
+          acc = item
+        }
+        return acc
+      }, null)
       if (aa) {
         const tempConfig = JSON.parse(JSON.stringify(aa))
         // 如果找到了字段
@@ -894,9 +904,10 @@ export default {
      * @param record 本条数据
      * @param actionType 操作类型
      * @param func 事件默认 action
+     * @param index 行下标
      */
-    action (record, actionType, func = 'action') {
-      this.$emit('action', record, record[this.getPrimaryKeyName()], actionType, func)
+    action (record, actionType, func = 'action', index) {
+      this.$emit('action', record, record[this.getPrimaryKeyName()], actionType, func, index)
     },
     // 看板点击事件
     handleCardEmit (data, eventName) {