From fee7b73ffeaa71473b2d26fa25f29dad52dde625 Mon Sep 17 00:00:00 2001
From: Zongjun Lan <jasonlan@lucasgc.com>
Date: Fri, 25 Feb 2022 16:17:04 +0800
Subject: [PATCH 1/2] * fix task 49380

---
 .../workflowdatasource/ext/view/create.flow.html.hook.php     | 2 ++
 .../lite/workflowrule/ext/view/create.flow.html.hook.php      | 4 ++++
 2 files changed, 6 insertions(+)
 create mode 100644 extension/lite/workflowrule/ext/view/create.flow.html.hook.php

diff --git a/extension/lite/workflowdatasource/ext/view/create.flow.html.hook.php b/extension/lite/workflowdatasource/ext/view/create.flow.html.hook.php
index f4446f4d84..55d057a936 100644
--- a/extension/lite/workflowdatasource/ext/view/create.flow.html.hook.php
+++ b/extension/lite/workflowdatasource/ext/view/create.flow.html.hook.php
@@ -1,4 +1,6 @@
 <script>
 $('#submit').after('<input type="hidden" id="vision" name="vision" value="<?php echo $this->config->vision;?>">');
+$("#name").parent().addClass('required');
+$("#datasource").addClass('required');
 </script>
 <?php include $this->app->getExtensionRoot() . 'biz/workflowdatasource/ext/view/' . basename(__FILE__);?>
diff --git a/extension/lite/workflowrule/ext/view/create.flow.html.hook.php b/extension/lite/workflowrule/ext/view/create.flow.html.hook.php
new file mode 100644
index 0000000000..87f4a20cbc
--- /dev/null
+++ b/extension/lite/workflowrule/ext/view/create.flow.html.hook.php
@@ -0,0 +1,4 @@
+<script>
+$("#name").parent().addClass('required');
+$("#rule").parent().addClass('required');
+</script>
\ No newline at end of file

From 5ff5699d915bc679d05dfa66db480fdca1abe18a Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E5=AD=99=E5=B9=BF=E6=98=8E?= <sunguangming@cnezsoft.com>
Date: Fri, 25 Feb 2022 17:11:58 +0800
Subject: [PATCH 2/2] * Fix bug.

---
 framework/base/router.class.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/framework/base/router.class.php b/framework/base/router.class.php
index a42728c9e1..b057e50c31 100644
--- a/framework/base/router.class.php
+++ b/framework/base/router.class.php
@@ -1657,7 +1657,7 @@ class baseRouter
         /* 开始拼装代码。Prepare the codes. */
         $modelLines  = "<?php\n";
         $modelLines .= "global \$app;\n";
-        $modelLines .= "helper::import(\$app->getModulePath('', '$moduleName')" . "model.php');\n"; 
+        $modelLines .= "helper::import(\$app->getModulePath('', '$moduleName') . " . "'model.php');\n";
         $modelLines .= "class $tmpModelClass extends $modelClass \n{\n";
 
         /* 将扩展文件的代码合并到代码中。Cycle all the extension files and merge them into model lines. */