From 7bbcbae12e36747398a56247a29545d745abdd40 Mon Sep 17 00:00:00 2001
From: tianshujie <tianshujie0123@163.com>
Date: Mon, 14 Nov 2022 14:20:11 +0800
Subject: [PATCH] * Fixed issue with more button render icons.

---
 module/program/config.php |  2 +-
 zin/wg/dtable/v1.php      | 17 ++++-------------
 2 files changed, 5 insertions(+), 14 deletions(-)

diff --git a/module/program/config.php b/module/program/config.php
index 5f32422d76..fbc394d764 100644
--- a/module/program/config.php
+++ b/module/program/config.php
@@ -112,7 +112,7 @@ $config->program->dtable->fieldList['actions']['module'] = 'program';
 global $app;
 $app->loadLang('project');
 $config->program->actionsMap['normal']            = array('start', 'suspend', 'close', 'activate', 'edit', 'create', 'delete', 'team', 'group');
-$config->program->actionsMap['other']             = true;
+$config->program->actionsMap['other']             = array('start', 'suspend', 'close', 'activate');
 $config->program->actionsMap['more']              = array('link', 'whitelist', 'delete');
 $config->program->actionsMap['hint']['create']    = $lang->program->children;
 $config->program->actionsMap['hint']['delete']    = $lang->delete;
diff --git a/zin/wg/dtable/v1.php b/zin/wg/dtable/v1.php
index b927d4d872..f340ba0551 100644
--- a/zin/wg/dtable/v1.php
+++ b/zin/wg/dtable/v1.php
@@ -169,21 +169,12 @@ class column extends wg
             {
                 $actionsMap->$actionType = new stdclass();
                 $actionsMap->$actionType = $config->actionsMap->$actionType;
-
                 $actionsMap->$actionType->hint = $lang->more;
-
-                if($actionType == 'more')
+                foreach($actions as $action)
                 {
-                    $items = array();
-                    foreach($actions as $action)
-                    {
-                        $item = new stdclass();
-                        $item->name = $action;
-                        $item->icon = $config->actionsMap->icon->$action;
-                        if(isset($actionsList['text'][$action])) $item->text = $actionsList['text'][$action];
-                        $items[] = $item;
-                    }
-                    $actionsMap->$actionType->dropdown->items = $items;
+                    if(isset($actionsMap->$action)) continue;
+                    $actionsMap->$action = new stdclass();
+                    $actionsMap->$action->icon = $config->actionsMap->icon->$action;
                 }
             }
         }