refactor(javascript):移除esm,es6语法

applications/api/system/file.py

@@ -27,8 +27,8 @@ class FilePhotosResource(Resource):
                 'href': item.href,
                 'mime': item.mime,
                 'size': item.size,
-                'ext': item.ext,
+                'ext': item.ext if hasattr(item, 'ext') else "",
-                'create_at': item.create_at,
+                'create_at': str(item.create_at),
             } for item in photo_paginate.items
         ]
         return table_api(result={'items': data,

static/api/http.js

@@ -1,96 +0,0 @@
-class File {
-  constructor () {
-    this.FILE_PATH = '/api/v1/file'
-    this.FILE_API = {
-      'PHOTOS': () => `${this.FILE_PATH}/photos`,
-      'PHOTO': (photo_id) => `${this.FILE_PATH}/photo/${photo_id}`,
-    }
-  }
-}
-
-class Department {
-  constructor () {
-    this.DEPARTMENT_PATH = '/api/v1/dept'
-    this.DEPARTMENT_API = {
-      'DEPARTMENTS': () => `${this.DEPARTMENT_PATH}/departments`,
-      'DEPARTMENT': (dept_id) => `${this.DEPARTMENT_PATH}/department/${dept_id}`,
-      'DEPARTMENT_STATUS': (dept_id) => `${this.DEPARTMENT_PATH}/department/${dept_id}/status`,
-    }
-  }
-}
-
-class Rights {
-  constructor () {
-    this.DEPARTMENT_PATH = '/api/v1/rights'
-    this.RIGHTS_API = {
-      'RIGHTS': () => `${this.DEPARTMENT_PATH}/rights`,
-      'POWER': (power_id) => `${this.DEPARTMENT_PATH}/power/${power_id}`,
-      'POWER_STATUS': (power_id) => `${this.DEPARTMENT_PATH}/power/${power_id}/status`,
-    }
-  }
-}
-
-class Role {
-  constructor () {
-    this.ROLE_PATH = '/api/v1/roles'
-    this.ROLE_API = {
-      'ROLES': () => `${this.ROLE_PATH}/roles`,
-      'ROLE': (role_id) => `${this.ROLE_PATH}/role/${role_id}`,
-      'ROLE_STATUS': (role_id) => `${this.ROLE_PATH}/role/${role_id}/status`,
-      'ROLE_POWER': (role_id) => `${this.ROLE_PATH}/role_power/${role_id}`,
-    }
-  }
-
-  async get_roles () {
-    return fetch(this.ROLE_API.ROLES()).then(function (response) {
-      return response.json()
-    }).then(function (myJson) {
-      return myJson
-    })
-  }
-}
-
-class Users {
-  constructor () {
-    this.USER_PATH = '/api/v1/users'
-    this.USER_API = {
-      'USERS': () => `${this.USER_PATH}/users`,
-      'USER': (user_id) => `${this.USER_PATH}/user/${user_id}`,
-      'USER_ROLE': (user_id) => `${this.USER_PATH}/user/${user_id}/role`,
-      'USER_STATUS': (user_id) => `${this.USER_PATH}/user/${user_id}/status`,
-      'USER_AVATAR': (user_id) => `${this.USER_PATH}/user/${user_id}/avatar`,
-      'USER_INFO': (user_id) => `${this.USER_PATH}/user/${user_id}/info`,
-      'USER_PASSWORD': (user_id) => `${this.USER_PATH}/user/${user_id}/password`,
-    }
-  }
-
-}
-
-const FILE = new File()
-const FILE_API = FILE.FILE_API
-const DEPARTMENT = new Department()
-const DEPARTMENT_API = DEPARTMENT.DEPARTMENT_API
-const RIGHTS = new Rights()
-const RIGHTS_API = RIGHTS.RIGHTS_API
-const ROLE = new Role()
-const ROLE_API = ROLE.ROLE_API
-const USER = new Users()
-const USER_API = USER.USER_API
-export {
-  FILE, FILE_API, DEPARTMENT,
-  DEPARTMENT_API,
-  RIGHTS, RIGHTS_API,
-  ROLE, ROLE_API,
-  USER, USER_API,
-}
-
-/******************数据解析********************************/
-export function parserTableData (res) { //res 即为原始返回的数据
-  console.log('parserTableData', res)
-  return {
-    'code': res.code, //解析接口状态
-    'msg': res.message, //解析提示文本
-    'count': res.result.total, //解析数据长度
-    'data': res.result.items, //解析数据列表
-  }
-}

templates/admin/base.html

@@ -27,6 +27,19 @@
 {% block footer_script %}
     <script src="/static/admin/component/layui/layui.js"></script>
     <script src="/static/admin/component/pear/pear.js"></script>
+    <script>
+      /******************数据解析********************************/
+      function parserTableData (data) {
+        /* 将服务器返回的 json 数据解析为 layui 表格需要的格式  */
+        return {
+          'code': data.code, //解析接口状态
+          'msg': data.message, //解析提示文本
+          'count': data.result.total, //解析数据长度
+          'data': data.result.items, //解析数据列表
+        }
+      }
+    </script>
+
 {% endblock %}
 {# 当前页面自己编写的 JavaScript #}
 {% block models_script %}

templates/admin/department/dept.html

@@ -74,10 +74,7 @@
                 {{ "{{# if(d.status==1){ }} checked {{# } }}" }}>
     </script>
 
-    <script type="module">
+    <script>
-
-      import { DEPARTMENT_API } from '/static/api/http.js'
-
       layui.use(['table', 'form', 'jquery', 'treetable', 'popup'], function () {
         let table = layui.table
         let form = layui.form
@@ -113,7 +110,7 @@
             treeDefaultClose: false,
             toolbar: '#toolbar', /*表格的工具栏*/
             elem: '#tables', /*表格挂载的对象*/
-            url: DEPARTMENT_API.DEPARTMENTS(), /*数据来源接口*/
+            url: '/api/v1/dept/departments', /*数据来源接口*/
             page: false,
             cols: get_columns(),/*表格渲染的数据*/
           })
@@ -188,7 +185,7 @@
           }
           let loading = layer.load()
           $.ajax({
-            url: DEPARTMENT_API.DEPARTMENT_STATUS(this.value),
+            url: '/api/v1/dept/department/' + this.value + '/status',
             data: JSON.stringify({ deptId: this.value, operate: operate }),
             dataType: 'json',
             contentType: 'application/json',
@@ -230,7 +227,7 @@
             layer.close(index)
             let loading = layer.load()
             $.ajax({
-              url: DEPARTMENT_API.DEPARTMENT(obj.data['deptId']),
+              url: '/api/v1/dept/department/' + obj.data['deptId'],
               dataType: 'json',
               type: 'delete',
               success: function (result) {

templates/admin/department/dept_add.html

@@ -83,9 +83,7 @@
 {% endblock %}
 
 {% block models_script %}
-    <script type="module">
+    <script>
-      import { DEPARTMENT_API } from '/static/api/http.js'
-
       layui.use(['form', 'jquery', 'dtree'], function () {
         let form = layui.form
         let $ = layui.jquery
@@ -94,7 +92,7 @@
         /*添加数据 渲染下拉选择组件*/
         dtree.renderSelect({
           elem: '#selectParent',
-          url: DEPARTMENT_API.DEPARTMENTS(),
+          url: '/api/v1/dept/departments',
           method: 'get',
           selectInputName: { nodeId: 'parentId', context: 'parentName' },
           skin: 'layui',
@@ -106,7 +104,7 @@
         /*添加数据 表单组件，提交按钮之后触发的事件*/
         form.on('submit(dept-save)', function (data) {
           $.ajax({
-            url: DEPARTMENT_API.DEPARTMENTS(),
+            url: '/api/v1/dept/departments',
             data: JSON.stringify(data.field),
             dataType: 'json',
             contentType: 'application/json',

templates/admin/department/dept_edit.html

@@ -95,9 +95,7 @@
 
 
 {% block models_script %}
-    <script type="module">
+    <script >
-      import { DEPARTMENT_API } from '/static/api/http.js'
-
       layui.use(['form', 'jquery'], function () {
         let form = layui.form
         let $ = layui.jquery
@@ -105,7 +103,7 @@
         // 修改数据 当点击更新之后，获取数据
         form.on('submit(dept-update)', function (data) {
           $.ajax({
-            url: DEPARTMENT_API.DEPARTMENT(data.field.deptId),
+            url: '/api/v1/dept/department/' + data.field.deptId,
             data: JSON.stringify(data.field),
             dataType: 'json',
             contentType: 'application/json',

templates/admin/file/photo.html

@@ -29,9 +29,7 @@
         </button>
     </script>
 
-    <script type="module">
+    <script>
-      import { FILE_API, parserTableData as parseData } from '/static/api/http.js'
-
       layui.use(['table', 'form', 'jquery', 'element', 'form', 'upload'], function () {
         let table = layui.table
         let form = layui.form
@@ -97,9 +95,9 @@
         ]
 
         table.render({
-          parseData,
+          parseData: parserTableData,  /* 服务器返回的数据格式与layui 不一致，需要进行转化*/
           elem: '#tables',
-          url: FILE_API.PHOTOS(),
+          url: '/api/v1/file/photos',
           page: true,
           cols: get_columns(),
           skin: 'line',
@@ -159,7 +157,7 @@
             layer.close(index)
             let loading = layer.load()
             $.ajax({
-              url: FILE_API.PHOTO(obj.data['id']),
+              url: '/api/v1/file/photo/' + obj.data['id'],
               data: { id: obj.data['id'] },
               dataType: 'json',
               type: 'delete',
@@ -207,7 +205,7 @@
             layer.close(index)
             let loading = layer.load()
             $.ajax({
-              url: FILE_API.PHOTOS(),
+              url: '/api/v1/file/photos',
               data: { ids: ids },
               dataType: 'json',
               type: 'POST',

templates/admin/file/photo_add.html

@@ -29,9 +29,7 @@
 
 
 {% block models_script %}
-    <script type="module">
+    <script>
-      import { FILE_API } from '/static/api/http.js'
-
       layui.use(['jquery', 'element', 'form', 'upload'], function () {
         var $ = layui.jquery
         var element = layui.element
@@ -40,7 +38,7 @@
         //选完文件后不自动上传
         upload.render({
           elem: '#select-img'
-          , url: FILE_API.PHOTOS()
+          , url: '/api/v1/file/photos'
           , auto: false
           , exts: 'jpg|png|gif|bmp|jpeg'
           , size: 1000

templates/admin/logs_temp/main.html

@@ -39,9 +39,7 @@
     {{# } }}'|safe }}
     </script>
 
-    <script type="module">
+    <script>
-      import { parserTableData as parseData } from '/static/api/http.js'
-
       layui.use(['table', 'form', 'jquery', 'element', 'util'], function () {
         let table = layui.table
         let form = layui.form
@@ -63,7 +61,7 @@
         ]
 
         table.render({
-          parseData,
+          parseData: parserTableData,
           elem: '#log-access-table',
           url: MODULE_PATH + 'access_log',
           page: true,
@@ -73,7 +71,7 @@
         })
 
         table.render({
-          parseData,
+          parseData: parserTableData,
           elem: '#log-login-table',
           url: MODULE_PATH + 'login_log',
           page: true,

templates/admin/rights/rights.html

@@ -53,9 +53,7 @@
         </button>
     </script>
 
-    <script type="module">
+    <script>
-      import { RIGHTS_API, parserTableData as parseData } from '/static/api/http.js'
-
       layui.use(['table', 'form', 'jquery', 'treetable', 'popup', 'dtree', 'iconPicker'], function () {
         let table = layui.table
         let form = layui.form
@@ -72,11 +70,11 @@
             { field: 'icon', title: '图标', templet: (d) => `<i class="layui-icon ${d.icon}"></i>` },
             {
               field: 'powerType', title: '权限类型', templet: (d) => {
-                if (d.powerType === '0') {
+                if (d.powerType === 0) {
                   return `<span>目录</span>`
-                } else if (d.powerType === '1') {
+                } else if (d.powerType === 1) {
                   return `<span>菜单</span>`
-                } else if (d.powerType === '2') {
+                } else if (d.powerType === 2) {
                   return `<span>按钮</span>`
                 }
               },
@@ -103,7 +101,7 @@
           treeDefaultClose: true,
           toolbar: '#toolbar',
           elem: '#tables',
-          url: RIGHTS_API.RIGHTS(),
+          url: '/api/v1/rights/rights',
           page: false,
           cols: get_columns(),
         })
@@ -163,7 +161,7 @@
           }
           let loading = layer.load()
           $.ajax({
-            url: RIGHTS_API.POWER_STATUS(this.value),
+            url: '/api/v1/rights/power/' + this.value + '/status',
             data: JSON.stringify({ powerId: this.value, operate: operate }),
             dataType: 'json',
             contentType: 'application/json',
@@ -203,7 +201,7 @@
             layer.close(index)
             let loading = layer.load()
             $.ajax({
-              url: RIGHTS_API.POWER(obj.data['powerId']),
+              url: '/api/v1/rights/power/' + obj.data['powerId'],
               dataType: 'json',
               type: 'delete',
               success: function (result) {
@@ -245,7 +243,7 @@
             layer.close(index)
             let loading = layer.load()
             $.ajax({
-              url: RIGHTS_API.RIGHTS(),
+              url: '/api/v1/rights/rights',
               data: { ids: ids },
               dataType: 'json',
               type: 'delete',

templates/admin/rights/rights_add.html

@@ -87,8 +87,7 @@
 {% endblock %}
 
 {% block models_script %}
-    <script type="module">
+    <script>
-      import { RIGHTS_API } from '/static/api/http.js'
 
       layui.use(['form', 'jquery', 'iconPicker', 'dtree'], function () {
         let form = layui.form
@@ -98,7 +97,7 @@
 
         dtree.renderSelect({
           elem: '#selectParent',
-          url: RIGHTS_API.RIGHTS(),
+          url: '/api/v1/rights/rights',
           method: 'get',
           selectInputName: { nodeId: 'parentId', context: 'powerName' },
           skin: 'layui',
@@ -131,7 +130,7 @@
         form.on('submit(power-save)', function (data) {
           data.field.icon = 'layui-icon ' + data.field.icon
           $.ajax({
-            url: RIGHTS_API.POWER(0),
+            url: '/api/v1/rights/rights/0',
             data: JSON.stringify(data.field),
             dataType: 'json',
             contentType: 'application/json',

templates/admin/rights/rights_edit.html

@@ -98,10 +98,7 @@
 {% endblock %}
 
 {% block models_script %}
-    <script type="module">
+    <script>
-
-      import { RIGHTS_API } from '/static/api/http.js'
-
       layui.use(['form', 'jquery', 'iconPicker', 'dtree'], function () {
         let form = layui.form
         let $ = layui.jquery
@@ -110,7 +107,7 @@
 
         dtree.renderSelect({
           elem: '#selectParent',
-          url: RIGHTS_API.RIGHTS(),
+          url: '/api/v1/rights/rights',
           method: 'get',
           selectInputName: { nodeId: 'parentId', context: 'powerName' },
           skin: 'layui',
@@ -147,7 +144,7 @@
           data.field.icon = 'layui-icon ' + data.field.icon
           console.log(data.field)
           $.ajax({
-            url: RIGHTS_API.POWER(data.field.powerId),
+            url: '/api/v1/rights/rights/power/' + data.field.powerId,
             data: JSON.stringify(data.field),
             dataType: 'json',
             contentType: 'application/json',

templates/admin/roles/roles.html

@@ -63,9 +63,7 @@
                lay-filter="tool-switch" {{ "{{# if(d.enable==1){ }} checked {{# } }}" }}>
     </script>
 
-    <script type="module">
+    <script>
-      import { ROLE_API, parserTableData as parseData } from '/static/api/http.js'
-
       layui.use(['table', 'form', 'jquery', 'popup', 'common'], function () {
         let table = layui.table
         let form = layui.form
@@ -85,9 +83,9 @@
         ]
 
         table.render({
-          parseData,
+          parseData: parserTableData,
           elem: '#tables',
-          url: ROLE_API.ROLES(),
+          url: '/api/v1/roles/roles',
           page: true,
           cols: get_columns(),
           skin: 'line',
@@ -133,7 +131,7 @@
           }
           let loading = layer.load()
           $.ajax({
-            url: ROLE_API.ROLE_STATUS(this.value),
+            url: '/api/v1/roles/role/' + this.value + '/status',
             data: JSON.stringify({ roleId: this.value, operate: operate }),
             dataType: 'json',
             contentType: 'application/json',
@@ -184,7 +182,7 @@
             layer.close(index)
             let loading = layer.load()
             $.ajax({
-              url: ROLE_API.ROLE_POWER(obj.data['id']),
+              url: '/api/v1/roles/roles/role_power/' + obj.data['id'],
               dataType: 'json',
               type: 'delete',
               success: function (result) {
@@ -227,7 +225,7 @@
             let loading = layer.load()
             $.ajax({
 
-              url: ROLE_API.ROLES(),
+              url: '/api/v1/roles/roles',
               data: { ids: ids },
               dataType: 'json',
               type: 'delete',

templates/admin/roles/roles_add.html

@@ -61,16 +61,14 @@
 
 
 {% block models_script %}
-    <script type="module">
+    <script>
-      import { ROLE_API } from '/static/api/http.js'
-
       layui.use(['form', 'jquery'], function () {
         let form = layui.form
         let $ = layui.jquery
 
         form.on('submit(role-save)', function (data) {
           $.ajax({
-            url: ROLE_API.ROLE(0),
+            url: '/api/v1/roles/role/0',
             data: JSON.stringify(data.field),
             dataType: 'json',
             contentType: 'application/json',

templates/admin/roles/roles_edit.html

@@ -84,7 +84,7 @@
 
         form.on('submit(role-update)', function (data) {
           $.ajax({
-            url: ROLE_API.ROLE(data.field.roleId),
+            url: '/api/v1/roles/role/' + data.field.roleId,
             data: JSON.stringify(data.field),
             dataType: 'json',
             contentType: 'application/json',

templates/admin/roles/roles_power.html

@@ -30,10 +30,7 @@
 
 
 {% block models_script %}
-    <script type="module">
+    <script>
-
-      import { ROLE_API } from '/static/api/http.js'
-
       layui.use(['dtree', 'form', 'jquery'], function () {
         let dtree = layui.dtree
         let form = layui.form
@@ -42,7 +39,7 @@
         dtree.render({
           elem: '#role-power',
           method: 'get',
-          url: ROLE_API.ROLE_POWER({{role_id}}),
+          url: '/api/v1/roles/role_power/' + {{ role_id }}, /*最后是 jianja2 语法*/
           dataFormat: 'list',
           checkbar: true,
           skin: 'layui',
@@ -63,7 +60,7 @@
           data.field.powerIds = ids
 
           $.ajax({
-            url: ROLE_API.ROLE_POWER(data.field.roleId),
+            url: '/api/v1/roles/role_power/' + data.field.roleId,
             data: data.field,
             dataType: 'json',
             type: 'put',

templates/admin/users/profile.html

@@ -238,9 +238,7 @@
 {% endblock %}
 
 {% block models_script %}
-    <script type="module">
+    <script>
-      import { USER_API } from '/static/api/http.js'
-
       layui.use(['element', 'jquery', 'layer', 'form', 'popup'], function () {
         let $ = layui.jquery
         let layer = layui.layer
@@ -277,7 +275,7 @@
         // 表单提交更改个人信息数据
         form.on('submit(user-update)', function (data) {
           $.ajax({
-            url: USER_API.USER_INFO(data.field.user_id),
+            url: '/api/v1/users/user/' + data.field.user_id + '/info',
             data: JSON.stringify(data.field),
             dataType: 'json',
             contentType: 'application/json',
@@ -296,7 +294,7 @@
         // 修改密码提交
         form.on('submit(edit-password)', function (data) {
           $.ajax({
-            url: USER_API.USER_PASSWORD(data.field.user_id),
+            url: '/api/v1/users/user/' + data.field.user_id + '/password',
             data: JSON.stringify(data.field),
             contentType: 'application/json',
             dataType: 'json',

templates/admin/users/profile_avatar.html

@@ -38,9 +38,7 @@
 
 
 {% block models_script %}
-    <script type="module">
+    <script>
-      import { USER_API } from '/static/api/http.js'
-
       layui.use(['jquery', 'layer', 'cropper', 'popup'], function () {
         let $ = layui.jquery
         let layer = layui.layer
@@ -79,7 +77,7 @@
                   // 修改 avatar 字段
                   $.ajax({
                     method: 'put',
-                    url: USER_API.USER_AVATAR($('#user_id').val()),
+                    url: '/api/v1/users/user/' + $('#user_id').val() + '/avatar',
                     data: JSON.stringify({ avatar: result.data }),
                     dataType: 'json',
                     contentType: 'application/json',

templates/admin/users/users.html

@@ -93,9 +93,7 @@
         {{ '  {{layui.util.toDateString(d.update_at,  "yyyy-MM-dd HH:mm:ss")}' |safe }}}
     </script>
 
-    <script type="module">
+    <script>
-      import { USER_API, ROLE, parserTableData as parseData } from '/static/api/http.js'
-
       layui.use(['table', 'dtree', 'form', 'jquery', 'popup', 'common'], function () {
         let table = layui.table
         let form = layui.form
@@ -120,9 +118,9 @@
 
         // 渲染表格数据
         table.render({
-          parseData,
+          parseData: parserTableData,
           elem: '#tables',
-          url: USER_API.USERS(),
+          url: '/api/v1/users/users',
           page: true,
           cols: get_columns(),
           skin: 'line',
@@ -207,7 +205,7 @@
           }
           let loading = layer.load()
           $.ajax({
-            url: USER_API.USER_STATUS(this.value),
+            url: '/api/v1/users/user/' + this.value + '/status',
             data: JSON.stringify({ operate: operate, userId: this.value }),
             dataType: 'json',
             contentType: 'application/json',
@@ -258,7 +256,7 @@
             let loading = layer.load()
             $.ajax({
 
-              url: USER_API.USERS(),
+              url: '/api/v1/users/users',
               data: { ids: ids },
               dataType: 'json',
               type: 'delete',
@@ -284,7 +282,7 @@
             layer.close(index)
             let loading = layer.load()
             $.ajax({
-              url: USER_API.USER(obj.data['id']),
+              url: '/api/v1/users/user/' +  obj.data['id'],
               dataType: 'json',
               type: 'delete',
               success: function (result) {

templates/admin/users/users_add.html

@@ -62,8 +62,7 @@
 {% endblock %}
 
 {% block models_script %}
-    <script type="module">
+    <script>
-      import { USER_API } from '/static/api/http.js'
 
       layui.use(['form', 'jquery'], function () {
         let form = layui.form
@@ -77,7 +76,7 @@
           data.field.roleIds = roleIds
 
           $.ajax({
-            url: USER_API.USERS(),
+            url: '/api/v1/users/users',
             data: JSON.stringify(data.field),
             dataType: 'json',
             contentType: 'application/json',

templates/admin/users/users_edit.html

@@ -71,9 +71,7 @@
 {% endblock %}
 
 {% block models_script %}
-    <script type="module">
+    <script>
-      import { USER_API } from '/static/api/http.js'
-
       layui.use(['form', 'jquery', 'dtree'], function () {
         let form = layui.form
         let $ = layui.jquery
@@ -98,7 +96,7 @@
           roleIds = roleIds.substr(0, roleIds.length - 1)
           data.field.roleIds = roleIds
           $.ajax({
-            url: USER_API.USER_ROLE(data.field.userId),
+            url: '/api/v1/users/user/' + data.field.userId + '/role',
             data: JSON.stringify(data.field),
             dataType: 'json',
             contentType: 'application/json',