@mixd-id/web-scaffold 0.1.230406200 → 0.1.230406202

package/package.json

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

package/src/components/DataList.vue

@@ -1,10 +1,15 @@
 <template>
 	<div :class="$style.comp">
 
-    <component v-for="(item, idx) in dataItems"
+    <component v-for="(item, idx) in computedItems"
                :is="item.type"
                :key="item.key"
                :="item" />
+
+    <div v-show="hasNext">
+      <button type="button" @click="loadNext" class="p-3 w-full text-primary">Load More</button>
+    </div>
+
 	</div>
 </template>
 
@@ -14,36 +19,64 @@ import {componentMixin} from "../mixin/component";
 
 export default{
 
+  inject: [ 'pageLoad' ],
+
   mixins: [ componentMixin ],
 
   props: {
 
+    data: Object,
     datasource: Object,
 
     items: Array,
-
   },
 
   computed: {
 
+    computedData(){
+      return (this.pageData ?? {})[(this.datasource ?? {}).key] ?? {}
+    },
+
     dataItems(){
+      const dataItems = this.computedData.items ?? []
+      if(this.editMode === 1 && this.dataItems.length < 1) dataItems.push({})
+      return dataItems
+    },
+
+    computedItems(){
       if(this.items.length < 1) return []
 
       const items = []
-
-      const dataItems = ((this.pageData ?? {})[(this.datasource ?? {}).key] ?? {}).items ?? []
-
       const itemJSON = JSON.stringify(this.items[0])
 
-      for(let data of dataItems){
+      for(let data of this.dataItems){
         const item = JSON.parse(itemJSON)
         item.data = data
         items.push(item)
+
+        if(this.editMode === 1) break
       }
 
       return items
+    },
+
+    hasNext(){
+      return true
     }
 
+  },
+
+  methods: {
+
+    loadNext(){
+      if(!this.pageLoad) return
+
+      this.pageLoad({
+        ...this.datasource,
+        page: (this.computedData.page ?? 0) + 1
+      })
+    },
+
   }
 
 }

package/src/components/Link.vue

@@ -31,6 +31,7 @@
 <script>
 
 import { componentMixin } from "../mixin/component";
+import { applyDatasourceReplacer } from "../utils/helpers";
 
 export default{
 
@@ -63,10 +64,12 @@ export default{
       const obj = {}
 
       if(this.route.hash)
-        obj.hash = '#' + this.route.hash
+        obj.hash = '#' + (this.editMode === 1 ? this.route.hash :
+            applyDatasourceReplacer(this.route.hash, this.data))
 
       if(this.route.path)
-        obj.path = this.route.path
+        obj.path = this.editMode === 1 ? this.route.path :
+            applyDatasourceReplacer(this.route.path, this.data)
 
       return obj
     }

package/src/components/ListView.vue

@@ -419,18 +419,18 @@ export default{
           case 'create':
           case 'bulk-create':
           case 'update':
-						if(items[0] && Object.keys(items[0]).length <= 1 && Object.keys(items[0])[0] === 'uid'){
+						if(items[0] && (items[0].id || items[0].uid)){
 							this.socketEmit2(this.src, {
 								columns:this.config.columns,
 								preset:{
 									...this.preset,
 									filters: [{
 											enabled: true,
-											key: "uid",
+											key: items[0].uid ? "uid" : "id",
 											filters: [
 												{
 													operator: "in",
-													value: items.map((_) => _.uid)
+													value: items.map((_) => _.uid ?? _.id)
 												}
 											]
 										}

package/src/components/Modal.vue

@@ -1,48 +1,46 @@
 <template>
-  <div>
-    <Teleport to=".bW9k">
-      <Transition :name="computedTransition"
-									appear
-									@after-leave="onAfterLeave(); $emit('hide')"
-									@after-enter="$emit('show')">
-        <div v-if="currentState"
-             ref="modal"
-             :class="computedClass"
-             :style="computedStyle"
-						 :data-state="computedState ? 1 : 0">
-          <component v-if="Array.isArray(items) && items.length > 0"
-                     v-for="(item, idx) in items"
-                     :is="item.type"
-                     :key="item.key"
-                     :="item" />
-          <form v-else-if="useForm" @submit.prevent="$emit('submit')">
-            <div class="modal-head">
-              <slot name="head" :context="context"></slot>
-            </div>
-            <div :class="$style.modalBody">
-              <slot :context="context"></slot>
-            </div>
-            <div class="modal-foot">
-              <slot name="foot" :context="context"></slot>
-            </div>
-						<div v-if="isDisabled" :class="$style.overlay"></div>
-          </form>
-					<div v-else class="flex-1 min-h-0 flex flex-col relative">
-						<div class="modal-head">
-							<slot name="head" :context="context"></slot>
-						</div>
-						<div :class="$style.modalBody">
-							<slot :context="context"></slot>
-						</div>
-						<div class="modal-foot">
-							<slot name="foot" :context="context"></slot>
-						</div>
-						<div v-if="isDisabled" :class="$style.overlay"></div>
-					</div>
+  <Teleport to=".bW9k">
+    <Transition :name="computedTransition"
+                appear
+                @after-leave="onAfterLeave(); $emit('hide')"
+                @after-enter="$emit('show')">
+      <div v-if="currentState"
+           ref="modal"
+           :class="computedClass"
+           :style="computedStyle"
+           :data-state="computedState ? 1 : 0">
+        <component v-if="Array.isArray(items) && items.length > 0"
+                   v-for="(item, idx) in items"
+                   :is="item.type"
+                   :key="item.key"
+                   :="item" />
+        <form v-else-if="useForm" @submit.prevent="$emit('submit')">
+          <div class="modal-head">
+            <slot name="head" :context="context"></slot>
+          </div>
+          <div :class="$style.modalBody">
+            <slot :context="context"></slot>
+          </div>
+          <div class="modal-foot">
+            <slot name="foot" :context="context"></slot>
+          </div>
+          <div v-if="isDisabled" :class="$style.overlay"></div>
+        </form>
+        <div v-else class="flex-1 min-h-0 flex flex-col relative">
+          <div class="modal-head">
+            <slot name="head" :context="context"></slot>
+          </div>
+          <div :class="$style.modalBody">
+            <slot :context="context"></slot>
+          </div>
+          <div class="modal-foot">
+            <slot name="foot" :context="context"></slot>
+          </div>
+          <div v-if="isDisabled" :class="$style.overlay"></div>
         </div>
-      </Transition>
-    </Teleport>
-  </div>
+      </div>
+    </Transition>
+  </Teleport>
 </template>
 
 <script>

package/src/components/TextBlock.vue

@@ -21,7 +21,7 @@ export default{
 
     tagName: {
       type: String,
-      default: 'span'
+      default: 'div'
     }
 
 	},
@@ -29,7 +29,7 @@ export default{
   computed: {
 
     computedText(){
-      if(this.parentData){
+      if(this.parentData && this.editMode !== 1){
         return applyDatasourceReplacer(this.text, this.parentData)
       }
       return this.text

package/src/mixin/component.js

@@ -177,7 +177,6 @@ export const componentMixin = {
   data(){
     return {
       lastStyle: {},
-      store: null,
       page: null,
     }
   },

package/src/widgets/ComponentSetting.vue

@@ -371,6 +371,22 @@
           </div>
         </div>
 
+        <div>
+          <label class="text-text-400">Line Clamp</label>
+          <div v-for="(_, index) in viewTypes"
+               v-show="_.value === viewType">
+            <Dropdown v-model="lineClamp[index]">
+              <option value="">
+                {{ emptyComponentText('lineClamp', index) }}
+              </option>
+              <option v-for="opt in components.lineClamp"
+                      :value="`${viewType}${opt[1]}`">
+                {{ opt[0] }}
+              </option>
+            </Dropdown>
+          </div>
+        </div>
+
         <div>
           <label class="text-text-400">Letter Spacing</label>
           <div v-for="(_, index) in viewTypes"
@@ -1428,6 +1444,12 @@ export default{
 
       return this.item.props.letterSpacing
     },
+    lineClamp(){
+      if(!Array.isArray(this.item.props.lineClamp))
+        this.item.props.lineClamp = []
+
+      return this.item.props.lineClamp
+    },
     lineHeight(){
       if(!Array.isArray(this.item.props.lineHeight))
         this.item.props.lineHeight = []
@@ -1872,6 +1894,15 @@ export default{
           [ 'Wider', 'tracking-wider' ],
           [ 'Widest', 'tracking-widest' ],
         ],
+        lineClamp: [
+          [ '1', 'line-clamp-1' ],
+          [ '2', 'line-clamp-2' ],
+          [ '3', 'line-clamp-3' ],
+          [ '4', 'line-clamp-4' ],
+          [ '5', 'line-clamp-5' ],
+          [ '6', 'line-clamp-6' ],
+          [ 'None', 'line-clamp-none' ],
+        ],
         lineHeight: [
           [ 'None', 'leading-none' ],
           [ 'Tight', 'leading-tight' ],

package/src/widgets/WebPageBuilder.vue

@@ -1638,7 +1638,7 @@ export default{
         'zIndex',
 
         'autoFlow', 'alignItems', 'justifyContent',
-        'letterSpacing',
+        'letterSpacing', 'lineClamp',
 
         'animate',
 

package/tailwind.config.js

@@ -229,6 +229,9 @@ module.exports = {
     'underline', 'overline', 'line-through', 'no-underline',
     'truncate', 'text-ellipsis', 'text-clip',
 
+    'line-clamp-1', 'line-clamp-2', 'line-clamp-3',  'line-clamp-4',  'line-clamp-5',
+    'line-clamp-6', 'line-clamp-none',
+
     // // //
 
     'md:flex-wrap', 'md:flex-wrap-reverse', 'md:flex-nowrap',
@@ -447,6 +450,9 @@ module.exports = {
     'md:underline', 'md:overline', 'md:line-through', 'md:no-underline',
     'md:truncate', 'md:text-ellipsis', 'md:text-clip',
 
+    'md:line-clamp-1', 'md:line-clamp-2', 'md:line-clamp-3',  'md:line-clamp-4',  'md:line-clamp-5',
+    'md:line-clamp-6', 'md:line-clamp-none',
+
   ],
   theme: {
     extend: {