@mixd-id/web-scaffold 0.1.230406008 → 0.1.230406009

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "@mixd-id/web-scaffold",
   "private": false,
-  "version": "0.1.230406008",
+  "version": "0.1.230406009",
   "scripts": {
     "dev": "vite serve",
     "build": "vite build",

package/src/components/ListPage1.vue

@@ -1,7 +1,9 @@
 <template>
 	<div :class="$style.comp">
 
-		<div class="flex-1 flex flex-col p-6 relative">
+		<slot v-if="$slots['empty'] && (Array.isArray(items) || items.length <= 0)" name="empty" :preset="preset" />
+
+		<div v-else class="flex-1 flex flex-col p-6 relative">
 
 			<div class="pb-0 flex flex-row gap-3 items-center mb-6">
 				<slot v-if="$slots['lp-start']" name="lp-start" :preset="preset"/>
@@ -922,7 +924,7 @@ export default{
 		patch(){
 			this.isLoading = this.isSummaryLoading = true
 			this.socketEmit(`${this.computedDataSource}.patch`, {
-				...(urlQuery().reset ? { reset:1 } : {})
+				...(urlQuery().reset !== null ? { reset:1 } : {})
 			}, (res) => {
 				const data = res.data ? res.data : res
 				this.isLoading = this.isSummaryLoading = false

package/src/utils/helpers.js

@@ -1,5 +1,6 @@
 const md5 = require("md5");
 const fs = require("fs");
+const { Op } = module.parent.require('sequelize')
 
 
 const ceil = (num, precision = 0) => {
@@ -188,6 +189,43 @@ const sequelizeChunk = async (model, opt, callback, chunkSize = 5000) => {
   }
 }
 
+const getPresetSortWhereParams = (order, afterItem) => {
+
+  if(order.filter((_) => _[0] === 'id').length <= 0){
+    order.push([ 'id', 'desc' ])
+  }
+
+  const opOr = []
+  for(let i = 0 ; i < order.length ; i++){
+
+    const obj = order[i]
+
+    if(obj.length !== 2) continue
+
+    const exp = {}
+    for(let j = 0 ; j < i ; j++){
+      exp[order[j][0]] = afterItem[order[j][0]]
+    }
+    exp[obj[0]] = obj[1] === 'desc' ? { [Op.lt]:afterItem[obj[0]] } : { [Op.gt]:afterItem[obj[0]] }
+
+    if(Object.keys(exp).length === 1){
+      opOr.push(exp)
+    }
+    else{
+      opOr.push({
+        [Op.and]: exp
+      })
+    }
+  }
+
+  let sortWhere = {}
+  if(opOr.length > 0){
+    sortWhere = {
+      [Op.or]: opOr
+    }
+  }
+  return sortWhere
+}
 
 module.exports = {
   ceil,
@@ -204,5 +242,6 @@ module.exports = {
   strVars,
   writeStorage,
   bufferToStream,
-  sequelizeChunk
+  sequelizeChunk,
+  getPresetSortWhereParams
 }

package/src/utils/listpage1.js

@@ -2,6 +2,7 @@ const { Op } = module.parent.require('sequelize')
 const Sequelize = module.parent.require('sequelize')
 const dayjs = require("dayjs");
 const Exceljs = require("exceljs");
+const { getPresetSortWhereParams } = require("./helpers");
 
 let ListPage1 = {
 
@@ -493,7 +494,7 @@ let ListPage1 = {
     }
 
     if(afterItem){
-      const sortWhere = this.getPresetSortWhereParams(order, afterItem)
+      const sortWhere = getPresetSortWhereParams(order, afterItem)
       where = {
         ...where,
         ...sortWhere
@@ -1402,42 +1403,6 @@ let ListPage1 = {
     return {}
   },
 
-  getPresetSortWhereParams(order, afterItem){
-
-    if(order.filter((_) => _[0] === 'id').length <= 0){
-      order.push([ 'id', 'desc' ])
-    }
-
-    const opOr = []
-    for(let i = 0 ; i < order.length ; i++){
-
-      const obj = order[i]
-
-      const exp = {}
-      for(let j = 0 ; j < i ; j++){
-        exp[order[j][0]] = afterItem[order[j][0]]
-      }
-      exp[obj[0]] = obj[1] === 'desc' ? { [Op.lt]:afterItem[obj[0]] } : { [Op.gt]:afterItem[obj[0]] }
-
-      if(Object.keys(exp).length === 1){
-        opOr.push(exp)
-      }
-      else{
-        opOr.push({
-          [Op.and]: exp
-        })
-      }
-    }
-
-    let sortWhere = {}
-    if(opOr.length > 0){
-      sortWhere = {
-        [Op.or]: opOr
-      }
-    }
-    return sortWhere
-  },
-
 
 
   async onHooks(model, event, items, socket){