jufubao-admin-library 1.1.6 → 1.1.8

package/.env.settings.supplier

@@ -0,0 +1,218 @@
+'use strict';
+
+const settings = {
+
+  /**
+   * @description 阿里云前端监控配置
+   */
+  aliPid: 'aa2vphu6tr@f7f6bac23dcef56',
+  aliEnvironment: 'daily', //daily测试环境 //prod线上环境
+  aliSample: 1, //1表示100%采样，10表示10%采样，100表示1%采样
+  aliPvSample: 1, //1表示100%采样，10表示10%采样，100表示1%采样
+  aliDisableHook: true, //是否禁用api上报 true=禁用 false=开启
+  aliBehavior: true,  //是否为了便于排查错误而记录报错的用户行为。
+  aliEnableSPA: false, //是否启动单页面上报pv日志
+  aliEnableConsole: false, //是否劫持Console
+  aliSendResource: true, //静态资源错误上报
+  aliAutoSendPerf: true,  //性能和api分析日志
+
+  /**
+   * @type {string}
+   * @description 项目名称
+   */
+  title: '供货商后台管理系统（测试）',
+
+  /**
+   * @type {boolean}
+   * @description 无返回结构体{code: 200, data: {}, message:'success'}，返回格式：{}
+   */
+  isOpenNoResultKey: true,
+
+  /**
+   * @type {string}
+   * @description 项目标识
+   */
+  system: 'supplier',
+
+  /**
+   * @type {string}
+   * @description 图片cdn域名地址
+   */
+  cdnBaseUrl: '//sandbox-img.jufubao.cn',
+
+  /**
+   * @type {Array}
+   * @description API白名单(不需要token，上报日志)
+   */
+  apiWhiteList: [
+    '/api/pb/host/get-brand',
+    '/api/pb/host/minfo',
+    '/api/pb/host/malert',
+  ],
+
+  /**
+   * @type {Number}
+   * @description 接口返回时间超时上报日志（单位：毫秒）
+   */
+  apiDelay: 10000,
+
+  /**
+   * @type {string}
+   * @description 百度AK
+   */
+  baiduAK: 'btKt57MWjMx2P1ds2OjZIttLOOjR2Ndf',
+
+  /**
+   * @type Function
+   * @description 页面layout页面路径
+   */
+  layout: () => import('@/layout'),
+
+
+  /**
+   * @type {boolean}
+   * @description 是否启用本地演示路由配置
+   */
+  isOpenLocalDemoRouter: false,
+
+  /**
+   * @type { Array }
+   * @description 不验证登录状态
+   */
+  whiteList:[
+    '/login'
+  ],
+
+  /**
+   * @description 用户登录页面
+   * @type {String}
+   */
+  login: '/login',
+
+  /**
+   * @type {String}
+   * @description 入口页面
+   */
+  index: '/',
+
+  /**
+   * @type {String}
+   * @description 跳转到登录地址
+   */
+  superAdminLogin: '/login',
+
+  /**
+   * @type {String}
+   * @description 后台请求base域名
+   */
+  apiBaseUrl: '//sandbox-supplier-apis.jufubao.cn',
+
+  /**
+   * @type {String}
+   * @description 后台管理API地址
+   */
+  getBrandHostBaseUrl: 'http://sandbox-c.jufubao.cn',
+
+  /**
+   * @type {string}
+   * @description 开发环境api baseurl地址 (开发环境生效)
+   */
+  //getBrandHost: 'sandbox-gonghui-admin.jufubao.cn',
+  getBrandHost: 'sandbox-c.jufubao.cn',
+
+
+  /**
+   * @type {String} 聚福宝储存token名字
+   * @description cookie token key
+   */
+  jufubaoTokenKey: 'jufubao-company-token',
+
+
+  /**
+   * @type {String} 当前后台系统tokenKey
+   * @description cookie token key
+   */
+  currentToken: 'jufubao-company-token',
+
+
+  /**
+   * @type {string}
+   * @description  系统版本
+   */
+  version: 'v1.0.0',
+
+  /**
+   * @type {boolean}
+   * @description  是否关闭eslint语法检测
+   */
+  isCloseEslint: false,
+
+  /***
+   * @description 请求列表返回数据条数
+   * @type { number }
+   */
+  limit: 10,
+
+
+  /**
+   * @type {boolean} true | false
+   * @description 是否开启方法执行逻辑定位位置显示
+   */
+  isTimeLog: false,
+
+
+  /**
+   * @type {boolean} true | false
+   * @description 开发环境与生产环境
+   */
+  isDebug: false,
+
+  /**
+   * @type {boolean} true | false
+   * @description 是否加载模拟数据
+   */
+  isTestData: false,
+
+  /**
+   * @type {number}
+   * @description  开发环境端口号
+   */
+  port: 8099,
+
+  /**
+   * @type {boolean} true | false
+   * @description Whether show the settings right-panel
+   */
+  showSettings: false,
+
+  /**
+   * @type {boolean} true | false
+   * @description Whether need tagsView
+   */
+  tagsView: true,
+
+  /**
+   * @type {boolean} true | false
+   * @description Whether fix the header
+   */
+  fixedHeader: false,
+
+  /**
+   * @type {boolean} true | false
+   * @description Whether show the logo in sidebar
+   */
+  sidebarLogo: true,
+
+  /**
+   * @type {string | array} 'production' | ['production', 'development']
+   * @description Need show err logs component.
+   * The default is only used in the production env
+   * If you want to also use it in dev, you can pass ['production', 'development']
+   */
+  errorLog: 'production',
+
+};
+
+module.exports = settings;
+
+

