mali-ui-plus 1.1.7 → 1.1.8

package/lib/mali-ui-plus.common.js

@@ -10083,7 +10083,7 @@ var GlobalConfig = {
 ;// CONCATENATED MODULE: ./node_modules/vxe-table/es/tools/log.js
 
 function getLog(message, params) {
-  return "[vxe-table v".concat("4.5.8", "] ").concat(conf.i18n(message, params));
+  return "[vxe-table v".concat("4.5.9", "] ").concat(conf.i18n(message, params));
 }
 function outLog(type) {
   return function (message, params) {
@@ -11924,7 +11924,7 @@ var config = new VXETableConfig();
 var v = 'v4';
 var VXETable = {
   v: v,
-  version: "4.5.8",
+  version: "4.5.9",
   setup: setup,
   interceptor: interceptor,
   renderer: renderer,
@@ -13268,10 +13268,10 @@ var editHook = {
       if (!xe_utils_default().isArray(records)) {
         records = [records];
       }
-      var newRecords = $xetable.defineField(records.map(function (record) {
+      var newRecords = (0,external_commonjs_vue_commonjs2_vue_root_Vue_.reactive)($xetable.defineField(records.map(function (record) {
         var _a;
         return Object.assign(treeConfig && transform ? (_a = {}, _a[mapChildrenField] = [], _a[childrenField] = [], _a) : {}, record);
-      }));
+      })));
       if (!row) {
         // 如果为虚拟树
         if (treeConfig && transform) {
@@ -35003,7 +35003,8 @@ var orderStorageKey = 'VXE_TABLE_CUSTOM_COLUMN_ORDER';
         var keepSource = props.keepSource;
         var tableSourceData = internalData.tableSourceData,
           fullDataRowIdData = internalData.fullDataRowIdData,
-          fullAllDataRowIdData = internalData.fullAllDataRowIdData;
+          fullAllDataRowIdData = internalData.fullAllDataRowIdData,
+          sourceDataRowIdData = internalData.sourceDataRowIdData;
         var treeOpts = computeTreeOpts.value;
         var transform = treeOpts.transform,
           mapChildrenField = treeOpts.mapChildrenField;
@@ -35021,6 +35022,10 @@ var orderStorageKey = 'VXE_TABLE_CUSTOM_COLUMN_ORDER';
             if (matchObj) {
               matchObj.item[childrenField] = xe_utils_default().clone(rows, true);
             }
+            rows.forEach(function (childRow) {
+              var rowid = getRowid($xetable, childRow);
+              sourceDataRowIdData[rowid] = xe_utils_default().clone(childRow, true);
+            });
           }
           xe_utils_default().eachTree(rows, function (childRow, index, items, path, parent, nodes) {
             var rowid = getRowid($xetable, childRow);
@@ -41344,7 +41349,54 @@ const MlTreeSelectvue_type_script_lang_ts_setup_true_hoisted_1 = {
       const item = keyMaps.value[props.modelValue];
       emit('update:label', item ? item[optLabelField.value] : '');
     };
-    const changeEvent = () => {
+    const checkStrictlyChangeEvent = () => {
+      debugger;
+      const value = selectValue.value;
+      let item;
+      let selected = [];
+      if (props.multiple) {
+        // if (props.indeterminateToChecked) {
+        //   if (row[optChildrenField.value] && row[optChildrenField.value].length) {
+        //     XEUtils.eachTree([row], item => {
+        //       const index = value.indexOf(item[optValueField.value])
+        //       if (checked) {
+        //         if (index === -1) {
+        //           value.push(item[optValueField.value])
+        //         }
+        //       } else {
+        //         if (index > -1) {
+        //           value.splice(index, 1)
+        //         }
+        //       }
+        //     }, { children: optChildrenField.value })
+        //   }
+        // }
+        selected = value.map(v => keyMaps.value[v]);
+      } else {
+        selected = keyMaps.value[value];
+      }
+      // 自动更新校验状态
+      if ($xeform && $xeformiteminfo) {
+        $xeform.triggerItemEvent(new Event('change'), $xeformiteminfo.itemConfig.field, value);
+        if (mlForm) {
+          mlForm.changeItemValue($xeformiteminfo.itemConfig.field);
+        }
+      }
+      const label = item ? item[optLabelField.value] : '';
+      emit('update:modelValue', value);
+      emit('update:label', label);
+      emit('change', {
+        value,
+        selected,
+        option: item,
+        label
+      });
+      // 值改变自动触发提交
+      if (mlForm && mlForm.changeToSubmit) {
+        mlForm.submit();
+      }
+    };
+    const checkChangeEvent = () => {
       const value = selectValue.value;
       const item = keyMaps.value[value];
       let selected = [];
@@ -41386,8 +41438,9 @@ const MlTreeSelectvue_type_script_lang_ts_setup_true_hoisted_1 = {
     updateLabel();
     return (_ctx, _cache) => {
       const _component_el_tree_select = (0,external_commonjs_vue_commonjs2_vue_root_Vue_.resolveComponent)("el-tree-select");
-      return (0,external_commonjs_vue_commonjs2_vue_root_Vue_.unref)(isReadonly) ? ((0,external_commonjs_vue_commonjs2_vue_root_Vue_.openBlock)(), (0,external_commonjs_vue_commonjs2_vue_root_Vue_.createElementBlock)("span", MlTreeSelectvue_type_script_lang_ts_setup_true_hoisted_1, (0,external_commonjs_vue_commonjs2_vue_root_Vue_.toDisplayString)((0,external_commonjs_vue_commonjs2_vue_root_Vue_.unref)(selectLabel)), 1)) : ((0,external_commonjs_vue_commonjs2_vue_root_Vue_.openBlock)(), (0,external_commonjs_vue_commonjs2_vue_root_Vue_.createBlock)(_component_el_tree_select, {
+      return (0,external_commonjs_vue_commonjs2_vue_root_Vue_.openBlock)(), (0,external_commonjs_vue_commonjs2_vue_root_Vue_.createElementBlock)(external_commonjs_vue_commonjs2_vue_root_Vue_.Fragment, null, [(0,external_commonjs_vue_commonjs2_vue_root_Vue_.unref)(isReadonly) ? ((0,external_commonjs_vue_commonjs2_vue_root_Vue_.openBlock)(), (0,external_commonjs_vue_commonjs2_vue_root_Vue_.createElementBlock)("span", MlTreeSelectvue_type_script_lang_ts_setup_true_hoisted_1, (0,external_commonjs_vue_commonjs2_vue_root_Vue_.toDisplayString)((0,external_commonjs_vue_commonjs2_vue_root_Vue_.unref)(selectLabel)), 1)) : (0,external_commonjs_vue_commonjs2_vue_root_Vue_.createCommentVNode)("", true), __props.checkStrictly || __props.indeterminateToChecked ? ((0,external_commonjs_vue_commonjs2_vue_root_Vue_.openBlock)(), (0,external_commonjs_vue_commonjs2_vue_root_Vue_.createBlock)(_component_el_tree_select, {
         key: 1,
+        "check-strictly": "",
         class: "ml-tree-select",
         modelValue: selectValue.value,
         "onUpdate:modelValue": _cache[0] || (_cache[0] = $event => selectValue.value = $event),
@@ -41396,12 +41449,25 @@ const MlTreeSelectvue_type_script_lang_ts_setup_true_hoisted_1 = {
         data: __props.options,
         props: (0,external_commonjs_vue_commonjs2_vue_root_Vue_.unref)(treeProps),
         "node-key": (0,external_commonjs_vue_commonjs2_vue_root_Vue_.unref)(optValueField),
-        "check-strictly": __props.checkStrictly,
         placeholder: __props.placeholder,
         "show-checkbox": __props.multiple,
         clearable: __props.clearable,
-        onChange: changeEvent
-      }, null, 8, ["modelValue", "disabled", "multiple", "data", "props", "node-key", "check-strictly", "placeholder", "show-checkbox", "clearable"]));
+        onChange: checkStrictlyChangeEvent
+      }, null, 8, ["modelValue", "disabled", "multiple", "data", "props", "node-key", "placeholder", "show-checkbox", "clearable"])) : ((0,external_commonjs_vue_commonjs2_vue_root_Vue_.openBlock)(), (0,external_commonjs_vue_commonjs2_vue_root_Vue_.createBlock)(_component_el_tree_select, {
+        key: 2,
+        class: "ml-tree-select",
+        modelValue: selectValue.value,
+        "onUpdate:modelValue": _cache[1] || (_cache[1] = $event => selectValue.value = $event),
+        disabled: __props.disabled,
+        multiple: __props.multiple,
+        data: __props.options,
+        props: (0,external_commonjs_vue_commonjs2_vue_root_Vue_.unref)(treeProps),
+        "node-key": (0,external_commonjs_vue_commonjs2_vue_root_Vue_.unref)(optValueField),
+        placeholder: __props.placeholder,
+        "show-checkbox": __props.multiple,
+        clearable: __props.clearable,
+        onChange: checkChangeEvent
+      }, null, 8, ["modelValue", "disabled", "multiple", "data", "props", "node-key", "placeholder", "show-checkbox", "clearable"]))], 64);
     };
   }
 }));
@@ -61781,7 +61847,7 @@ function index_config(options) {
   return config_0;
 }
 const MaliUI = {
-  version: "1.1.6",
+  version: "1.1.7",
   install: index_install,
   config: index_config,
   renderer: {

package/lib/mali-ui-plus.umd.js

@@ -10093,7 +10093,7 @@ var GlobalConfig = {
 ;// CONCATENATED MODULE: ./node_modules/vxe-table/es/tools/log.js
 
 function getLog(message, params) {
-  return "[vxe-table v".concat("4.5.8", "] ").concat(conf.i18n(message, params));
+  return "[vxe-table v".concat("4.5.9", "] ").concat(conf.i18n(message, params));
 }
 function outLog(type) {
   return function (message, params) {
@@ -11934,7 +11934,7 @@ var config = new VXETableConfig();
 var v = 'v4';
 var VXETable = {
   v: v,
-  version: "4.5.8",
+  version: "4.5.9",
   setup: setup,
   interceptor: interceptor,
   renderer: renderer,
@@ -13278,10 +13278,10 @@ var editHook = {
       if (!xe_utils_default().isArray(records)) {
         records = [records];
       }
-      var newRecords = $xetable.defineField(records.map(function (record) {
+      var newRecords = (0,external_commonjs_vue_commonjs2_vue_root_Vue_.reactive)($xetable.defineField(records.map(function (record) {
         var _a;
         return Object.assign(treeConfig && transform ? (_a = {}, _a[mapChildrenField] = [], _a[childrenField] = [], _a) : {}, record);
-      }));
+      })));
       if (!row) {
         // 如果为虚拟树
         if (treeConfig && transform) {
@@ -35013,7 +35013,8 @@ var orderStorageKey = 'VXE_TABLE_CUSTOM_COLUMN_ORDER';
         var keepSource = props.keepSource;
         var tableSourceData = internalData.tableSourceData,
           fullDataRowIdData = internalData.fullDataRowIdData,
-          fullAllDataRowIdData = internalData.fullAllDataRowIdData;
+          fullAllDataRowIdData = internalData.fullAllDataRowIdData,
+          sourceDataRowIdData = internalData.sourceDataRowIdData;
         var treeOpts = computeTreeOpts.value;
         var transform = treeOpts.transform,
           mapChildrenField = treeOpts.mapChildrenField;
@@ -35031,6 +35032,10 @@ var orderStorageKey = 'VXE_TABLE_CUSTOM_COLUMN_ORDER';
             if (matchObj) {
               matchObj.item[childrenField] = xe_utils_default().clone(rows, true);
             }
+            rows.forEach(function (childRow) {
+              var rowid = getRowid($xetable, childRow);
+              sourceDataRowIdData[rowid] = xe_utils_default().clone(childRow, true);
+            });
           }
           xe_utils_default().eachTree(rows, function (childRow, index, items, path, parent, nodes) {
             var rowid = getRowid($xetable, childRow);
@@ -41354,7 +41359,54 @@ const MlTreeSelectvue_type_script_lang_ts_setup_true_hoisted_1 = {
       const item = keyMaps.value[props.modelValue];
       emit('update:label', item ? item[optLabelField.value] : '');
     };
-    const changeEvent = () => {
+    const checkStrictlyChangeEvent = () => {
+      debugger;
+      const value = selectValue.value;
+      let item;
+      let selected = [];
+      if (props.multiple) {
+        // if (props.indeterminateToChecked) {
+        //   if (row[optChildrenField.value] && row[optChildrenField.value].length) {
+        //     XEUtils.eachTree([row], item => {
+        //       const index = value.indexOf(item[optValueField.value])
+        //       if (checked) {
+        //         if (index === -1) {
+        //           value.push(item[optValueField.value])
+        //         }
+        //       } else {
+        //         if (index > -1) {
+        //           value.splice(index, 1)
+        //         }
+        //       }
+        //     }, { children: optChildrenField.value })
+        //   }
+        // }
+        selected = value.map(v => keyMaps.value[v]);
+      } else {
+        selected = keyMaps.value[value];
+      }
+      // 自动更新校验状态
+      if ($xeform && $xeformiteminfo) {
+        $xeform.triggerItemEvent(new Event('change'), $xeformiteminfo.itemConfig.field, value);
+        if (mlForm) {
+          mlForm.changeItemValue($xeformiteminfo.itemConfig.field);
+        }
+      }
+      const label = item ? item[optLabelField.value] : '';
+      emit('update:modelValue', value);
+      emit('update:label', label);
+      emit('change', {
+        value,
+        selected,
+        option: item,
+        label
+      });
+      // 值改变自动触发提交
+      if (mlForm && mlForm.changeToSubmit) {
+        mlForm.submit();
+      }
+    };
+    const checkChangeEvent = () => {
       const value = selectValue.value;
       const item = keyMaps.value[value];
       let selected = [];
@@ -41396,8 +41448,9 @@ const MlTreeSelectvue_type_script_lang_ts_setup_true_hoisted_1 = {
     updateLabel();
     return (_ctx, _cache) => {
       const _component_el_tree_select = (0,external_commonjs_vue_commonjs2_vue_root_Vue_.resolveComponent)("el-tree-select");
-      return (0,external_commonjs_vue_commonjs2_vue_root_Vue_.unref)(isReadonly) ? ((0,external_commonjs_vue_commonjs2_vue_root_Vue_.openBlock)(), (0,external_commonjs_vue_commonjs2_vue_root_Vue_.createElementBlock)("span", MlTreeSelectvue_type_script_lang_ts_setup_true_hoisted_1, (0,external_commonjs_vue_commonjs2_vue_root_Vue_.toDisplayString)((0,external_commonjs_vue_commonjs2_vue_root_Vue_.unref)(selectLabel)), 1)) : ((0,external_commonjs_vue_commonjs2_vue_root_Vue_.openBlock)(), (0,external_commonjs_vue_commonjs2_vue_root_Vue_.createBlock)(_component_el_tree_select, {
+      return (0,external_commonjs_vue_commonjs2_vue_root_Vue_.openBlock)(), (0,external_commonjs_vue_commonjs2_vue_root_Vue_.createElementBlock)(external_commonjs_vue_commonjs2_vue_root_Vue_.Fragment, null, [(0,external_commonjs_vue_commonjs2_vue_root_Vue_.unref)(isReadonly) ? ((0,external_commonjs_vue_commonjs2_vue_root_Vue_.openBlock)(), (0,external_commonjs_vue_commonjs2_vue_root_Vue_.createElementBlock)("span", MlTreeSelectvue_type_script_lang_ts_setup_true_hoisted_1, (0,external_commonjs_vue_commonjs2_vue_root_Vue_.toDisplayString)((0,external_commonjs_vue_commonjs2_vue_root_Vue_.unref)(selectLabel)), 1)) : (0,external_commonjs_vue_commonjs2_vue_root_Vue_.createCommentVNode)("", true), __props.checkStrictly || __props.indeterminateToChecked ? ((0,external_commonjs_vue_commonjs2_vue_root_Vue_.openBlock)(), (0,external_commonjs_vue_commonjs2_vue_root_Vue_.createBlock)(_component_el_tree_select, {
         key: 1,
+        "check-strictly": "",
         class: "ml-tree-select",
         modelValue: selectValue.value,
         "onUpdate:modelValue": _cache[0] || (_cache[0] = $event => selectValue.value = $event),
@@ -41406,12 +41459,25 @@ const MlTreeSelectvue_type_script_lang_ts_setup_true_hoisted_1 = {
         data: __props.options,
         props: (0,external_commonjs_vue_commonjs2_vue_root_Vue_.unref)(treeProps),
         "node-key": (0,external_commonjs_vue_commonjs2_vue_root_Vue_.unref)(optValueField),
-        "check-strictly": __props.checkStrictly,
         placeholder: __props.placeholder,
         "show-checkbox": __props.multiple,
         clearable: __props.clearable,
-        onChange: changeEvent
-      }, null, 8, ["modelValue", "disabled", "multiple", "data", "props", "node-key", "check-strictly", "placeholder", "show-checkbox", "clearable"]));
+        onChange: checkStrictlyChangeEvent
+      }, null, 8, ["modelValue", "disabled", "multiple", "data", "props", "node-key", "placeholder", "show-checkbox", "clearable"])) : ((0,external_commonjs_vue_commonjs2_vue_root_Vue_.openBlock)(), (0,external_commonjs_vue_commonjs2_vue_root_Vue_.createBlock)(_component_el_tree_select, {
+        key: 2,
+        class: "ml-tree-select",
+        modelValue: selectValue.value,
+        "onUpdate:modelValue": _cache[1] || (_cache[1] = $event => selectValue.value = $event),
+        disabled: __props.disabled,
+        multiple: __props.multiple,
+        data: __props.options,
+        props: (0,external_commonjs_vue_commonjs2_vue_root_Vue_.unref)(treeProps),
+        "node-key": (0,external_commonjs_vue_commonjs2_vue_root_Vue_.unref)(optValueField),
+        placeholder: __props.placeholder,
+        "show-checkbox": __props.multiple,
+        clearable: __props.clearable,
+        onChange: checkChangeEvent
+      }, null, 8, ["modelValue", "disabled", "multiple", "data", "props", "node-key", "placeholder", "show-checkbox", "clearable"]))], 64);
     };
   }
 }));
@@ -61791,7 +61857,7 @@ function index_config(options) {
   return config_0;
 }
 const MaliUI = {
-  version: "1.1.6",
+  version: "1.1.7",
   install: index_install,
   config: index_config,
   renderer: {