dfish-widget 1.0.133 → 1.0.135

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 { nextTick, h, mergeProps, toRaw, resolveComponent, openBlock, createElementBlock, createStaticVNode, createElementVNode, createBlock, withCtx, Fragment, createVNode, renderList, toDisplayString, createTextVNode, createCommentVNode, inject, provide, renderSlot, Teleport, computed, resolveDirective, withDirectives, unref, markRaw, ref, onMounted, watch, normalizeStyle, normalizeClass, TransitionGroup, getCurrentInstance, createSlots, resolveDynamicComponent, withModifiers } from 'vue';
+import { nextTick, h, mergeProps, toRaw, resolveComponent, openBlock, createElementBlock, createStaticVNode, createElementVNode, createBlock, withCtx, Fragment, createVNode, renderList, toDisplayString, createTextVNode, createCommentVNode, inject, provide, renderSlot, Teleport, computed, resolveDirective, withDirectives, unref, markRaw, ref, getCurrentInstance, onMounted, watch, normalizeStyle, normalizeClass, TransitionGroup, createSlots, resolveDynamicComponent, withModifiers } from 'vue';
 import ResizeObserver$1 from 'resize-observer-polyfill';
 
 let u = navigator.userAgent.toLowerCase();
@@ -1243,6 +1243,11 @@ $$1.string = function(a) {
 		typeof a === 'object' ? JSON.stringify(a) : '' + a
 };
 
+/*
+ * 表单返回值可能是字符串 '1,2,3'，也可能是数组 [1,2,3]，为了不影响已有的项目，给出这种修正
+ */
+// Array.prototype.split = function() {return this}
+
 // a -> object
 $$1.array = function(a) {
   return Array.isArray(a) ? a : a == null || a === '' ? [] : [a]
@@ -1749,7 +1754,8 @@ $$1.submit = (request, options = {}) => {
 };
 
 $$1.symbol = {
-  leafSymbol: Symbol('leaf')
+  leafSymbol: Symbol('leaf'),
+  changeSymbol: Symbol('change'),
 };
 
 window.addEventListener('unhandledrejection', (event) => {
@@ -3032,6 +3038,7 @@ var script$1k = {
         provideRangeParent: null,
         provideCompatGap: null,
         provideMenu_w: null,
+        provideTripleboxContainer: null,
       }
     },
     beforeCreate() {
@@ -5035,6 +5042,7 @@ var script$$ = {
         _provideTable: this,
         provideLevel: -1,
         provideParentTR: null,
+        provideTripleboxContainer: this
       }
     },
     data() {
@@ -5672,7 +5680,7 @@ var script$Q = /*#__PURE__*/Object.assign(__default__$1, {
 const props = __props;
 
   
-
+  
   
   
   let {alias, itemHeight, current} = props;
@@ -5691,6 +5699,9 @@ const props = __props;
   const flow = ref();
   const xLoading = ref(false);
   const loading = computed(() => props.loading || xLoading.value);
+  
+  provide('provideTripleboxContainer', getCurrentInstance());
+  
     
   const wrapStyle = computed(() => {
     return {
@@ -6639,6 +6650,7 @@ var script$F = {
         provideLevel: -1,
         provideParentLeaf: null,
         provideParentTR: null,
+        provideTripleboxContainer: this
       }
     },
     methods: {
@@ -6772,6 +6784,8 @@ const props = __props;
   const flow = ref();
   const xLoading = ref(false);
   const loading = computed(() => props.loading || xLoading.value);
+  
+  provide('provideTripleboxContainer', getCurrentInstance);
     
   const wrapStyle = computed(() => {
     return {
@@ -7576,7 +7590,7 @@ var script$C = {
 
 script$C.__file = "src/widgets/FormBase.vue";
 
-const {leafSymbol: leafSymbol$1} = $$1.symbol;
+const {leafSymbol: leafSymbol$1,changeSymbol} = $$1.symbol;
 
   var script$B = {
     name: 'w-checkbox',
@@ -7643,11 +7657,14 @@ const {leafSymbol: leafSymbol$1} = $$1.symbol;
           });
           return r.join(',')
         }
+        if (Array.isArray(a)) {
+          a = a.join(',');
+        }
         $$1.lodash.each(this.siblings(), f => f.val($$1.idsAny(a, f.checkValue)));
       },
       watchModelValue(v, ov) {
         if (ov != v) {
-          this.trigger('change', v);
+          // this.trigger('change', v)
           this.parentTrigger('change', v);
         }
       },
@@ -7665,10 +7682,13 @@ const {leafSymbol: leafSymbol$1} = $$1.symbol;
         if (!this.isNormal) return
         this.val(a);
       },
+      siblingsContainer() {
+        return this.ownerView.el()
+      },
       // @a -> T/F 是否只获取所有选中项, b -> 是否只选择可用的
       siblings(a, b) {
         return $$1.lodash.map($$1.q(':input[name="' + this.input_name + '"]:not([w-form-ignore] :input)' + (b ? ':not(:disabled)' : '') +
-          (a === true ? ':checked' : a === false ? ':not(:checked)' : (a || '')), this.ownerView.el()), e => $$1(e))
+          (a === true ? ':checked' : a === false ? ':not(:checked)' : (a || '')), this.siblingsContainer()), e => $$1(e))
       },
       relate() {
         // implement
@@ -7845,6 +7865,7 @@ const {leafSymbol} = $$1.symbol;
     name: 'w-triplebox',
     mixins: [script$B],
     props: ['all'],
+    inject: ['provideTripleboxContainer'],
     created() {
       if (this.provideBoxParent) {
         if (this.data && !this.data[leafSymbol]) {
@@ -7911,17 +7932,31 @@ const {leafSymbol} = $$1.symbol;
           }
         }
         this.x.modelValue = mv;
-        let gv = this.groupFormVal();
-        gv = gv ? gv.split(',') : [];
         this.$emit('update:modelValue', mv);
-        this.trigger(event, gv);
-        this.parentTrigger('change', gv);
+        if (!this.x.all) {
+          this.parentTrigger(event, this.groupFormVal());
+        }
       },
       formVal() {
         if (this.isDisabled) return ''
         let s = this.checkstate();
         return s == 1 || (this.x.partialSubmit && s == 2) ? this.$refs.v.value : ''
       },
+      siblingsContainer() {
+        let c = this.provideTripleboxContainer;
+        return (c && c.el()) || this.ownerView.el()
+      },
+      parentTrigger(e, v) {
+        let c = this.provideTripleboxContainer;
+        let d = c && c.el();
+        if (v) {
+          v = v.split(',').sort().join(',');
+        }
+        if (d && d.getAttribute('wTripleboxValue') != v) {
+          d.setAttribute('wTripleboxValue', v);
+          this.trigger(e, v);
+        }
+      },
       onchange(e) {
         this.onbasechange(e);
         this.relate();