@smallwei/avue 3.9.1 → 3.9.3

package/lib/packages/core/common/event.js

@@ -1,66 +1,66 @@
-/*! Avue.js v3.9.1 | (c) 2017-2026 Smallwei | Released under the MIT License. */
-'use strict';
-
-Object.defineProperty(exports, '__esModule', { value: true });
-
-var src_core_dataformat = require('../../../src/core/dataformat.js');
-var src_utils_util = require('../../../src/utils/util.js');
-
-function event () {
-    return {
-        methods: {
-            bindEvent(name, params) {
-                const item = src_utils_util.findNode(this.dic, this.props, this.text);
-                params = Object.assign(params, { column: this.column, dic: this.dic, item }, this.tableData);
-                if (typeof this[name] === 'function') {
-                    if (name == 'change') {
-                        if (this.column.cell != true) {
-                            this[name](params);
-                        }
-                    }
-                    else {
-                        this[name](params);
-                    }
-                }
-                this.$emit(name, params);
-            },
-            initVal() {
-                this.stringMode = typeof this.modelValue == 'string';
-                this.text = src_core_dataformat.initVal(this.modelValue, this);
-            },
-            getLabelText(item) {
-                if (this.validatenull(item))
-                    return '';
-                if (typeof this.typeformat === 'function') {
-                    return this.typeformat(item, this.labelKey, this.valueKey);
-                }
-                return item[this.labelKey];
-            },
-            handleFocus(event) {
-                this.bindEvent('focus', { value: this.modelValue, event });
-            },
-            handleBlur(event) {
-                this.bindEvent('blur', { value: this.modelValue, event });
-            },
-            handleClick(event) {
-                this.bindEvent('click', { value: this.modelValue, event });
-            },
-            handleChange(value) {
-                let result = value;
-                if (this.isJson) {
-                    result = JSON.stringify(value);
-                }
-                else {
-                    const flag = this.isString || this.isNumber || this.stringMode || this.listType === 'picture-img';
-                    if (flag && Array.isArray(value)) {
-                        result = value.join(this.separator);
-                    }
-                }
-                this.bindEvent('change', { value: result });
-                this.$emit('update:modelValue', result);
-            },
-        },
-    };
-}
-
-exports.default = event;
+/*! Avue.js v3.9.3 | (c) 2017-2026 Smallwei | Released under the MIT License. */
+'use strict';
+
+Object.defineProperty(exports, '__esModule', { value: true });
+
+var src_core_dataformat = require('../../../src/core/dataformat.js');
+var src_utils_util = require('../../../src/utils/util.js');
+
+function event () {
+    return {
+        methods: {
+            bindEvent(name, params) {
+                const item = src_utils_util.findNode(this.dic, this.props, this.text);
+                params = Object.assign(params, { column: this.column, dic: this.dic, item }, this.tableData);
+                if (typeof this[name] === 'function') {
+                    if (name == 'change') {
+                        if (this.column.cell != true) {
+                            this[name](params);
+                        }
+                    }
+                    else {
+                        this[name](params);
+                    }
+                }
+                this.$emit(name, params);
+            },
+            initVal() {
+                this.stringMode = typeof this.modelValue == 'string';
+                this.text = src_core_dataformat.initVal(this.modelValue, this);
+            },
+            getLabelText(item) {
+                if (this.validatenull(item))
+                    return '';
+                if (typeof this.typeformat === 'function') {
+                    return this.typeformat(item, this.labelKey, this.valueKey);
+                }
+                return item[this.labelKey];
+            },
+            handleFocus(event) {
+                this.bindEvent('focus', { value: this.modelValue, event });
+            },
+            handleBlur(event) {
+                this.bindEvent('blur', { value: this.modelValue, event });
+            },
+            handleClick(event) {
+                this.bindEvent('click', { value: this.modelValue, event });
+            },
+            handleChange(value) {
+                let result = value;
+                if (this.isJson) {
+                    result = JSON.stringify(value);
+                }
+                else {
+                    const flag = this.isString || this.isNumber || this.stringMode || this.listType === 'picture-img';
+                    if (flag && Array.isArray(value)) {
+                        result = value.join(this.separator);
+                    }
+                }
+                this.bindEvent('change', { value: result });
+                this.$emit('update:modelValue', result);
+            },
+        },
+    };
+}
+
+exports.default = event;

package/lib/packages/core/common/init.js

