明树Git Lab

Skip to content

J
jt_backend
Commit 84b48c72 authored by zfp1's avatar zfp1
Browse files
Options

update

parent bd026acc
Pipeline #105991 passed with stage
    in 3 seconds
    Show whitespace changes
    Inline Side-by-side
    Showing with 25 additions and 24 deletions
    .gitignore
    View file @ 84b48c72
    ...@@ -7,3 +7,4 @@ test.js ...@@ -7,3 +7,4 @@ test.js
    public/avatar public/avatar
    config/local.json config/local.json
    .gitlab-ci.yml .gitlab-ci.yml
    /jb
    \ No newline at end of file
    controller/resourceController.js
    View file @ 84b48c72
    ...@@ -290,8 +290,8 @@ async function listResourceAll(req, res, next) { ...@@ -290,8 +290,8 @@ async function listResourceAll(req, res, next) {
    // console.log(element.resourcesInfos, "==") // console.log(element.resourcesInfos, "==")
    if (element.type == 2) { if (element.type == 2) {
    element.resourcesInfos = utils.buildTree2(element.resourcesInfos, { element.resourcesInfos = utils.buildTree2(element.resourcesInfos, {
    keyName: "code", keyName: "key",
    parentKeyName: 'parentCode', parentKeyName: 'parentKey',
    }); });
    } }
    obj[element.key] = _.orderBy(element.resourcesInfos || [], 'order', 'asc'); obj[element.key] = _.orderBy(element.resourcesInfos || [], 'order', 'asc');
    ......
    db/model/jt/resourcesInfo.js
    View file @ 84b48c72
    ...@@ -9,14 +9,14 @@ const ResourcesInfo = sequelize.define('ResourcesInfo', { ...@@ -9,14 +9,14 @@ const ResourcesInfo = sequelize.define('ResourcesInfo', {
    primaryKey: true, primaryKey: true,
    autoIncrement: true autoIncrement: true
    }, },
    code: { // code: {
    type: DataTypes.STRING, // type: DataTypes.STRING,
    comment: "资源库字段key" // comment: "资源库字段key"
    }, // },
    parentCode: { // parentCode: {
    type: DataTypes.STRING, // type: DataTypes.STRING,
    comment: "资源库key" // comment: "资源库key"
    }, // },
    key: { key: {
    type: DataTypes.STRING, type: DataTypes.STRING,
    comment: "资源库字段key" comment: "资源库字段key"
    ...@@ -29,24 +29,24 @@ const ResourcesInfo = sequelize.define('ResourcesInfo', { ...@@ -29,24 +29,24 @@ const ResourcesInfo = sequelize.define('ResourcesInfo', {
    type: DataTypes.STRING, type: DataTypes.STRING,
    comment: "资源库字段value" comment: "资源库字段value"
    }, },
    parentId: { // parentId: {
    type: DataTypes.INTEGER, // type: DataTypes.INTEGER,
    comment: "父级ID" // comment: "父级ID"
    }, // },
    parentIds: { // parentIds: {
    type: DataTypes.STRING(500), // type: DataTypes.STRING(500),
    }, // },
    order: { order: {
    type: DataTypes.INTEGER, type: DataTypes.INTEGER,
    comment: "排序字段", comment: "排序字段",
    defaultValue: 0 defaultValue: 0
    }, },
    dictId: { // dictId: {
    type: DataTypes.STRING, // type: DataTypes.STRING,
    }, // },
    fid: { // fid: {
    type: DataTypes.STRING, // type: DataTypes.STRING,
    }, // },
    resourceId: { resourceId: {
    type: DataTypes.INTEGER, type: DataTypes.INTEGER,
    comment: "所属资源库ID", comment: "所属资源库ID",
    ......
    Markdown is supported
    0% or
    You are about to add 0 people to the discussion. Proceed with caution.
    Finish editing this message first!
    Please register or to comment