Commit 70dc62cf authored by baoliang's avatar baoliang
Browse files

Merge remote-tracking branch 'upstream/branch-1.0.2' into 102

parents 453b4d1f 3ebc9131

escheduler-server/src/main/java/cn/escheduler/server/worker/task/sql/SqlTask.java

+6 −0
Original line number Diff line number Diff line
@@ -189,6 +189,12 @@ public class SqlTask extends AbstractTask { 
            return new SqlBinds(sqlBuilder.toString(), sqlParamsMap);

        }



        if (StringUtils.isNotEmpty(sqlParameters.getTitle())){

            String title = ParameterUtils.convertParameterPlaceholders(sqlParameters.getTitle(), ParamUtils.convert(paramsMap));

            logger.info(title);

            sqlParameters.setTitle(title);

        }



        // special characters need to be escaped, ${} needs to be escaped

        String rgex = "'?\\$\\{(.*?)\\}'?";

        setSqlParamsMap(sql,rgex,sqlParamsMap,paramsMap);

escheduler-ui/src/js/conf/home/pages/projects/pages/index/_source/processStateCount.vue

+1 −1
Original line number Diff line number Diff line
@@ -15,7 +15,7 @@ 
              </tr>

              <tr v-for="(item,$index) in processStateList">

                <td><span>{{$index+1}}</span></td>

                <td><span><a href="javascript:" @click="id && _goProcess(item.key)" :class="id ?'links':''">{{item.value}}</a></span></td>

                <td><span><a href="javascript:" @click="searchParams.projectId && _goProcess(item.key)" :class="searchParams.projectId ?'links':''">{{item.value}}</a></span></td>

                <td><span class="ellipsis" style="width: 98%;" :title="item.key">{{item.key}}</span></td>

              </tr>

            </table>

escheduler-ui/src/js/conf/home/pages/projects/pages/index/_source/taskCtatusCount.vue

+3 −3
Original line number Diff line number Diff line
@@ -17,7 +17,7 @@ 
                <td><span>{{$index+1}}</span></td>

                <td>

                  <span>

                          <a href="javascript:" @click="id && _goTask(item.key)" :class="id ?'links':''">{{item.value}}</a>

                    <a href="javascript:" @click="searchParams.projectId && _goTask(item.key)" :class="searchParams.projectId ?'links':''">{{item.value}}</a>

                  </span>

                </td>

                <td><span class="ellipsis" style="width: 98%;" :title="item.key">{{item.key}}</span></td>