From 1f91d1d5d782397cadf4c2cef96d7f2c49a5ae70 Mon Sep 17 00:00:00 2001
From: sunguangming <sunguangming@easycorp.ltd>
Date: Wed, 16 Oct 2024 03:04:40 +0000
Subject: [PATCH]  * [bug#56035,done,0.2h] fix bug.

---
 framework/control.class.php | 5 +++--
 lib/zin/wg/formpanel/v1.php | 5 +++--
 2 files changed, 6 insertions(+), 4 deletions(-)

diff --git a/framework/control.class.php b/framework/control.class.php
index 13f99e4cde..57c3fffa66 100644
--- a/framework/control.class.php
+++ b/framework/control.class.php
@@ -610,7 +610,6 @@ class control extends baseControl
 
         $uiID = is_object($object) ? $this->loadModel('workflowlayout')->getUIByData($flow->module, $action->action, $object) : 0;
 
-        $wrapControl  = array('textarea', 'richtext', 'file');
         $fieldList    = $this->workflowaction->getPageFields($flow->module, $action->action, true, $object, $uiID, $groupID);
         $layouts      = $this->loadModel('workflowlayout')->getFields($moduleName, $methodName, $uiID, $groupID);
         $notEmptyRule = $this->loadModel('workflowrule')->getByTypeAndRule('system', 'notempty');
@@ -634,8 +633,10 @@ class control extends baseControl
                 $field->required = $field->readonly || ($notEmptyRule && strpos(",$field->rules,", ",{$notEmptyRule->id},") !== false);
                 $field->control  = $this->flow->buildFormControl($field);
                 $field->items    = $field->options ? array_filter($field->options) : null;
-                $field->value    = !empty($object) ? zget($object, $field->field, '') : '';
+                $field->value    = !empty($object->{$field->field}) ? zget($object, $field->field, '') : '';
                 $field->width    = $field->width != 'auto' ? $field->width : 'full';
+
+                if(!$field->value && $field->defaultValue) $field->value = $field->defaultValue;
             }
 
             return $fieldList;
diff --git a/lib/zin/wg/formpanel/v1.php b/lib/zin/wg/formpanel/v1.php
index 1ac6c7571d..aecc507fdf 100644
--- a/lib/zin/wg/formpanel/v1.php
+++ b/lib/zin/wg/formpanel/v1.php
@@ -77,8 +77,9 @@ class formPanel extends panel
     {
         global $app;
         $moduleName = $app->getModuleName();
-        if($moduleName == 'caselib') $moduleName = 'lib';
-        if($moduleName == 'flow') return data('data');
+        if($moduleName == 'caselib')     $moduleName = 'lib';
+        if($moduleName == 'flow')        return data('data');
+        if($moduleName == 'productplan') return data('plan');
         return data($moduleName);
     }