package/library/pageComponents/index.js

@@ -5,7 +5,6 @@ import JfbPage from "./JfbPage";
 const install = function (Vue, opt) {
   if (install.installed) return;
   install.installed = true;
-
   Vue.prototype.JfbPage = ($vm , ele, options) => {
     return JfbPage($vm, ele, Object.assign({}, opt, options), Vue);
   };

package/library/pageComponents/modules/JfbProductDialog.vue

@@ -267,8 +267,10 @@ export default {
         ...params,
         product_id, product_name,
         modifyprice_method_name: info.data['modifyprice_method_name'],
-        value: this.$xdHelper.divisionFloatNumber(params['value'], 100)
       };
+      //设置调价值
+      if(params.unit === 'money') params['moneyValue'] = this.$xdHelper.divisionFloatNumber(params['value'], 100);
+      else  params['ratioValue'] = this.$xdHelper.divisionFloatNumber(params['value'], 100);
       this.getAdjustForm(params);
       this.adjustStatus = true;
       this.showAdjust = true;

package/library/viewModules/viewTask/schemas/tasks.js

@@ -45,7 +45,26 @@ module.exports = {
       // #endif
 
     },
-
+    {
+      mapFn: 'getDownloadUrl',
+      isRule: false,
+      title: '任务query',
+      path: '/@@@@/v1/async/real-url',
+      params: {
+        serial_no: ['id', 'String', '必选'],
+        // #ifdef  admin
+        from: ['项目标识', 'String', '必选', 'admin'],
+        // #endif
+        // #ifdef  supplier
+        from: ['项目标识', 'String', '必选', 'supplier'],
+        // #endif
+        // #ifndef  admin supplier
+        from: ['项目标识', 'String', '必选', 'partner'],
+        // #endif
+      },
+      disabled: true,
+      role: '',
+    },
   ],
 }
 

package/library/viewModules/viewTask/viewTask/list.vue

@@ -1,9 +1,23 @@
 <template>
   <div class="app-container">
+    <el-card class="app-container__search">
+      <xd-search
+        time-type
+        dateFilter
+        :picker-options="{}"
+        v-if="searchForm.length > 0"
+        v-model="searchParams"
+        :list="searchForm"
+        @onSearch="handleSearch"
+      >
+      </xd-search>
+    </el-card>
     <el-card class="app-container__list">
       <div slot="header">导出任务</div>
       <div class="app-container__list-pagination">
-        <div></div>
+        <div class="app-container__list-pagination-left red">
+          <i class="el-icon-warning-outline"></i><span>下载文件超过7天后，系统将自动删除</span>
+        </div>
         <div>
           <el-button type="primary" @click="getList()">刷新</el-button>
         </div>
@@ -11,7 +25,6 @@
       <div class="app-container__list-table">
         <xd-table
           is-border
-          :get-link="getLink"
           :headers="headers"
           :list="tables"
           @onClick="handleBtnClick"
@@ -48,12 +61,12 @@
 import XdPagination from "@/components/XdPagination.vue"
 import XdTable from "@/components/XdTable"
 import XdSearch from "@/components/XdSearch"
