修改一些页面描述

src/main/resources/webpage/admin/v1/include.html

@@ -55,7 +55,7 @@
         <dl class="layui-nav-child">
           <dd>
             <a th:href="@{/admin/v1/manage/requestInfo}"> <i
-              class="fas fa-fw fa-envelope-open-text"></i> 请求配置
+              class="fas fa-fw fa-envelope-open-text"></i> 鉴权配置
             </a>
           </dd>
           <dd>

src/main/resources/webpage/admin/v1/manage/plan/editCommon.html

@@ -13,6 +13,7 @@
     <div class="layui-form" style="margin:0 15px;padding: 10px 0" id="editPlanForm" lay-filter="editPlanForm">
       <div class="layui-form-item">
         <input type="hidden" name="planId" th:value="${plan.planId}"/>
+        <input type="hidden" name="initPlanType" th:value="${planType}">
         <label class="layui-form-label">计划名称<span>*</span></label>
         <div class="layui-input-block">
           <input type="text" 
@@ -39,10 +40,7 @@
       <div class="layui-form-item">
         <label class="layui-form-label">更新类型<span>*</span></label>
         <div class="layui-input-block">
-          <input type="radio" name="planType" value="SINGLE_INDEX" lay-filter="planTypeRadio" title="单指标" th:checked="${planType == 'SINGLE_INDEX'}">
+          <div id="demo2" class="xm-select-demo"></div>
-          <input type="radio" name="planType" value="MULTI_INDEX" lay-filter="planTypeRadio" title="多指标" th:checked="${planType == 'MULTI_INDEX'}">
-          <input type="radio" name="planType" value="STOCK_STRATEGY" lay-filter="planTypeRadio" title="个股策略" th:checked="${planType == 'STOCK_STRATEGY'}">
-          <input type="radio" name="planType" value="STOCK_PICKING" lay-filter="planTypeRadio" title="策略选股" th:checked="${planType == 'STOCK_PICKING'}">
         </div>
       </div>
       <div id="planSettings">
@@ -105,19 +103,34 @@
         cssPath: '/admin/v1/static/css/cron.css'
       });
       
-      // 绑定 radio 切换更新类型选择
+      // 渲染更新类型选择
-      layui.form.on('radio(planTypeRadio)', function (obj) {
+      var demo2 = xmSelect.render({
-        const planType = obj.value;
+        el: '#demo2', 
+        filterable: true,
+        height: '500px',
+        radio: true,
+        layVerify: 'required',
+        initValue: [document.querySelector('[name="initPlanType"]').value],
+        data: [
+          {name: '辅助数据类', children: [
+            {name: '益盟单指标', value: 'SINGLE_INDEX', page:'editSingleIndex'},
+            {name: '益盟多指标', value: 'MULTI_INDEX', page: 'editMultiIndex'},
+            {name: '益盟个股策略', value: 'STOCK_STRATEGY', page: 'editStockStrategy'},
+          ]},
+          {name: '股票池类', children: [
+            {name: 'Tushare 股票池', value: 4, disabled: true},
+            {name: '益盟策略选股', value: 'STOCK_PICKING', disabled: true},
+            {name: '同花顺条件选股', value: 6, disabled: true},
+          ]},
+        ],
+        on: function (data) {
+          // 更新类型变化时切换页面
+          console.log(data);
+          const selected = data.arr[0];
           const planId = document.querySelector('[name="planId"]').value;
-        let url = '/admin/v1/manage/plan/edit';
+          let url = '/admin/v1/manage/plan/';
-        if (planType == 'SINGLE_INDEX') {
+          if (selected.page) {
-          url += 'SingleIndex';
+            url += selected.page;
-        }
-        else if (planType == 'MULTI_INDEX') {
-          url += 'MultiIndex';
-        }
-        else if (planType == 'STOCK_STRATEGY') {
-          url += 'StockStrategy'
           }
           else {
             Dog.error({msg: '未知的计划任务类型'});
@@ -127,6 +140,7 @@
             url += '?planId=' + planId;
           }
           location.href = url;
+        }
       });
     });
     
@@ -185,12 +199,15 @@
         success: function (r) {
           Dog.success({
             onClose: function () {
+              // 非单页调试, 作为计划任务列表界面的 iframe,
+              // 则刷新列表并关闭弹窗
               if (window != top) {
                 top.Dog.reloadTable('plans');
                 if (top.editLayer) {
                   top.layui.layer.close(top.editLayer);
                 }
               }
+              // 单页调试, 直接重载页面
               else {
                 location.reload()
               }

src/main/resources/webpage/admin/v1/manage/plan/editSingleIndex.html

@@ -10,7 +10,7 @@
       <label class="layui-form-label">更新指标<span>*</span></label>
       <div class="layui-input-block">
         <div class="layui-inline">
-          <select name="indexCode" lay-filter="indexCodeFilter" lay-search>
+          <select name="indexCode" lay-filter="indexCodeFilter" lay-verify="required" lay-search>
             <option value="">选择更新指标</option>
           </select>
         </div>

src/main/resources/webpage/admin/v1/manage/requestInfo/include.html

@@ -132,7 +132,7 @@
       if (done && typeof done === 'function') done(r);
       if (r && r.ok) {
         window.editLayer = Helper.openR({
-          title: `${r.data.id ? '编辑' : '新增'}请求信息`,
+          title: `${r.data.id ? '编辑' : '新增'}鉴权配置`,
           btn: ['随机设备信息', '随机 Chrome 版本', r.data.id ? '编辑' : '新增'],
           btn1: () => refreshDeviceInfo() && !1,
           btn2: () => refreshChromeVersion() && !1,

src/main/resources/webpage/admin/v1/manage/requestInfo/index.html

@@ -1,6 +1,6 @@
 <!DOCTYPE html>
 <html lang="en" xmlns:th="http://www.thymeleaf.org">
-<head th:insert="~{admin/v1/include::head}" th:with="title=${'计划任务管理'}">
+<head th:insert="~{admin/v1/include::head}" th:with="title=${'鉴权配置管理'}">
 </head>
 <style>
 .layui-form-item:after {
@@ -13,10 +13,9 @@
   <div class="manage-body">
     <div>
       <h1 class="manage-title">
-        <b>请求信息管理</b><a href="javascript:openNewRequestInfoForm()"
+        <b>鉴权配置管理</b><a href="javascript:openNewRequestInfoForm()"
           class="operate">新增</a>
       </h1>
-
     </div>
     <button class="layui-btn layui-btn-sm operdown">
       <span>选中项<i