renusify 2.1.4 → 2.1.7

package/components/codeEditor/index.vue

@@ -44,14 +44,14 @@
         >&lt;script&gt;<br/>export default {</span
         >
                 <highlight-script ref="h-js" v-model="scr"></highlight-script>
-                <span v-show="scriptShow" class="color-orange">}<br/>&lt;script&gt;</span>
+                <span v-show="scriptShow" class="color-orange">}<br/>&lt;/script&gt;</span>
             </div>
             <div>
         <span v-show="styleShow" class="color-orange"
         >&lt;style lang<span class="color-green">="css"</span>&gt;</span
         >
                 <highlight-css ref="h-css" v-model="sty"></highlight-css>
-                <span v-show="styleShow" class="color-orange">&lt;style&gt;</span>
+              <span v-show="styleShow" class="color-orange">&lt;/style&gt;</span>
             </div>
         </div>
     </div>

package/components/countdown/index.js

@@ -1 +1 @@
-export * as rContDown from './index.vue'
+export * as rCountDown from './index.vue'

package/components/form/selectInput/index.vue

@@ -51,7 +51,7 @@
               :multiple="multiple"
               :modelValue="chips"
               :text="text"
-              :val="value"
+              :value="value"
               @update:modelValue="listInput"
               checked>
         <template v-slot="props">
