diff --git a/.env.development b/.env.development index 52d7d18..5e3dc12 100644 --- a/.env.development +++ b/.env.development @@ -23,6 +23,9 @@ VITE_APP_SUB_jeecg-app-1 = '//localhost:8092' # 试验田机构编码 VITE_SYTJGBM = '101' +# 服务指令 +VITE_DIRECTIVE_UPLOAD_PATH = '' + # 填写后将作为乾坤子应用启动,主应用注册时AppName需保持一致(放开 VITE_GLOB_QIANKUN_MICRO_APP_NAME 参数表示jeecg-vue3将以乾坤子应用模式启动) #VITE_GLOB_QIANKUN_MICRO_APP_NAME=jeecg-vue3 # 作为乾坤子应用启动时必填,需与qiankun主应用注册子应用时填写的 entry 保持一致 diff --git a/src/components/Form/src/jeecg/components/JDictSelectTag.vue b/src/components/Form/src/jeecg/components/JDictSelectTag.vue index 74bb3bd..0066e73 100644 --- a/src/components/Form/src/jeecg/components/JDictSelectTag.vue +++ b/src/components/Form/src/jeecg/components/JDictSelectTag.vue @@ -34,7 +34,8 @@ - {{ item.label }}{{ ignoreDisabled && item.disabled ? '(已停用)' : '' }} + {{ item.label }}{{ ignoreDisabled && item.disabled ? '(已停用)' : '' + }} @@ -76,9 +77,9 @@ export default defineComponent({ }, style: propTypes.any, ignoreDisabled: propTypes.bool.def(false), - orgCode:'',//组织机构编码 会切换数据源 + orgCode: '',//组织机构编码 会切换数据源 }, - emits: ['options-change', 'change', 'update:value'], + emits: ['options-change', 'change', 'update:value', 'upDictCode'], setup(props, { emit, refs }) { const dictOptions = ref([]); const attrs = useAttrs(); @@ -127,8 +128,8 @@ export default defineComponent({ async function initDictData() { let { dictCode, stringToNumber } = props; //根据字典Code, 初始化字典数组 - const dictData = await initDictOptions(dictCode,props.orgCode); - + const dictData = await initDictOptions(dictCode, props.orgCode); + dictOptions.value = dictData.reduce((prev, next) => { if (next) { const value = next['value']; @@ -142,11 +143,13 @@ export default defineComponent({ } return prev; }, []); + emit('upDictCode', dictOptions.value) } function handleChange(e) { const { mode } = unref(getBindValue); let changeValue: any; + let changeLabel: any; // 兼容多选模式 //update-begin---author:wangshuai ---date:20230216 for:[QQYUN-4290]公文发文:选择机关代字报错,是因为值改变触发了change事件三次,导致数据发生改变------------ @@ -162,11 +165,13 @@ export default defineComponent({ } } else { changeValue = e?.target?.value ?? e; + // changeLabel = dictOptions.value.filter(d => d.value == changeValue)[0].label } state.value = changeValue; //update-begin---author:wangshuai ---date:20230403 for:【issues/4507】JDictSelectTag组件使用时,浏览器给出警告提示:Expected Function, got Array------------ emit('update:value', changeValue) + // emit('upLabel', changeLabel) //update-end---author:wangshuai ---date:20230403 for:【issues/4507】JDictSelectTag组件使用时,浏览器给出警告提示:Expected Function, got Array述------------ //update-end---author:wangshuai ---date:20230216 for:[QQYUN-4290]公文发文:选择机关代字报错,是因为值改变触发了change事件三次,导致数据发生改变------------ diff --git a/src/views/services/serviceDirective/ConfigServiceDirective.api.ts b/src/views/services/serviceDirective/ConfigServiceDirective.api.ts index 9afa076..b42e202 100644 --- a/src/views/services/serviceDirective/ConfigServiceDirective.api.ts +++ b/src/views/services/serviceDirective/ConfigServiceDirective.api.ts @@ -4,14 +4,14 @@ import { useMessage } from "/@/hooks/web/useMessage"; const { createConfirm } = useMessage(); enum Api { - list = '/services/serviceDirective/configServiceDirective/list', - save='/services/serviceDirective/configServiceDirective/add', - edit='/services/serviceDirective/configServiceDirective/edit', - deleteOne = '/services/serviceDirective/configServiceDirective/delete', - deleteBatch = '/services/serviceDirective/configServiceDirective/deleteBatch', - importExcel = '/services/serviceDirective/configServiceDirective/importExcel', - exportXls = '/services/serviceDirective/configServiceDirective/exportXls', - async = '/services/serviceDirective/configServiceDirective/async', + list = '/services/serviceDirective/list', + save='/services/serviceDirective/add', + edit='/services/serviceDirective/edit', + deleteOne = '/services/serviceDirective/delete', + deleteBatch = '/services/serviceDirective/deleteBatch', + importExcel = '/services/serviceDirective/importExcel', + exportXls = '/services/serviceDirective/exportXls', + async = '/services/serviceDirective/async', departList = '/sys/sysDepart/list', } diff --git a/src/views/services/serviceDirective/ConfigServiceDirectiveList.vue b/src/views/services/serviceDirective/ConfigServiceDirectiveList.vue index 6461a5a..e753d8c 100644 --- a/src/views/services/serviceDirective/ConfigServiceDirectiveList.vue +++ b/src/views/services/serviceDirective/ConfigServiceDirectiveList.vue @@ -93,11 +93,11 @@ - - diff --git a/src/views/synchronization/directive/directiveCom/ConfigServiceDirective.api.ts b/src/views/synchronization/directive/directiveCom/ConfigServiceDirective.api.ts index ed1e4fd..05f58a2 100644 --- a/src/views/synchronization/directive/directiveCom/ConfigServiceDirective.api.ts +++ b/src/views/synchronization/directive/directiveCom/ConfigServiceDirective.api.ts @@ -4,14 +4,14 @@ import { useMessage } from "/@/hooks/web/useMessage"; const { createConfirm } = useMessage(); enum Api { - list = '/services/serviceDirective/configServiceDirective/list', - save='/services/serviceDirective/configServiceDirective/add', - edit='/services/serviceDirective/configServiceDirective/edit', - deleteOne = '/services/serviceDirective/configServiceDirective/delete', - deleteBatch = '/services/serviceDirective/configServiceDirective/deleteBatch', - importExcel = '/services/serviceDirective/configServiceDirective/importExcel', - exportXls = '/services/serviceDirective/configServiceDirective/exportXls', - async = '/services/serviceDirective/configServiceDirective/async', + list = '/services/serviceDirective/list', + save='/services/serviceDirective/add', + edit='/services/serviceDirective/edit', + deleteOne = '/services/serviceDirective/delete', + deleteBatch = '/services/serviceDirective/deleteBatch', + importExcel = '/services/serviceDirective/importExcel', + exportXls = '/services/serviceDirective/exportXls', + async = '/services/serviceDirective/async', } /** diff --git a/src/views/synchronization/directive/serviceDirective/ConfigServiceDirective.api.ts b/src/views/synchronization/directive/serviceDirective/ConfigServiceDirective.api.ts index f768be0..d8e7d95 100644 --- a/src/views/synchronization/directive/serviceDirective/ConfigServiceDirective.api.ts +++ b/src/views/synchronization/directive/serviceDirective/ConfigServiceDirective.api.ts @@ -4,7 +4,7 @@ import { useMessage } from "/@/hooks/web/useMessage"; const { createConfirm } = useMessage(); enum Api { - list = '/services/serviceDirective/configServiceDirective/list', + list = '/services/serviceDirective/list', } /**