dfish-widget 0.1.503 → 1.0.0

package/lib/index.esm.js

@@ -2,7 +2,7 @@ import lodash from 'lodash';
 import jquery from 'jquery';
 import http from 'axios';
 import Qs from 'qs';
-import { h, mergeProps, resolveComponent, openBlock, createBlock, withCtx, createVNode, toDisplayString, createCommentVNode, renderSlot, createTextVNode, Teleport, toRaw, defineAsyncComponent, Fragment, renderList, getCurrentInstance, ref, computed, onMounted, watch, createSlots, withModifiers } from 'vue';
+import { h, mergeProps, resolveComponent, openBlock, createBlock, withCtx, createVNode, toDisplayString, createCommentVNode, renderSlot, createTextVNode, toRaw, Fragment, renderList, Teleport, getCurrentInstance, ref, computed, onMounted, watch, createSlots, withModifiers } from 'vue';
 import ResizeObserver from 'resize-observer-polyfill';
 
 let u = navigator.userAgent.toLowerCase();
@@ -1359,13 +1359,6 @@ $$1.vm = (a) => {
   return a.isView ? a : a.ownerView
 };
 
-$$1.dialog = (a) => {
-  if (!a) return
-  a = $$1.vm(a);
-  while (a && !a.isDialog) a = a.ownerView;
-  return a
-};
-
 $$1.close = (a) => {
   let d = $$1.dialog(a);
   d && d.close();
@@ -1531,7 +1524,7 @@ $$1.ajax = function(cmd, args) {
     $$1.extend(config, {responseType: 'blob'});
   }
   lock && lock();
-  cmd.loading && ctx.exec({type: 'Loading'}, null, cmd.loading);
+  cmd.loading && ctx.pop('w-loading', cmd.loading);
   return (cmd.data ? $$1.http.post(src, queryEncode(cmd.data, config), config) : $$1.http.get(src, config))
     .then(res => {
       lock && lock(false);
@@ -1539,7 +1532,7 @@ $$1.ajax = function(cmd, args) {
       if (cmd.filter) data = cmd.filter(res, ctx);
       if (cmd.success) cmd.success(data, ctx);
       if (cmd.complete) cmd.complete(res, ctx);
-      cmd.loading && ctx.cmd({type: 'Loading', hide: true});
+      cmd.loading && ctx.pop('w-loading', false);
       if (cmd.download) {
         let disposition = res.headers['content-disposition'];
         if (disposition) {
@@ -1573,75 +1566,24 @@ $$1.extend($$1.ajax, {
   }
 }, http);
 
-$$1.cmdHooks = {
-  Submit(cmd, args) {
-    $$1.urlFormat(cmd.src, args);
-    const vm = $$1.vm(this);
-    const submit = () => new Promise(rsv => this.$nextTick(() => {
-      let d = cmd.validate || false;
-      let f = vm.getFormList(d.range || cmd.range);
-      let g = d.range && d.range != cmd.range ? vm.getFormList(cmd.range) : f;
-      if (vm.valid(f, d.group)) {
-        cmd.context = cmd.context || this;
-        let post = vm.getPostData(g);
-        cmd.data = cmd.data ? $$1.extend(cmd.data, post) : post;
-        $$1.ajax(cmd, args).then(data => rsv(data));
-      }
-    }));
-    return submit()
-  },
-  Ajax(cmd, args) {
-    cmd.context = cmd.context || this;
-    return $$1.ajax(cmd, args)
-  },
-  Dialog(cmd, args) {
-    if (cmd.title) cmd.title = $$1.strFormat(cmd.title, args);
-    return $$1.vm(this).cmdDialog(cmd, args, this)
-  },
-  Alert(cmd, args) {
-    if (cmd.text) cmd.text = $$1.strFormat(cmd.text, args);
-    return $$1.vm(this).cmdDialog(cmd, args, this)
-  },
-  Confirm(cmd, args) {
-    if (cmd.text) cmd.text = $$1.strFormat(cmd.text, args);
-    return $$1.vm(this).cmdDialog(cmd, args, this)
-  },
-  Tip(cmd, args) {
-    if (cmd.text) cmd.text = $$1.strFormat(cmd.text, args);
-    return $$1.vm(this).cmdDialog(cmd, args, this)
-  },
-  Menu(cmd, args) {
-    return $$1.vm(this).cmdDialog(cmd, args, this)
-  },
-  Loading(cmd, args) {
-    return $$1.vm(this).cmdDialog(cmd, args, this)
-  },
-};
-
-$$1.isCmd = function(a) {
-  return a && a.type && $$1.cmdHooks[a.type]
-};
-
 $$1.alert = function(text, position, timeout, yes) {
-  $$1.docView.cmd(typeof text === 'object' ? {type: 'Alert', title: '操作提示', ...text} : {
-    type: 'Alert', title: '操作提示', text, position, timeout, yes
+  $$1.docView.pop('w-alert', typeof text === 'object' ? {title: '操作提示', ...text} : {
+    title: '操作提示', text, position, timeout, yes
   });
 };
 
 $$1.confirm = function(text, yes, no, cover) {
-  $$1.docView.cmd(typeof text === 'object' ? {type: 'Confirm', title: '操作提示', ...text} : {
-    type: 'Confirm', title: '操作提示', text, yes, no, cover
+  $$1.docView.pop('w-confirm', typeof text === 'object' ? {title: '操作提示', ...text} : {
+    title: '操作提示', text, yes, no, cover
   });
 };
 
-// $.directiveHooks = {
-//   colspan(el, v, n) {
-//     el.style.gridColumn = !v || v == -1 ? '' : `span ${v}`
-//   },
-//   rowspan(el, v, n) {
-//     el.style.gridRow = !v || v == -1 ? '' : `span ${v}`
-//   }
-// }
+$$1.dialog = (a) => {
+  if (!a) return
+  a = $$1.vm(a);
+  while (a && !a.isDialog) a = a.ownerView;
+  return a
+};
 
 $$1.config = function(opt) {
   $$1.config_uid = uid(); //读取默认配置的地方有缓存，根据这个uid来判断是否刷新缓存
@@ -1817,25 +1759,32 @@ const bindCache = {};
           ...dftopt,
         }
       },
-      cmd(o, ...args) {
-        return this.exec(o, args)
-      },
-      exec(cmd, args, feat) {
-        if (typeof cmd === 'string') {
-          cmd = $$1.vm(this).commands[cmd];
-        }
-        if (cmd) {
-          if (typeof cmd === 'function') {
-            return cmd(args, this)
-          } else if (typeof cmd === 'object') {
-            let ncm = $$1.extendDeep({}, cmd);
-            feat && $$1.merge(ncm, feat);
-            if ($$1.cmdHooks[ncm.type]) {
-              return $$1.cmdHooks[ncm.type].call(this, ncm, args)
-            }
-          }
-        }
-      },
+			ajax(cmd) {
+				cmd.context = cmd.context || this;
+				return $$1.ajax(cmd)
+			},
+			submit(cmd) {
+				const vm = $$1.vm(this);
+				return new Promise(rsv => this.$nextTick(() => {
+				  let d = cmd.validate || false;
+				  let f = vm.getFormList(d.range || cmd.range);
+				  let g = d.range && d.range != cmd.range ? vm.getFormList(cmd.range) : f;
+				  if (vm.valid(f, d.group)) {
+				    let post = vm.getPostData(g);
+				    cmd.data = cmd.data ? $$1.extend(cmd.data, post) : post;
+				    this.ajax(cmd).then(data => rsv(data));
+				  }
+				}))
+			},
+			pop(template, props) {
+				let vm = $$1.vm(this);
+				if (props === false) {
+					vm.getPops(template).forEach(p => vm.removePop(p));
+				} else {
+					let npr = $$1.extendDeep({}, props);
+					return vm.createPop(template, npr, this)
+				}
+			},
       trigger(ev, ...args) {
         let type = ev.runType || ev.type || ev;
         let f = this.getOn(type);
@@ -2319,52 +2268,19 @@ script$1g.render = render$9;
 script$1g.__file = "src/template/TemplateLoading.vue";
 
 const templateHooks = {
-    Alert: script$1j,
-    Confirm: script$1i,
-    Tip: script$1h,
-    Loading: script$1g
+    'w-alert': script$1j,
+    'w-confirm': script$1i,
+    'w-tip': script$1h,
+    'w-loading': script$1g
   };
   
   var script$1f = {
     name: 'w-pop',
     props: ['p'],
-    methods: {
-      get() {
-        return new Promise((rs, rj) => this.$nextTick(() => {
-          if (this.$refs.root) {
-            rs(this.$refs.root);
-          } else {
-            this.$watch('asyncComp', c => this.$nextTick(() => {
-              this.error ? rj(this.error) : (this.$refs.root && rs(this.$refs.root));
-            }));
-          }
-        }))
-      }
-    },
     render() {
-      if (this.p.hidden) return h(Teleport, {to: '#w-dfish-pops'})
-      let props = $$1.lodash.omit(this.p.cmd, 'template');
-      let t = this.p.cmd.template;
-      let com;
-      if (t) {
-        if (typeof t === 'object') {
-          com = toRaw(t);
-        } else {
-          let loader = t;
-          if (typeof t === 'string') {
-            t = t.startsWith('@/') ? t.slice(2) : ($$1.x.templateDir || '') + t;
-            if (!t.endsWith('.vue')) t += '.vue';
-            loader = () => import(/* @vite-ignore */`@/${t}`);
-          }
-          com = defineAsyncComponent({
-            loader,
-            errorComponent: () => h(script$1j, {text: `${t} 不存在`, ref: 'error', icon: 'error', title: '操作提示', style: {width: 'auto', height: 'auto'}}),
-          });
-        }
-      } else {
-        com = toRaw(templateHooks[this.p.cmd.type]);
-      }
-      return com && h(com, props)
+      let t = this.p.template;
+      let com = toRaw(typeof t === 'string' ? templateHooks[t] : t);
+      return com && h(com, this.p.props)
     }
   };
 
@@ -2988,48 +2904,43 @@ var script$18 = {
         });
       },
       showLoading(a) {
-        this.cmd({
-          type: 'Loading',
-          cover: true,
-          local: true,
-          hide: a === false ? true : false
-        });
-      },
-      cmdDialog(cmd, args, commander) {
+				a = a == null ? true: a;
+				if (a) {
+					this.pop('w-loading', {
+					  type: 'Loading',
+					  cover: true,
+					  local: true,
+					});
+				} else {
+					this.pop('w-loading', false);
+				}
+      },
+      createPop(template, props, commander) {
         return new Promise((resolve, reject) => {
-          if (cmd.hide) {
-            let o = this.pops.find(v => cmd.hide === true ? v.cmd.type == cmd.type : v.cmd.orientUid == cmd.hide);
-            return o && this.removeDialog(o.cmd.orientUid)
-          }
           let uid = $$1.uid();
-          if (!cmd.orientUid) cmd.orientUid = uid;
+          if (!props.orientUid) props.orientUid = uid;
           this.pops.push({
-            cmd,
-            args,
+            template,
+            props,
             commander,
             resolve,
-            reject,
-            hidden: false,
+            reject
           });
         })
       },
-      removeDialog(u) {
-        this.$nextTick(() => {
-          let o = this.pops.find(v => v.cmd.orientUid == u);
-          if (o) {
-            if (this.pops.findIndex(v => v.cmd.orientUid != u && !v.hidden) > -1) {
-              o.hidden = true;
-            } else {
-              this.pops = [];
-            }
-          }
-        });
-      },
-      getDialogOptions(u) {
-        return this.pops.find(v => v.cmd.orientUid == u)
-      },
+      removePop(p) {
+				let i = typeof p === 'string' ? this.pops.findIndex(v => v.props.orientUid == p) : this.pops.indexOf(p);
+				i > -1 && this.pops.splice(i, 1);
+      },
+			getPops({template, uid}) {
+				return this.pops.filter(p => {
+					if (template && template != p.template) return false
+					if (uid && p.props.orientUid != uid) return false
+					return true
+				})
+			},
       html_pops() {
-        return [this.pops.map(p => h(script$1f, {p}))]
+        return [this.pops.map(p => h(script$1f, {key: p.props.orientUid, p}))]
       }
     }
   };
@@ -3820,7 +3731,7 @@ var script$14 = {
     },
     beforeCreate() {
       $$1.docView = this;
-      $$1.q('#app').append('<div id=w-dfish-pops></div>');
+      $$1.q(document.body).prepend('<div id=w-dfish-pops></div>');
     },
     methods: {
       el() {
@@ -3830,15 +3741,14 @@ var script$14 = {
         return null
       },
       previewVideo(src) {
-        this.cmd({type: 'Dialog', template: script$16, data: {type: 'video', src}});
+        this.pop(script$16, {data: {type: 'video', src}});
       },
       previewImage(imgs, options) {
-        this.cmd({type: 'Dialog', template: script$16, data: {type: 'image', imgs, options}});
+        this.pop(script$16, {data: {type: 'image', imgs, options}});
       },
       //dateOptions: {value, format, minValue, maxValue, success}
       dateSheet(dateOptions, dialogOptions) {
-        this.exec({
-          type: 'Dialog',
+        this.pop(script$15, {
           template: script$15,
           width: '100%',
           height: '55%',
@@ -3849,7 +3759,7 @@ var script$14 = {
           on: {
             'click:cover': $$1.close
           }
-        }, null, dialogOptions);
+        });
       },
       html() {
         return [
@@ -4094,7 +4004,7 @@ const O = {},
         if (this.closed) return
         this.closeRelease();
         this.trigger('close');
-        this.ownerView.removeDialog(this.uid);
+        this.ownerView.removePop(this.uid);
       },
       closeRelease() {
         this.x.autoHide && this.listenHide(F);
@@ -4167,7 +4077,7 @@ const O = {},
         this.maxHeight = h;
       },
       getOptions() {
-        return this.ownerView.getDialogOptions(this.uid)
+        return this.ownerView.getPops({uid: this.uid})[0]
       },
       getCommander() {
         let o = this.getOptions();
@@ -4207,10 +4117,10 @@ const O = {},
           class: 'w-dialog-cover f-abs-full',
           onclick: e => this.trigger('click:cover', e)
         }) : null;
+				let r = [cover || [], this.html_self(true)];
         return [
-          cover ? (to ? h(Teleport, {to}, cover) : cover) : [],
           // 套一层w-dialog-teleport的原因是为了让对话框里面的 $(this) 能正确返回
-          to ? h('div', {class: 'w-dialog-teleport', id: this.uid + 'teleport'}, h(Teleport, {to}, this.html_self(true))) : this.html_self(true),
+          to ? h('div', {class: 'w-dialog-teleport', id: this.uid + 'teleport'}, h(Teleport, {to}, r)) : r,
           this.html_pops()
         ]
       }
@@ -4357,11 +4267,7 @@ var script$10 = {
         this.close();
       },
       cue(a) {
-        if ($$1.isCmd(a)) {
-          this.commander.exec(a, this.args);
-        } else if (typeof a === 'function') {
-          a(this.args);
-        }
+        a && a(this.args);
       },
     },
     computed: {
@@ -4597,9 +4503,6 @@ var script$Y = {
     name: 'w-menubutton',
     mixins: [script$Z],
     methods: {
-      exec(...args) {
-        return this.parentMenu.getRoot().getCommander().exec(...args)
-      },
       drop() {
         if (this.showDrop) return
         this.closeSub();
@@ -5087,7 +4990,12 @@ var script$Q = {
       });
     },
     methods: {
+			getCurrent() {
+			  const tr = $$1.q('.w-tr.z-on', this.el())[0];
+			  return tr && $$1(tr)
+			},
       viewCurrent(f) {
+				f = f || this.getCurrent();
         if (f) {
           f.expandToView();
           this.$nextTick(() => f.scrollIntoView({x: 'left'}));
@@ -5853,16 +5761,15 @@ var script$A = {
         let w = typeof a === 'string' ? a : a !== false ? 'z-err' : '';
         this.warnClass = w;
         if (!w && this._tip) {
-          $$1.close(this._tip);
-          this._tip = null;
+					this.pop('w-tip', false);
+					this._tip = null;
         }
       },
       showErrorTip(text) {
         this.scrollIntoView({
           ease: 200,
           success: () => {
-            this._tip = this.exec({
-              type: 'Tip',
+            this._tip = this.pop('w-tip', {
               text,
               face: 'warn',
               independent: true,
@@ -8928,6 +8835,7 @@ const suffixHooks = {
     created() {
       this.$watch(() => this.x.modelValue, v => {
         if (this.emiting) return this.emiting = false
+        if (v && typeof v === 'string') v = JSON.parse(v);
         this.list = Array.isArray(v) ? v.map(value => {return {value}}) : v ? [{value: v}] : [];
       }, {immediate: true});
     },
@@ -10010,7 +9918,6 @@ var script$8 = {
         e.stopPropagation();
         let c = this.x.picker;
         if (typeof c === 'function') c(this);
-        else this.cmd(c, this.x.modelValue);
       },
       closeDrop() {
         this.showDrop = false;
@@ -10246,14 +10153,12 @@ var script$5 = {
         e.stopPropagation();
         let c = this.x.picker;
         if (typeof c === 'function') c(this);
-        else this.cmd(c, this.formVal());
       },
       clickDropper(e) {
         e.stopPropagation();
         this.suggest(!this.showSuggest);
         let c = this.x.dropper;
         if (typeof c === 'function') c(this);
-        else this.cmd(c, this.formVal());
       },
       formText() {
         return this.input_title
@@ -10625,14 +10530,12 @@ var script$4 = {
         e.stopPropagation();
         let c = this.x.picker;
         if (typeof c === 'function') c(this);
-        else this.cmd(c, this.formVal());
       },
       clickDropper(e) {
         e.stopPropagation();
         this.suggest(true);
         let c = this.x.dropper;
         if (typeof c === 'function') c(this);
-        else this.cmd(c, this.formVal());
       },
       addStore(m) {
         if (m && typeof m !== 'string') {
@@ -10827,6 +10730,7 @@ var script$4 = {
 script$4.__file = "src/widgets/LinkBox.vue";
 
 var script$3 = {
+		props: ['width', 'height', 'context'],
     data() {
       return {
         smallLeft: 0
@@ -10837,10 +10741,13 @@ var script$3 = {
         handler(v) {
           let m = this.context.max();
           let n = this.context.min();
-          this.smallLeft = (this.dialog.x.width - this.smallWidth) * (v / (m - n));
+          this.smallLeft = (this.width - this.smallWidth) * (v / (m - n));
         }
       }
     },
+		mounted() {
+			console.log(this.context.x.modelValue);
+		},
     methods: {
       refresh(e) {
         this.context.refresh(e);
@@ -10853,12 +10760,6 @@ var script$3 = {
       }
     },
     computed: {
-      dialog() {
-        return $$1.dialog(this)
-      },
-      context() {
-        return this.dialog.context
-      },
       bigSrc() {
         return this.context.x.big.src
       },
@@ -10866,7 +10767,7 @@ var script$3 = {
         return this.context.x.small.src
       },
       smallWidth() {
-        return this.dialog.x.height * (this.context.x.small.width / this.context.x.small.height)
+        return this.height * (this.context.x.small.width / this.context.x.small.height)
       }
     }
   };
@@ -10874,7 +10775,13 @@ var script$3 = {
 function render(_ctx, _cache, $props, $setup, $data, $options) {
   const _component_w_dialog = resolveComponent("w-dialog");
 
-  return (openBlock(), createBlock(_component_w_dialog, { class: "w-jigsaw-dialog" }, {
+  return (openBlock(), createBlock(_component_w_dialog, {
+    ref: "dialog",
+    class: "w-jigsaw-dialog",
+    width: $props.width,
+    height: $props.height,
+    context: $props.context
+  }, {
     default: withCtx(() => [
       createVNode("img", {
         class: "w-jigsaw-big",
@@ -10894,7 +10801,7 @@ function render(_ctx, _cache, $props, $setup, $data, $options) {
       }, "刷新")
     ]),
     _: 1 /* STABLE */
-  }))
+  }, 8 /* PROPS */, ["width", "height", "context"]))
 }
 
 script$3.render = render;
@@ -10915,6 +10822,7 @@ const init_text = $$1.loc.form.jigsaw_drag_right;
         isSuccess: false,
         isError: false,
         dropper: null,
+				showDrop: false,
       }
     },
     methods: {
@@ -10994,24 +10902,7 @@ const init_text = $$1.loc.form.jigsaw_drag_right;
       mouseenter(e) {
         if (this.dropper || !this.x.big || this.isSuccess || this.locked) return
         this.warn(false);
-        $$1.closePopup();
-        let width = Math.max($$1.number(this.x.dropWidth), $$1.bcr(this.el('main')).width);
-        let height = Math.ceil(width * (this.x.big.height / this.x.big.width));
-        this.dropper = this.cmd({
-          type: 'Dialog',
-          ownproperty: true,
-          template: script$3,
-          width,
-          height,
-          autoHide: true,
-          hoverDrop: true,
-          context: this,
-          snap: {
-            target: () => this.el('main'),
-            position: 'v'
-          },
-          onClose: () => this.dropper = null
-        });
+				this.showDrop = true;
       },
       drop(e) {
         this.trigger(e, this.x.modelValue);
@@ -11046,15 +10937,35 @@ const init_text = $$1.loc.form.jigsaw_drag_right;
         ]
       },
       html_button() {
-        return h('button', {
-          ref: 'thumb',
-          class: ['w-jigsaw-thumb w-input-bbr f-i', this.isSuccess ? 'f-i-check' :
-            'f-i-long-arrow-right'
-          ],
-          disabled: this.x.disabled,
-          onmousedown: this.dragstart,
-          ondrop: this.drop,
-        })
+				let r = [
+					h('button', {
+					  ref: 'thumb',
+					  class: ['w-jigsaw-thumb w-input-bbr f-i', this.isSuccess ? 'f-i-check' :
+					    'f-i-long-arrow-right'
+					  ],
+					  disabled: this.x.disabled,
+					  onmousedown: this.dragstart,
+					  ondrop: this.drop,
+					})
+				];
+				if (!this.isSuccess && !this.isError && this.showDrop) {
+					let width = Math.max($$1.number(this.x.dropWidth), $$1.bcr(this.el('main')).width);
+					let height = Math.ceil(width * (this.x.big.height / this.x.big.width));
+					r.push(h(script$3, {
+					  ownproperty: true,
+					  width,
+					  height,
+					  autoHide: true,
+					  hoverDrop: true,
+					  context: this,
+					  snap: {
+					    target: () => this.el('main'),
+					    position: 'v'
+					  },
+					  onClose: () => this.showDrop = null
+					}));
+				}
+        return r
       }
     },
     computed: {