-import { Loading } from 'element-ui'
-import checkPermission from "@/utils/permission"
+import downloadJs from "downloadjs";
 import {
   mapActions,
   mapState,
 } from 'vuex'
+import {getOptions} from "@/utils/options";
 
 
 export default {
@@ -68,7 +81,7 @@ export default {
 
       //搜索
       searchForm: [], //搜索区域模块表单
-      searchParams: null, //搜索参数
+      searchParams: {}, //搜索参数
 
       //分页参数
       pageSize: 1, //当前页面数量
@@ -81,6 +94,7 @@ export default {
         { "type": "normal", "prop": "serial_no", "align": "center", "width": 120, "label": "ID" },
         { "type": "normal", "prop": "file_name", "align": "center", "minWidth": 200, "label": "文件名称" },
         { "type": "normal", "prop": "status_text", "align": "center", "width": 100, "label": "任务状态" },
+        { "type": "normal", "prop": "data_tag_text", "align": "center", "width": 180, "label": "模版名称" },
         { "type": "normal", "prop": "error_reason", "align": "center", "minWidth": 200, "label": "错误原因" },
         { "type": "normal", "prop": "admin_user", "align": "center", "width": 100, "label": "操作人" },
         { "type": "normal", "prop": "created_time", "align": "center", "width": 190, "label": "创建时间" },
@@ -99,11 +113,14 @@ export default {
     }
   },
   created () {
-    this.getList()
+    this.getList();
+    this.initSearchForm();
   },
   methods: {
     ...mapActions('tasks', [
-      'getAsyncList', 'asyncRetry'
+      'getAsyncList',
+      'asyncRetry',
+      'getDownloadUrl'
     ]),
 
     /**
@@ -123,10 +140,10 @@ export default {
      * @description 获取数据列表
      */
     getList () {
-
       let params = {
         page_token: this.pageSize,
         page_size: this.limit,
+        ...this.searchParams,
       }
       let loading = this.$loading({})
       this.getAsyncList(params).then(res => {
@@ -145,13 +162,103 @@ export default {
         loading.close()
       })
     },
+
+
+    /**
+     * @description 点击搜索进行搜索操作
+     * @param action 动作
+     * @param form 搜索请求参数
+     */
+    handleSearch({ action, form }) {
+      this.page_token = 1;
+      this.getList();
+    },
     /**
-     * @description 预设获取页面跳转地址方法（次场景可以不实现）
-     * @param item
+     * @description 初始化搜索模块
      */
-    getLink (item) {
-      return '/'
+    initSearchForm() {
+      this.searchForm = [
+        {
+          label: "文件名称",
+          ele: "el-input",
+          valueKey: "file_name",
+          value: "",
+          placeholder: "请输入文件名称"
+        },
+        {
+          label: '任务状态:',
+          ele: 'xd-remote-select-list',
+          valueKey: 'status',
+          value: '',
+          placeholder: '请选择任务状态',
+          handleCustom({action, data}) {
+            ///export-public/v1/options/task-status
+            let params = {};
+            // #ifdef  admin
+            params = {from:'admin'}
+            // #endif
+            // #ifdef  supplier
+            params = {from:'supplier'}
+            // #endif
+            // #ifndef  admin supplier
+            params = {from:'partner'}
+            // #endif
+            getOptions({
+              server:'export-public',
+              fn:'task-status',
+              path: 'p1',
+              params:params,
+            }).then(res => {
+              data.cb(res.data.list || [])
+            }).catch(error => {
+              console.error(error)
+              data.cb([])
+            })
+          },
+        },
+        {
+          label: '模版:',
+          ele: 'xd-remote-select-list',
+          valueKey: 'data_tag',
+          value: '',
+          placeholder: '请选择模版',
+          handleCustom({action, data}) {
+            ///export-public/v1/data-tags/options
+            let params = {};
+            // #ifdef  admin
+            params = {from:'admin'}
+            // #endif
+            // #ifdef  supplier
+            params = {from:'supplier'}
+            // #endif
+            // #ifndef  admin supplier
+            params = {from:'partner'}
+            // #endif
+            getOptions({
+              server:'export-public',
+              fn:'data-tags',
+              path: 'p1',
+              params
+            }).then(res => {
+              data.cb(res.data.list || [])
+            }).catch(error => {
+              console.error(error)
+              data.cb([])
+            })
+          },
+        },
+        {
+          label: '触发时间:', //label
+          ele: 'xd-date', //package 名称
+          valueKey: ['created_time_start', 'created_time_end'], //form[valueKey]
+          value: [], //v-model
+          format: 'yyyy/MM/dd HH:mm:ss',//时间显示格式
+          formatValue: 'timestamp', //输出时间格式
+          placeholder: ['开始时间', '结束时间'],
+        },
+      ];
     },
+
     /**
      *按钮操作
      **/
@@ -170,10 +277,19 @@ export default {
           })
 
       } else if (action === 'download') {
-        //下载
-        window.open(url)
+        let loading = this.$loading({})
+        this.getDownloadUrl({serial_no})
+          .then(res=>{
+            if(res.data.download_url) {
+              window.open(res.data.download_url)
+            }
+            loading.close()
+          }).catch(err=>{
+            loading.close()
+          })
       }
     },
+
     /**
      * @description 翻页处理方法
      * @param page {Number} 访问页面页码数
@@ -192,4 +308,15 @@ export default {
     margin: 0 auto;
   }
 }
+
+.app-container__list-pagination-left {
+  display: flex;
+  justify-content: flex-start;
+  align-items: center;
+  font-size: 14px;
+  & > i {
+    margin-right: 5px;
+    font-size: 18px;
+  }
+}
 </style>

package/package.json

@@ -1,19 +1,20 @@
 {
   "name": "jufubao-admin-library",
-  "version": "1.1.6",
+  "version": "1.1.8",
   "description": "聚福宝福利后台管理系统公共模块",
   "author": "goashiyong <gaoshiyong1272@vip.163.com>",
   "scripts": {
-    "serve": "cross-env type=test cover=true service=serve npm run entry",
-    "serve.domain": "cross-env type=test cover=true service=serve domain=http://sandbox-editx.jufubao.cn npm run entry",
-    "dev": "cross-env type=dev cover=true service=build npm run entry",
-    "test": "cross-env type=test cover=true service=build npm run entry",
-    "build": "cross-env type=build cover=true service=build npm run entry",
+    "serve": "cross-env type=test cover=true service=serve npm run entry bus",
+    "serve.domain": "cross-env type=test cover=true service=serve domain=http://sandbox-editx.jufubao.cn npm run entry bus",
+    "dev": "cross-env type=dev cover=true service=build npm run entry bus",
+    "test": "cross-env type=test cover=true service=build npm run entry bus",
+    "build": "cross-env type=build cover=true service=build npm run entry bus",
     "update": " node ./update.command.js false",
     "update.local": " node ./update.command.js true",
     "entry": "node ./build/commands/entry.init.js",
     "app": "node ./build/commands/appcss.js",
     "coder": "node ./build/commands/coder.js",
+    "watch": "node ./watch.js",
     "coder:check": "node ./build/commands/coder.check.js",
     "coder:page": "node ./build/commands/coder.page.js",
     "coder:router": "node ./build/commands/coder.router.js"
@@ -26,7 +27,7 @@
     "element-ui": "2.13.2",
     "gxd-file-preview": "1.2.1",
     "gxd-helper": "2.0.21",
-    "gxd-vue-library": "1.1.69",
+    "gxd-vue-library": "1.1.70",
     "js-base64": "^3.4.5",
     "js-cookie": "2.2.0",
     "md5": "^2.3.0",

package/watch.js

@@ -0,0 +1,32 @@
+'use strict';
+const {watch} = require("fs");
+const {execSync} = require("child_process");
+const clog  = require('./build/clog')
+let loading = false;
+let time = null;
+const fileHelper = require('./build/fileHepler');
+const utils = require('./build/lib/utils');
+
+watch(__dirname + '/library',{recursive:true}, (eventType, filename) => {
+  if(time) {
+    clearTimeout(time);
+    time = null;
+  }
+  if(loading) return;
+  time = setTimeout(()=>{
+    loading = true;
+    execSync('gulp', {stdio: 'inherit'});
+    clog(`更新完成`, 'cyan')
+    utils.logsLine(clog);
+    loading = false
+  }, 2000)
+});
+console.log('\n')
+clog(`开始监听文件夹`, 'cyanBG')
+utils.logsLine(clog, 'start');
+clog(`当前监听文件夹: ${fileHelper.getPlatformSurePath(__dirname + '/library')}`, 'green')
+utils.logsLine(clog);
+
+
+
+