mdkcontroller 1.2.2 → 1.3.0

package/Cores/file/DKGrid.css

@@ -1,3 +1,14 @@
+.dk-table textarea {
+  resize: none;
+  overflow: auto;
+  scrollbar-width: none;
+}
+
+.dk-table textarea::-webkit-scrollbar {
+  display: none;
+  /* Chrome & Safari */
+}
+
 .dk-table {
   font-family: Arial, Helvetica, sans-serif;
   border-collapse: collapse;
@@ -7,6 +18,7 @@
 
 .dk-table td {
   border: 1px solid #ddd;
+  overflow: hidden;
 }
 
 .dk-table th {
@@ -55,7 +67,7 @@
 .dk-table .RowNavigator td {
   background: white;
   border-bottom: 1px solid #ff2828d6;
-  border-radius: 7px;
+  /* border-radius: 7px; */
 }
 
 .dk-table .edit {
@@ -67,6 +79,7 @@
 }
 
 .dk-table .RowNavigator td>input,
+.dk-table .RowNavigator td>textarea,
 .dk-table .RowNavigator td>select {
   height: 23px;
   font-size: 18px;
@@ -80,51 +93,28 @@
   background-color: #f1f1f1;
 }
 
-.dk-table .edit input[type="checkbox"] {
+/* .dk-table .edit input[type="checkbox"] {
   min-height: 22px;
   width: 30px;
   margin: auto;
   display: block;
-}
+} */
 
-.dk-table .edit input[type="checkbox"]:disabled {
+/* .dk-table .edit input[type="checkbox"]:disabled {
   cursor: not-allowed;
 }
 
 .dk-table .edit input:not([type="checkbox"]) :focus {
   outline: 1px solid rgba(65, 185, 65, 0.705);
-}
+} */
 
-.dk-table .edit input:not(:disabled),
-.dk-table .edit select {
+.dk-table .edit td * {
   display: block;
-  color: #495057;
-  background-color: #fff;
-  background-image: none;
-  background-clip: padding-box;
-  border: 1px solid rgba(0, 0, 0, 0.15);
-  border-radius: 0.25rem;
-  transition: border-color ease-in-out 0.15s, box-shadow ease-in-out 0.15s;
   width: -webkit-fill-available;
   padding: 0;
+  border: 0px;
   outline: none;
-}
-
-.dk-actionsBar {
-  padding: 5px 10px;
-  width: max-content;
-}
-
-.dk-actionsBar button {
-  border: 2px solid #0e9966b6;
-  border-radius: 5px;
-  cursor: pointer;
-  transition: all 1s;
-}
-
-.dk-actionsBar button:active,
-.dk-actionsBar button:hover {
-  border-color: #0fbd7db6;
+  font-family: sans-serif;
 }
 
 .active {

package/Cores/file/DKGrid.js

@@ -65,12 +65,13 @@ class DKGrid {
         let totalWidth = 0;
         const colWidths = this.config.column.map(f => {
             let width = f.width || (f.dataType === "string" ? 200 : f.dataType === "date" ? 140 : f.dataType === "number" ? 100 : 80);
+            f.width = width;
             totalWidth += width;
             return `<col style="width: ${width}px;">`;
         }).join("");
         this.editorDefault = '<tr>' + this.config.column.map(f => {
             switch (f.dataType) {
-                case "string": return `<td><input type='text'name='${f.fieldName}'/></td>`;
+                case "string": return `<td><textarea name='${f.fieldName}'></textarea></td>`;
                 case "bool": return `<td><input type="checkbox" name='${f.fieldName}'></td>`;
                 case "date": return `<td><input type="date" name='${f.fieldName}'></td>`;
                 case "number": return `<td><input type="number" name='${f.fieldName}'></td>`;
@@ -142,8 +143,9 @@ class DKGrid {
         const dkgrid = this;
         this.tableEditor.addEventListener('keydown', function (event) {
             const keyCode = event.keyCode || event.which;
-
-            dkgrid.#keyDownOnTable(keyCode);
+            if (!event.shiftKey) {
+                dkgrid.#keyDownOnTable(keyCode);
+            }
         });
 
         this.tableRaw.addEventListener('click', function (event) {
@@ -245,8 +247,9 @@ class DKGrid {
         tbEditor.querySelector('tbody').querySelectorAll('td').forEachExt(
             child => {
                 const input = child.firstChild;
+                input.style.height = (trTag.clientHeight) + 'px';
                 try {
-                    if (input.tagName == "INPUT" || input.tagName == "SELECT") {
+                    if (input.tagName == "INPUT" || input.tagName == "SELECT" || input.tagName == "TEXTAREA") {
                         if (input.tagName == "SELECT") {
                             let itemSelector = tableConfig.column.find(f => f.fieldName == input.name).items;
                             this.fireEvent('onSelectorSelecting', (rs) => {
@@ -289,7 +292,7 @@ class DKGrid {
             tbEditor.querySelector('tbody').querySelectorAll('td').forEachExt(
                 child => {
                     const input = child.firstChild;
-                    if (input.tagName == "INPUT" || input.tagName == "SELECT") {
+                    if (input.tagName == "INPUT" || input.tagName == "SELECT" || input.tagName == "TEXTAREA") {
                         objectEditing[input.name] = input.value;
                         if (input.type == 'checkbox') {
                             objectEditing[input.name] = input.checked;
@@ -476,7 +479,7 @@ class DKGrid {
             this.fireEvent('onAddNewRow', null, newOb);
         }
         if (!newOb[primaryKey]) {
-            newOb[primaryKey] = DKGrid.generateRandomString(32);
+            newOb[primaryKey] = Date.now() + '_' + DKGrid.generateRandomString(12);
         }
         newTR.dataset.primaryValue = newOb[primaryKey];
         const cache = this.#cache;

package/dk_modules/authorization.js

@@ -12,11 +12,16 @@ function isCalledFromNodeModules() {
     return false;
 }
 
-export default function (db) {
-    const tbLoginToken = db.data.loginTokens;
-    const tbUser = db.data.users;
+export default function () {
+
     const isModule = isCalledFromNodeModules();
     const validateBase = function name(req, res) {
+        const db = global.db;
+        db.data.loginTokens = db.data.loginTokens || [];
+        const tbLoginToken = db.data.loginTokens;
+        db.data.users = db.data.users || [];
+        const tbUser = db.data.users;
+
         const accessToken = req.cookies?.access_token;
         if (accessToken) {
             const datenow = new Date();
@@ -38,20 +43,20 @@ export default function (db) {
         }
     }
     console.log(
-        "Module dk_modules/authorization.js: (db)=>{ validate:fn, validateBool:fn }"
+        "Module dk_modules/authorization.js: ()=>{ validate:fn, validateBool:fn }"
     );
     return {
         validate: (req, res, next) => {
             const resultValidate = validateBase(req, res);
             switch (resultValidate) {
                 case 0:
-                    return res.status(401).json({message: 'Token không được cung cấp'});
+                    return res.status(401).json({ message: 'Token không được cung cấp' });
                 case 1:
 
                     next();
                     break;
                 case -1:
-                    return res.status(401).json({message: 'Token không hợp lệ'});
+                    return res.status(401).json({ message: 'Token không hợp lệ' });
             }
         },
         validateBool: (req, res) => {

package/dk_modules/autoSequence.js

@@ -1,23 +1,23 @@
-export default (db) => {
+
+
+export const getNumber = (name) => {
+    const db = global.db;
+    db.data.autoSequenceNumber = db.data.autoSequenceNumber || [];
     const tbSequence = db.data.autoSequenceNumber;
+    let continueNumber = tbSequence.find(f => f.name == name);
+    if (!continueNumber) {
+        tbSequence
+            .push({
+                name: name,
+                currentNumber: 0
+            });
+        continueNumber = tbSequence.find(f => f.name == name);
+    }
+    continueNumber.currentNumber += 1
+    db.write();
+    return continueNumber.currentNumber;
+};
 
-    console.log(
-        "Module dk_modules/autoSequence.js: (db)=>{ getNumber:fn }"
-    );
-    return {
-        getNumber: (name) => {
-            let continueNumber = tbSequence.find(f => f.name == name);
-            if (!continueNumber) {
-                tbSequence
-                    .push({
-                        name: name,
-                        currentNumber: 0
-                    });
-                continueNumber = tbSequence.find(f => f.name == name);
-            }
-            continueNumber.currentNumber += 1
-            db.write();
-            return continueNumber.currentNumber;
-        }
-    };
-}
+console.log(
+    "Module dk_modules/autoSequence.js: ()=> getNumber:fn"
+);

package/dk_modules/users.js

@@ -1,23 +1,24 @@
 import authInstant from "./authorization.js";
-import autoSequenceInstant from "./autoSequence.js";
-import {generateRandomToken, privateKey} from "./dkvar.js";
+import { getNumber } from "./autoSequence.js";
 
 export default (router, db) => {
 
-    const auth = authInstant(db);
-    const autoNumber = autoSequenceInstant(db);
+    const auth = authInstant();
+
+    db.data.users = db.data.users || [];
     const tbUser = db.data.users;
+    db.data.loginTokens = db.data.loginTokens || [];
     const tbLoginToken = db.data.loginTokens;
 
 
     router.get("/users/gets", auth.validate, (req, res) => {
-        res.json({message: "Get all users"});
+        res.json({ message: "Get all users" });
     });
 
     router.get("/users/get", auth.validate, (req, res) => {
         const userId = req.params.id;
-        const userO = tbUser.find({id: parseInt(userId)});
-        res.json({message: `Get user with ID ${userId}`, user: userO});
+        const userO = tbUser.find({ id: parseInt(userId) });
+        res.json({ message: `Get user with ID ${userId}`, user: userO });
     });
     router.get('/users/logout', async (req, res) => {
         const accessToken = req.cookies?.access_token;
@@ -26,7 +27,7 @@ export default (router, db) => {
             tbLoginToken.slice(indexToken, 1);
             await db.write();
         }
-        res.clearCookie('access_token', {httpOnly: true});
+        res.clearCookie('access_token', { httpOnly: true });
         res.clearCookie('sessionUExt', {});
         res.redirect('/login');
     });
@@ -37,26 +38,26 @@ export default (router, db) => {
             let userLoging = tbUser.find(f => f.userName == bodyParser.userName.toLowerCase() && f.password == bodyParser.password);
             if (userLoging) {
                 const userIdCode = await auth.encrypt(userLoging.userName);
-                const accessToken = userIdCode + generateRandomToken(100);
+                const accessToken = userIdCode + global.generateRandomToken(100);
 
                 const expiredValue = new Date();
                 expiredValue.setMonth(expiredValue.getMonth() + 1);
 
                 tbLoginToken.push({
-                    id: autoNumber.getNumber('loginTokens'),
+                    id: getNumber('loginTokens'),
                     userId: userLoging.id,
                     tokenString: accessToken,
                     expired: expiredValue
                 });
                 await db.write();
-                res.cookie('access_token', accessToken, {httpOnly: true, expires: expiredValue});
-                res.cookie('sessionUExt', userIdCode, {expires: expiredValue});
-                res.json({message: `Đăng nhập thành công.`, success: true});
+                res.cookie('access_token', accessToken, { httpOnly: true, expires: expiredValue });
+                res.cookie('sessionUExt', userIdCode, { expires: expiredValue });
+                res.json({ message: `Đăng nhập thành công.`, success: true });
             } else {
-                res.json({message: `Tài khoản hoặc mật khẩu không chính xác.`, success: false});
+                res.json({ message: `Tài khoản hoặc mật khẩu không chính xác.`, success: false });
             }
         } else {
-            res.json({message: `Không đủ thông tin để đăng nhập.`, success: false});
+            res.json({ message: `Không đủ thông tin để đăng nhập.`, success: false });
         }
     });
     router.get("/users/tryGetAccess", (req, res) => {
@@ -65,13 +66,13 @@ export default (router, db) => {
             const accessToken = req.cookies?.access_token;
             const expiredValue = new Date();
             expiredValue.setMonth(expiredValue.getMonth() + 1);
-            res.cookie('access_token', accessToken, {httpOnly: true, expires: expiredValue});
+            res.cookie('access_token', accessToken, { httpOnly: true, expires: expiredValue });
         }
-        res.json({success: true, isLogin: isLogin});
+        res.json({ success: true, isLogin: isLogin });
     });
     router.post("/users/create", async (req, res) => {
         if (!global.allowRegister) {
-            res.json({message: `Chức năng đăng ký tài khoản mới không được cung cấp.`, success: false});
+            res.json({ message: `Chức năng đăng ký tài khoản mới không được cung cấp.`, success: false });
             return;
         }
         const bodyParser = req.body;
@@ -80,12 +81,12 @@ export default (router, db) => {
             if (!newUser) {
                 let validateUserName = tbUser.find(f => f.userName == bodyParser.userName.toLowerCase());
                 if (validateUserName) {
-                    res.json({message: `Tên tài khoản đã có người đăng ký.`, success: false});
+                    res.json({ message: `Tên tài khoản đã có người đăng ký.`, success: false });
                     return;
                 }
                 tbUser
                     .push({
-                        id: autoNumber.getNumber('users'),
+                        id: getNumber('users'),
                         userName: bodyParser.userName.toLowerCase(),
                         email: bodyParser.email.toLowerCase(),
                         password: bodyParser.password,
@@ -107,14 +108,14 @@ export default (router, db) => {
                 });
             }
         } else {
-            res.json({message: `Không đủ thông tin để tạo User mới.`, success: false});
+            res.json({ message: `Không đủ thông tin để tạo User mới.`, success: false });
         }
     });
 
     console.log(
         "Module dk_modules/users.js: (db)=>{ router: router, table: tbUser }"
     );
-    return {router: router, table: tbUser};
+    return { router: router, table: tbUser };
 };
 
 // // Thêm một người dùng mới

package/index.js

@@ -1,7 +1,9 @@
 import main from "./main.js"
 import authen from "./dk_modules/authorization.js"
-import ause from "./dk_modules/autoSequence.js"
+import { getNumber } from "./dk_modules/autoSequence.js"
 
 export const Root = async (a, b) => await main(a, b);
-export const Authen = (db) => authen(db);
-export const Sequense = (db) => ause(db);
+export const Authen = () => authen();
+export const Sequense = (key) => {
+    return getNumber(key);
+}

package/main.js

@@ -12,7 +12,6 @@ import authInstant from "./dk_modules/authorization.js";
 
 import {fileURLToPath} from "url";
 import path from 'path';
-// import {privateKey, encodeMini} from "./dk_modules/dkvar.js";
 
 export default async function (appname, cfgHandler = {}) {
 
@@ -22,7 +21,7 @@ export default async function (appname, cfgHandler = {}) {
     const app = express();
     const server = createServer(app);
     const db = await dbInstant(appname + "-Database.json");
-    const auth = authInstant(db);
+    const auth = authInstant();
     const userRoutes = userInstant(Router(), db);
 
     app.use(json());

package/package.json

@@ -9,15 +9,14 @@
     "socket.io": "^4.7.2"
   },
   "name": "mdkcontroller",
-  "version": "1.2.2",
+  "version": "1.3.0",
   "keywords": [],
   "author": "KHANHNBD <khanh272421@gmail.com>",
   "license": "ISC",
   "description": "Quick setup authentication and express",
   "type": "module",
   "exports": {
-    ".": "./index.js",
-    "./autosequence": "./dk_modules/autoSequence.js"
+    ".": "./index.js"
   },
   "types": "./index.js",
   "files": [
@@ -27,4 +26,4 @@
     "Cores/",
     "dk_modules/"
   ]
-}
+}

package/dk_modules/dkvar.js

@@ -1,13 +0,0 @@
-import {Buffer} from 'node:buffer';
-
-export const privateKey = 'eyJzdWIiOiI5Nzc4IiwibmFtZSI6IkRraGFuaE1NTSIsImlhdCI6ODkxMDB9';
-
-export function generateRandomToken(length = 100) {
-    const characters = 'ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz0123456789';
-    let token = '';
-    for (let i = 0; i < length; i++) {
-        const randomIndex = Math.floor(Math.random() * characters.length);
-        token += characters.charAt(randomIndex);
-    }
-    return token;
-}