@@ -1,142 +1,226 @@
-/*! Avue.js v3.9.1 | (c) 2017-2026 Smallwei | Released under the MIT License. */
-'use strict';
-
-Object.defineProperty(exports, '__esModule', { value: true });
-
-var src_core_dic = require('../../../src/core/dic.js');
-var src_global_variable = require('../../../src/global/variable.js');
-var src_core_slot = require('../../../src/core/slot.js');
-
-function init (name) {
-    return {
-        mixins: [src_core_slot.default],
-        emits: ['update:modelValue', 'change'],
-        props: {
-            tableData: {
-                type: Object,
-                default: () => {
-                    return {};
-                },
-            },
-            option: {
-                type: Object,
-                required: true,
-                default: () => {
-                    return {};
-                },
-            },
-        },
-        watch: {
-            propOption: {
-                handler(list) {
-                    list.forEach((ele) => (this.objectOption[ele.prop] = ele));
-                },
-                deep: true,
-            },
-            option: {
-                handler() {
-                    this.init(false);
-                },
-                deep: true,
-            },
-        },
-        data() {
-            return {
-                DIC: {},
-                cascaderDIC: {},
-                tableOption: {},
-                objectOption: {},
-            };
-        },
-        mounted() {
-            this.init();
-        },
-        computed: {
-            isMobile() {
-                return document.body.clientWidth <= 768;
-            },
-            resultOption() {
-                return {
-                    ...this.tableOption,
-                    ...{
-                        column: this.propOption || [],
-                    },
-                };
-            },
-            rowKey() {
-                return this.tableOption.rowKey || src_global_variable.DIC_PROPS.rowKey;
-            },
-            formRules() {
-                const result = {};
-                this.propOption.forEach((ele) => {
-                    if (ele.rules && ele.display !== false)
-                        result[ele.prop] = ele.rules;
-                });
-                return result;
-            },
-        },
-        methods: {
-            init(type) {
-                const globOption = this.deepClone(this.$AVUE[`${name}Option`]);
-                const option = {
-                    ...globOption,
-                    ...this.option,
-                };
-                this.tableOption = option;
-                this.handleLocalDic();
-                if (type !== false)
-                    this.handleLoadDic();
-            },
-            dicInit(type) {
-                if (type === 'cascader') {
-                    this.handleLoadCascaderDic();
-                }
-                else {
-                    this.handleLoadDic();
-                }
-            },
-            updateDic(prop, list) {
-                const column = this.findObject(this.propOption, prop);
-                const formatter = column.dicFormatter;
-                const callback = (currentList, useFormatter = true) => {
-                    if (useFormatter && typeof formatter === 'function') {
-                        this.DIC[prop] = formatter(currentList, this.tableForm || this.form);
-                    }
-                    else {
-                        this.DIC[prop] = currentList;
-                    }
-                };
-                if (this.validatenull(list) && this.validatenull(prop)) {
-                    this.handleLoadDic();
-                    return;
-                }
-                if (this.validatenull(list) && !this.validatenull(column.dicUrl)) {
-                    src_core_dic.sendDic({
-                        column,
-                    }, this).then((currentList) => {
-                        callback(currentList, false);
-                    });
-                }
-                else {
-                    callback(list || []);
-                }
-            },
-            handleSetDic(list, res = {}) {
-                Object.keys(res).forEach((ele) => {
-                    list[ele] = res[ele];
-                });
-            },
-            handleLocalDic() {
-                src_core_dic.loadLocalDic(this.resultOption, this);
-            },
-            handleLoadDic() {
-                src_core_dic.loadDic(this.resultOption, this);
-            },
-            handleLoadCascaderDic() {
-                src_core_dic.loadCascaderDic(this.propOption, this);
-            },
-        },
-    };
-}
-
-exports.default = init;
+/*! Avue.js v3.9.3 | (c) 2017-2026 Smallwei | Released under the MIT License. */
+'use strict';
+
+Object.defineProperty(exports, '__esModule', { value: true });
+
+var src_core_dic = require('../../../src/core/dic.js');
+var src_global_variable = require('../../../src/global/variable.js');
+var src_core_slot = require('../../../src/core/slot.js');
+var src_core_option = require('../../../src/core/option.js');
+
+const dicRequestStates = new WeakMap();
+const getDicRequestState = (safe) => {
+    let state = dicRequestStates.get(safe);
+    if (!state) {
+        state = {
+            active: new Set(),
+            sequence: {},
+            unmounted: false,
+        };
+        dicRequestStates.set(safe, state);
+    }
+    return state;
+};
+function init (name) {
+    return {
+        mixins: [src_core_slot.default],
+        emits: ['update:modelValue', 'change', 'dic-error'],
+        props: {
+            tableData: {
+                type: Object,
+                default: () => {
+                    return {};
+                },
+            },
+            option: {
+                type: Object,
+                required: true,
+                default: () => {
+                    return {};
+                },
+            },
+        },
+        watch: {
+            propOption: {
+                handler(list) {
+                    list.forEach((ele) => (this.objectOption[ele.prop] = ele));
+                },
+                deep: true,
+            },
+            option: {
+                handler() {
+                    this.init(false);
+                },
+                deep: true,
+            },
+        },
+        data() {
+            return {
+                DIC: {},
+                cascaderDIC: {},
+                tableOption: {},
+                objectOption: {},
+                dicLoading: false,
+                dicError: null,
+            };
+        },
+        mounted() {
+            getDicRequestState(this).unmounted = false;
+            this.init();
+        },
+        beforeUnmount() {
+            const state = getDicRequestState(this);
+            state.unmounted = true;
+            state.active.clear();
+        },
+        computed: {
+            isMobile() {
+                return document.body.clientWidth <= 768;
+            },
+            resultOption() {
+                return {
+                    ...this.tableOption,
+                    ...{
+                        column: this.propOption || [],
+                    },
+                };
+            },
+            rowKey() {
+                return this.tableOption.rowKey || src_global_variable.DIC_PROPS.rowKey;
+            },
+            formRules() {
+                const result = {};
+                this.propOption.forEach((ele) => {
+                    if (ele.rules && ele.display !== false)
+                        result[ele.prop] = ele.rules;
+                });
+                return result;
+            },
+        },
+        methods: {
+            init(type) {
+                const globOption = this.deepClone(this.$AVUE[`${name}Option`]);
+                const option = {
+                    ...globOption,
+                    ...this.option,
+                };
+                this.tableOption = option;
+                const componentName = name || (this.$options.name || '').replace(/^avue-/, '') || 'component';
+                if (this.$AVUE.optionValidate !== false &&
+                    option.optionValidate !== false) {
+                    src_core_option.warnOption(src_core_option.validateOption(option, componentName), componentName);
+                }
+                if (name === 'crud' && typeof this.restoreColumnState === 'function') {
+                    this.restoreColumnState();
+                }
+                this.handleLocalDic();
+                if (type !== false)
+                    this.handleLoadDic();
+            },
+            dicInit(type) {
+                if (type === 'cascader') {
+                    return this.handleLoadCascaderDic();
+                }
+                else {
+                    return this.handleLoadDic();
+                }
+            },
+            updateDic(prop, list) {
+                const column = this.findObject(this.propOption, prop);
+                if (!column)
+                    return Promise.resolve(null);
+                const formatter = column.dicFormatter;
+                const callback = (currentList, useFormatter = true) => {
+                    if (useFormatter && typeof formatter === 'function') {
+                        this.DIC[prop] = formatter(currentList, this.tableForm || this.form);
+                    }
+                    else {
+                        this.DIC[prop] = currentList;
+                    }
+                };
+                if (this.validatenull(list) && this.validatenull(prop)) {
+                    return this.handleLoadDic();
+                }
+                if (this.validatenull(list) && !this.validatenull(column.dicUrl)) {
+                    return this.requestDic({
+                        column,
+                    }, `update:${prop}`).then((currentList) => {
+                        if (currentList)
+                            callback(currentList, false);
+                        return currentList;
+                    });
+                }
+                else {
+                    callback(list || []);
+                    return Promise.resolve(list || []);
+                }
+            },
+            handleSetDic(list, res = {}) {
+                Object.keys(res).forEach((ele) => {
+                    list[ele] = res[ele];
+                });
+            },
+            handleLocalDic() {
+                const localDic = src_core_dic.loadLocalDic(this.resultOption);
+                this.handleSetDic(this.DIC, localDic.data);
+                return this.runDicRequest('local-dic', () => localDic.pending, (result) => {
+                    this.handleSetDic(this.DIC, result);
+                });
+            },
+            handleLoadDic() {
+                return this.runDicRequest('dic', () => src_core_dic.loadDic(this.resultOption, this), (result) => {
+                    this.handleSetDic(this.DIC, result);
+                });
+            },
+            handleLoadCascaderDic() {
+                return this.runDicRequest('cascader', () => src_core_dic.loadCascaderDic(this.propOption, this), (result) => {
+                    Object.keys(result).forEach((index) => {
+                        if (!this.cascaderDIC[index])
+                            this.cascaderDIC[index] = {};
+                        this.handleSetDic(this.cascaderDIC[index], result[index]);
+                    });
+                });
+            },
+            requestDic(params, requestType = 'manual') {
+                return this.runDicRequest(requestType, () => src_core_dic.sendDic(params, this));
+            },
+            runDicRequest(requestType, request, apply) {
+                const state = getDicRequestState(this);
+                const requestId = (state.sequence[requestType] || 0) + 1;
+                const token = `${requestType}:${requestId}`;
+                state.sequence[requestType] = requestId;
+                state.active.add(token);
+                this.dicLoading = true;
+                this.dicError = null;
+                const isCurrent = () => !state.unmounted && state.sequence[requestType] === requestId;
+                return Promise.resolve()
+                    .then(request)
+                    .then((result) => {
+                    if (!isCurrent())
+                        return null;
+                    if (apply)
+                        apply(result);
+                    return result;
+                })
+                    .catch((error) => {
+                    if (isCurrent()) {
+                        this.dicError = error;
+                        this.$emit('dic-error', {
+                            type: requestType,
+                            error,
+                        });
+                    }
+                    return null;
+                })
+                    .finally(() => {
+                    state.active.delete(token);
+                    if (!state.unmounted) {
+                        this.dicLoading = state.active.size > 0;
+                    }
+                });
+            },
+        },
+    };
+}
+
+exports.default = init;