@@ -183,7 +183,7 @@ export default {
       })
     },
     getValue() {
-      if (!this.searchLink && this.modelValue !== undefined && this.modelValue !== null) {
+      if (!this.searchLink && !this.tags && this.modelValue !== undefined && this.modelValue !== null) {
         if (typeof this.modelValue === 'string' || typeof this.modelValue === 'number') {
           const index = this.$helper.searchArray(this.genItems, this.value, this.modelValue)
           if (index === false) {

package/components/form/text-editor/style.scss

@@ -29,7 +29,7 @@
     color: var(--color-one)
   }
 
-  img {
+  img, video {
     max-width: 100%;
   }
 

package/components/list/index.vue

@@ -1,25 +1,25 @@
 <template>
-    <div :class="classes">
-      <div
-          class="list-item h-space-between"
-          :class="{'list-item-active':$helper.searchArray(list,text,item_value[text])!==false}"
-          :key="item_key"
-          @click.prevent="handle(item_value)"
-          v-for="(item_value,item_key) in genItems"
-          v-ripple
-      >
-        <slot :item="item_value">
-          <div class="list-title">{{ item_value[text] }}</div>
-          <transition name="fade">
-            <r-icon class="pe-1"
-                    exact
-                        v-html="$r.icons.check"
-                        v-if="(checked&&$helper.searchArray(list,text,item_value[text])!==false)"
-                ></r-icon>
-              </transition>
-            </slot>
-        </div>
+  <div :class="classes">
+    <div
+        v-for="(item_value,item_key) in genItems"
+        :key="item_key"
+        v-ripple
+        :class="{'list-item-active':$helper.searchArray(list,text,item_value[text])!==false}"
+        class="list-item h-space-between"
+        @click.prevent="handle(item_value)"
+    >
+      <slot :item="item_value">
+        <div class="list-title">{{ item_value[text] }}</div>
+        <transition name="fade">
+          <r-icon v-if="(checked&&$helper.searchArray(list,text,item_value[text])!==false)"
+                  class="pe-1"
+                  exact
+                  v-html="$r.icons.check"
+          ></r-icon>
+        </transition>
+      </slot>
     </div>
+  </div>
 </template>
 
 <script>
@@ -27,95 +27,96 @@ import './style.scss'
 import Ripple from '../../directive/ripple/index'
 
 export default {
-      name: 'r-list',
-      directives: {ripple: Ripple},
-      props: {
-        disabled: Boolean,
-        multiple: Boolean,
-        min: {type: Number, default: 0},
-        text: {type: String, default: 'name'},
-        value: {type: String, default: 'value'},
-        flat: Boolean,
-        rounded: Boolean,
-        subheader: Boolean,
-        checked: Boolean,
-        filter: String,
-        items: Array,
-        modelValue: {type: [Array, Object]}
-      },
-      emits:['update:modelValue'],
-        computed: {
-            list() {
-                if (this.modelValue) {
-                    return this.modelValue
-                }
-                return []
-            },
-            classes() {
-              let c = `${this.$r.prefix}list`
-                if (this.disabled) {
-                    c += ' list-disabled'
-                }
-                if (this.flat) {
-                    c += ' list-flat'
-                }
+  name: 'r-list',
+  directives: {ripple: Ripple},
+  props: {
+    disabled: Boolean,
+    multiple: Boolean,
+    min: {type: Number, default: 0},
+    text: {type: String, default: 'name'},
+    value: {type: String, default: 'value'},
+    flat: Boolean,
+    rounded: Boolean,
+    subheader: Boolean,
+    checked: Boolean,
+    filter: String,
+    items: Array,
+    modelValue: {type: [Array, Object]}
+  },
+  emits: ['update:modelValue'],
+  computed: {
+    list() {
+      if (this.modelValue) {
+        return this.modelValue
+      }
+      return []
+    },
+    classes() {
+      let c = `${this.$r.prefix}list`
+      if (this.disabled) {
+        c += ' list-disabled'
+      }
+      if (this.flat) {
+        c += ' list-flat'
+      }
 
-                if (this.rounded) {
-                    c += ' list-rounded'
-                }
+      if (this.rounded) {
+        c += ' list-rounded'
+      }
 
-                if (this.subheader) {
-                    c += ' list-subheader'
-                }
-                return c
-            },
-            genItems() {
-                const res = []
-                if (this.items) {
-                    const lng=this.items.length
-                    for (let i = 0; i < lng; i++) {
-                        if (typeof this.items[i] === 'object') {
-                            res[i] = this.items[i]
-                        } else {
-                            res[i] = {name: this.items[i].toString(), value: this.items[i]}
-                        }
-                    }
-                }
-                if (this.filter) {
-                    const re = new RegExp(this.filter, 'gi')
-                    return res.filter(function (el) {
-                        if (el.name && el.name.match(re)) {
-                            return el
-                        }
-                    })
-                }
-                return res
-            }
-        },
-        methods: {
-            handle(item) {
-              if (this.disabled) {
-                return
-              }
-              let val = this.list
-
-              const index = this.$helper.searchArray(val, this.text, item[this.text])
-
-              if (index !== false) {
-                if (val.length > this.min) {
-                  val.splice(index, 1)
-                }
-              } else {
-                if (!this.multiple) {
-                  val = []
-                    }
+      if (this.subheader) {
+        c += ' list-subheader'
+      }
+      return c
+    },
+    genItems() {
+      const res = []
+      if (this.items) {
+        const lng = this.items.length
+        for (let i = 0; i < lng; i++) {
+          if (typeof this.items[i] === 'object') {
+            res[i] = this.items[i]
+          } else {
+            res[i] = {[this.text]: this.items[i].toString(), [this.value]: this.items[i]}
+          }
+        }
+      }
+      if (this.filter) {
+        const re = new RegExp(this.filter, 'gi')
+        const text = this.text
+        return res.filter(function (el) {
+          if (el[text] && el[text].match(re)) {
+            return el
+          }
+        })
+      }
+      return res
+    }
+  },
+  methods: {
+    handle(item) {
+      if (this.disabled) {
+        return
+      }
+      let val = this.list
 
-                    val.push(item)
-                }
+      const index = this.$helper.searchArray(val, this.text, item[this.text])
 
-                this.$emit('update:modelValue', this.multiple?val:val[0])
-            }
+      if (index !== false) {
+        if (val.length > this.min) {
+          val.splice(index, 1)
         }
+      } else {
+        if (!this.multiple) {
+          val = []
+        }
+
+        val.push(item)
+      }
 
+      this.$emit('update:modelValue', this.multiple ? val : val[0])
     }
+  }
+
+}
 </script>

package/components/modal/style.scss

@@ -27,7 +27,7 @@
 
   .modal-content {
     border: 1px solid var(--color-sheet-container-low);
-    background-color: var(--color-sheet);
+    background-color: var(--color-sheet-container-low);
     color: var(--color-on-sheet)
   }
 

package/components/nestable/NestableItem.vue

@@ -23,7 +23,7 @@
       >
         <r-icon v-html="$r.icons.delete"></r-icon>
       </r-btn-confirm>
-      <slot :item="item"></slot>
+      <slot :item="item">{{ item }}</slot>
     </div>
 
     <div v-if="hasChildren" class="nestable-list ms-5">
@@ -54,7 +54,7 @@
             >
               <r-icon v-html="$r.icons.delete"></r-icon>
             </r-btn-confirm>
-            <slot :item="item" itemscope></slot>
+            <slot :item="item" itemscope>{{ item }}</slot>
           </template>
         </NestableItem>
       </template>

package/components/nestable/editable.js

@@ -1,7 +1,7 @@
 export default {
     data() {
         return {
-            name: null,
+            form: {},
         };
     },
     methods: {
@@ -20,13 +20,13 @@ export default {
         },
         add() {
             let items = this.modelValue;
-            items.push({
-                title: this.name,
+            Object.assign(this.form, {
                 [this.keyProp]: this.lastId(items) + 1,
                 [this.childrenProp]: [],
-            });
+            })
+            items.push(this.form);
             this.$emit("update:model-value", items);
-            this.name = null;
+            this.form = {};
         },
         del(item) {
             const removePath = this.getSplicePath(

package/components/nestable/index.vue

@@ -22,12 +22,14 @@
       </template>
     </div>
     <div v-if="editable" class="d-flex v-end w-full">
-      <div class="pe-1 flex-grow-1">
-        <r-text-input v-model="name" :label="labelInput"></r-text-input>
-      </div>
-      <r-btn :disabled="!name" class="color-success" icon @click="add">
-        <r-icon v-html="$r.icons.plus"></r-icon>
-      </r-btn>
+      <slot :add="add" :form="form" name="form">
+        <div class="pe-1 flex-grow-1">
+          <r-text-input v-model="form.title" :label="labelInput"></r-text-input>
+        </div>
+        <r-btn :disabled="!form.title" class="color-success" icon @click="add">
+          <r-icon v-html="$r.icons.plus"></r-icon>
+        </r-btn>
+      </slot>
     </div>
   </div>
 </template>

package/components/table/crud/index.vue

@@ -31,7 +31,7 @@
                             :is="item['type']"
                             :label="$t(key,'renusify')"
                             v-model="copyItem['d'][key]"
-                            v-bind="getAttr(table.option[key],copyItem['t'])"
+                            v-bind="getAttr(table.option[key],copyItem['t'])['props']"
                         ></component>
                     </template>
                 </div>

package/index.js

@@ -101,31 +101,39 @@ export default {
                 }
             }
         }
-
+        app.provide('$r', app.config.globalProperties.$r)
         // renusify toast
         app.config.globalProperties.$toast = function (message, options) {
             Toast.show(message, options);
         }
+        app.provide('$toast', app.config.globalProperties.$toast)
         // renusify storage
         app.config.globalProperties.$storage = Storage
+        app.provide('$storage', app.config.globalProperties.$storage)
 
         // renusify helper
         app.config.globalProperties.$helper = helper
+        app.provide('$helper', app.config.globalProperties.$helper)
         // renusify translate
         app.config.globalProperties.$translate = new Translate(app.config.globalProperties.$r, app.config.globalProperties.$storage)
+        app.provide('$translate', app.config.globalProperties.$translate)
         app.config.globalProperties.$dateTime = new DateTime(app.config.globalProperties.$r, app.config.globalProperties.$r.langs)
+        app.provide('$dateTime', app.config.globalProperties.$dateTime)
         app.config.globalProperties.$t = (key, package_name = null, lang = null) => app.config.globalProperties.$translate.get(key, package_name, lang)
+        app.provide('$t', app.config.globalProperties.$t)
         app.config.globalProperties.$d = (value, key = 'long', local = null) => app.config.globalProperties.$dateTime.formatLocal(value, key, local)
+        app.provide('$d', app.config.globalProperties.$d)
         const c = new Currency(app.config.globalProperties.$r)
         app.config.globalProperties.$n = (value) => c.formatLocal(value)
+        app.provide('$n', app.config.globalProperties.$n)
         // renusify validation
         const v = new valid(app.config.globalProperties.$t)
         app.config.globalProperties.$v = (names) => v.checkType(names)
-
+        app.provide('$v', app.config.globalProperties.$v)
         // install components
         let required_directive = _register(app, options['components'] || {});
         if (options['directives']) {
-            Object.assign(required_directive,options['directives'])
+            Object.assign(required_directive, options['directives'])
         }
         // install directives
         _registers(app, required_directive);

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "renusify",
-  "version": "2.1.4",
+  "version": "2.1.7",
   "description": "Vue3 Framework",
   "keywords": [
     "vuejs",

package/plugins/trans/Translate.js

@@ -99,7 +99,7 @@ export default class Translate {
             return val;
         } else if (this.$r && this.$r.autoAddTranslate && pack && this._count < 100 && /^([0-9a-z_.])*$/.test(key)) {
             if (!this._store.includes(key)) {
-                let url = '/translate/' + pack + '/' + key + '?v=';
+                let url = '/api/translate/' + pack + '/' + key + '?v=';
                 const lng = variable.length
                 for (let i = 0; i < lng; i++) {
                     url += '{' + i + '}';