q-koa 10.7.7 → 10.8.0

package/core/config.js

@@ -138,18 +138,20 @@ module.exports = {
       router.get('/cache/get', app.controller.cache.get)
       router.get('/cache/clear', app.controller.cache.clear)
     }
+    if (app.model.weixin) {
+      router.get('/weixin/h5_login', app.controller.weixin.h5_login)
+      router.get(
+        '/weixin/h5_login_callback',
+        app.controller.weixin.h5_login_callback
+      )
+      router.get(
+        '/weixin/h5_login_info_callback',
+        app.controller.weixin.h5_login_info_callback
+      )
+      router.get('/weixin/messagePush', app.controller.weixin.messagePush)
+    }
 
-    router.get('/weixin/h5_login', app.controller.weixin.h5_login)
-    router.get(
-      '/weixin/h5_login_callback',
-      app.controller.weixin.h5_login_callback
-    )
-    router.get(
-      '/weixin/h5_login_info_callback',
-      app.controller.weixin.h5_login_info_callback
-    )
     router.get('/common/getAppConfig', app.controller.common.getAppConfig)
-    router.get('/weixin/messagePush', app.controller.weixin.messagePush)
     router.get('/common/createQr', app.controller.common.createQr)
     router.get('/lanhu/:str', async (ctx) => {
       const { str } = ctx.params

package/core/file/plugins/language/config.js

@@ -1,5 +1,42 @@
 module.exports = {
-  name: '语言包',
-  belongs: 'setting',
-  tab: 'lang_id',
-};
+  name: '语言设置',
+  belongs: 'page',
+  multiple: false,
+  availableSort: false,
+  order: [],
+  referenceSelect: [],
+  select: [
+    { key: 'name', symbol: '$like' },
+    {
+      key: 'type',
+      admin: {
+        name: 'admin',
+      },
+    },
+  ],
+  excludes: [],
+  limit: 20,
+  defaultOrder: [{ sort: 'descending', type: 'id' }],
+  comment: {},
+  sortOrder: 1,
+  reference: [
+    { key: 'operate_language', name: '设置', width: 300, common: true },
+  ],
+  excludeAuth: [],
+  include: ((app) => {
+    return [
+      {
+        model: app.model.language_value,
+      },
+    ]
+  }).toString(),
+  initList: ['language_type'],
+  editInline: {},
+  autoData: {},
+  is_split: false,
+  is_split_count: false,
+  show_virtual: false,
+  modelQuery: {},
+  deleteCheckList: [],
+  bulkCreateList: [],
+}

package/core/file/plugins/language/model.js

@@ -1,53 +1,21 @@
-const { Sequelize } = require('q-koa')
+const { Sequelize, Random } = require('q-koa')
 
 exports.name = {
   type: Sequelize.STRING,
-  comment: '名字',
+  comment: '说明',
   allowNull: false,
+  is_mock: true,
   defaultValue: '',
-  validate: {
-    notNull: {
-      msg: '名字不允许为空',
-    },
-    notEmpty: {
-      msg: '名字不允许为空',
-    },
-  },
+  sortOrder: 1,
+  mock: () => Random.ctitle(),
 }
 
-exports.lang_id = {
-  type: Sequelize.INTEGER(11),
-  comment: '语言',
+exports.type = {
+  type: Sequelize.ENUM('input', 'textarea', 'content'),
+  comment: '类型',
   allowNull: false,
-  defaultValue: 1,
-}
-
-exports.key = {
-  type: Sequelize.STRING,
-  comment: 'key值',
-  allowNull: false,
-  defaultValue: '',
-  validate: {
-    notNull: {
-      msg: 'key值不允许为空',
-    },
-    notEmpty: {
-      msg: 'key值不允许为空',
-    },
-  },
-}
-
-exports.value = {
-  type: Sequelize.STRING,
-  comment: 'value值',
-  allowNull: false,
-  defaultValue: '',
-  validate: {
-    notNull: {
-      msg: 'value值不允许为空',
-    },
-    notEmpty: {
-      msg: 'value值不允许为空',
-    },
-  },
+  is_mock: true,
+  defaultValue: 'input',
+  sortOrder: 2,
+  mock: () => ['input', 'textarea', 'content'][Random.integer(0, 2)],
 }

package/core/file/plugins/language_type/config.js

@@ -0,0 +1,25 @@
+module.exports = {
+  name: '语言包',
+  belongs: 'page',
+  multiple: false,
+  availableSort: false,
+  order: [],
+  referenceSelect: [],
+  select: [],
+  excludes: [],
+  limit: 20,
+  defaultOrder: [],
+  comment: {},
+  sortOrder: 1,
+  reference: [],
+  excludeAuth: [],
+  initList: [],
+  editInline: {},
+  autoData: {},
+  is_split: false,
+  is_split_count: false,
+  show_virtual: false,
+  modelQuery: {},
+  deleteCheckList: [],
+  bulkCreateList: [],
+};

package/core/file/plugins/language_type/model.js

@@ -0,0 +1,42 @@
+const { Sequelize, Random } = require('q-koa');
+
+
+exports.name = {
+  type: Sequelize.STRING,
+  comment: '名字',
+  allowNull: false,
+  is_mock: true,
+  defaultValue: '',
+  sortOrder: 1,
+  mock: () => Random.ctitle(),
+}
+
+exports.ename = {
+  type: Sequelize.STRING,
+  comment: '名字',
+  allowNull: false,
+  is_mock: true,
+  defaultValue: '',
+  sortOrder: 2,
+  mock: () => Random.ctitle(),
+}
+
+exports.key = {
+  type: Sequelize.STRING,
+  comment: '名字',
+  allowNull: false,
+  is_mock: true,
+  defaultValue: '',
+  sortOrder: 3,
+  mock: () => Random.ctitle(),
+}
+
+exports.is_on = {
+  type: Sequelize.BOOLEAN,
+  comment: '是否',
+  allowNull: false,
+  is_mock: true,
+  defaultValue: true,
+  sortOrder: 4,
+  mock: () => Random.boolean(),
+}

package/core/file/plugins/language_value/config.js

@@ -0,0 +1,21 @@
+module.exports = {
+  name: '语言包详情',
+  belongs: 'page',
+  multiple: false,
+  availableSort: false,
+  order: [],
+  referenceSelect: [],
+  select: [],
+  excludes: [],
+  limit: 20,
+  defaultOrder: [],
+  sortOrder: 1,
+  reference: [],
+  excludeAuth: [],
+  initList: [],
+  is_split: false,
+  is_split_count: false,
+  show_virtual: false,
+  deleteCheckList: [],
+  bulkCreateList: [],
+};

package/core/file/plugins/language_value/model.js

@@ -0,0 +1,34 @@
+const { Sequelize, Random } = require('q-koa')
+
+exports.language_id = {
+  type: Sequelize.MEDIUMINT.UNSIGNED,
+  comment: '语言设置',
+  allowNull: false,
+  is_mock: true,
+  defaultValue: 0,
+  sortOrder: 1,
+  mock: () => Random.integer(1, 5),
+}
+
+exports.content = {
+  type: Sequelize.TEXT('long'),
+  comment: '介绍',
+  allowNull: true,
+  is_mock: true,
+  defaultValue: null,
+  sortOrder: 3,
+  mock: () => Random.cparagraph(),
+  get: function () {
+    return this.getDataValue('content') || ''
+  },
+}
+
+exports.language_type_id = {
+  type: Sequelize.MEDIUMINT.UNSIGNED,
+  comment: '语言包',
+  allowNull: false,
+  is_mock: true,
+  defaultValue: 1,
+  sortOrder: 4,
+  mock: () => Random.integer(1, 5),
+}

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "q-koa",
-  "version": "10.7.7",
+  "version": "10.8.0",
   "description": "",
   "main": "index.js",
   "scripts": {

package/core/file/plugins/lang/config.js

@@ -1,4 +0,0 @@
-module.exports = {
-  name: '语言',
-  belongs: 'setting',
-};

package/core/file/plugins/lang/model.js

@@ -1,15 +0,0 @@
-const { Sequelize } = require('q-koa')
-
-exports.name = {
-  type: Sequelize.STRING,
-  comment: '名字',
-  allowNull: false,
-  defaultValue: '',
-}
-
-exports.key = {
-  type: Sequelize.STRING,
-  comment: 'key',
-  allowNull: false,
-  defaultValue: '',
-}