mirror of
https://gitee.com/orangeform/orange-admin.git
synced 2026-01-17 18:46:36 +08:00
commit:前端webpack版本
This commit is contained in:
@@ -547,7 +547,7 @@ export const useForm = (props: ANY_OBJECT, formRef: Ref<FormInstance> | null = n
|
||||
if (widget.props.dictInfo && Array.isArray(widget.props.dictInfo.paramList)) {
|
||||
widget.props.dictInfo.paramList.forEach((param: ANY_OBJECT) => {
|
||||
if (param.dictValueType === SysOnlineParamValueType.STATIC_DICT) {
|
||||
let errorItem = null;
|
||||
let errorItem: ANY_OBJECT | null = null;
|
||||
if (Array.isArray(param.dictValue) && param.dictValue.length === 2) {
|
||||
const dicts = StaticDict as ANY_OBJECT;
|
||||
const staticDict = dicts[param.dictValue[0]];
|
||||
|
||||
@@ -131,7 +131,7 @@ import { useThirdParty } from '@/components/thirdParty/hooks';
|
||||
import { ThirdProps } from '@/components/thirdParty/types';
|
||||
import { useLayoutStore } from '@/store';
|
||||
import BasicForm from './basic/index.vue';
|
||||
import DataModel from './dataModel/indev.vue';
|
||||
import DataModel from './dataModel/index.vue';
|
||||
import FormDesign from './formDesign/index.vue';
|
||||
import EditOnlineForm from './editOnlineForm.vue';
|
||||
const layoutStore = useLayoutStore();
|
||||
@@ -220,7 +220,6 @@ const onNextClick = () => {
|
||||
})
|
||||
.then(res => {
|
||||
res.forEach((item, index) => {
|
||||
console.log('RRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRR', item);
|
||||
getPageDatasourceTableList.value[index].columnList = item;
|
||||
return getPageDatasourceTableList.value[index];
|
||||
});
|
||||
@@ -232,7 +231,7 @@ const onNextClick = () => {
|
||||
activeStep.value = SysOnlinePageSettingStep.FORM_DESIGN;
|
||||
})
|
||||
.catch(e => {
|
||||
console.error(e);
|
||||
console.warn(e);
|
||||
});
|
||||
break;
|
||||
}
|
||||
|
||||
@@ -34,7 +34,6 @@ export const useWidgetToolkit = () => {
|
||||
widgetType: number,
|
||||
formType: number,
|
||||
) {
|
||||
console.log(column, widgetType, formType);
|
||||
if (column == null) {
|
||||
return {
|
||||
disabled: true,
|
||||
@@ -43,7 +42,7 @@ export const useWidgetToolkit = () => {
|
||||
}
|
||||
const columnFieldType = getColumnDataType(column);
|
||||
let disabled = false;
|
||||
let warningMsg = null;
|
||||
let warningMsg: string | null = null;
|
||||
if (column.fieldKind === SysOnlineFieldKind.UPLOAD) {
|
||||
disabled = widgetType !== SysCustomWidgetType.Upload;
|
||||
warningMsg = SysOnlineFieldKind.getValue(column.fieldKind);
|
||||
|
||||
@@ -133,7 +133,7 @@
|
||||
</div>
|
||||
</div>
|
||||
</el-tab-pane>
|
||||
<el-tab-pane label="示例说明" name="cases">
|
||||
<el-tab-pane label="示例说明" name="cases" :lazy="true">
|
||||
<p style="margin-bottom: 16px">
|
||||
<strong>在线表单,</strong>
|
||||
通过在线表单编辑器创建,配置并绑定菜单后即可生效,无代码修改,适用于相对简单的表单页面。
|
||||
|
||||
@@ -425,31 +425,6 @@
|
||||
</el-config-provider>
|
||||
</template>
|
||||
|
||||
<script lang="ts">
|
||||
const defaultApprovalStatus = [
|
||||
{
|
||||
id: 1,
|
||||
name: '同意',
|
||||
},
|
||||
{
|
||||
id: 2,
|
||||
name: '拒绝',
|
||||
},
|
||||
{
|
||||
id: 3,
|
||||
name: '驳回',
|
||||
},
|
||||
{
|
||||
id: 4,
|
||||
name: '会签同意',
|
||||
},
|
||||
{
|
||||
id: 5,
|
||||
name: '会签拒绝',
|
||||
},
|
||||
];
|
||||
</script>
|
||||
|
||||
<script setup lang="ts">
|
||||
import { VxeTable, VxeColumn } from 'vxe-table';
|
||||
import zhCn from 'element-plus/dist/locale/zh-cn.mjs';
|
||||
@@ -494,7 +469,13 @@ import ProcessDesigner from '../components/ProcessDesigner.vue';
|
||||
import EditFlowEntryStatus from './formEditFlowEntryStatus.vue';
|
||||
import EditFlowEntryVariable from './formEditFlowEntryVariable.vue';
|
||||
const layoutStore = useLayoutStore();
|
||||
|
||||
const defaultApprovalStatus = [
|
||||
{ id: 1, name: '同意' },
|
||||
{ id: 2, name: '拒绝' },
|
||||
{ id: 3, name: '驳回' },
|
||||
{ id: 4, name: '会签同意' },
|
||||
{ id: 5, name: '会签拒绝' },
|
||||
];
|
||||
interface IProps extends ThirdProps {
|
||||
flowEntry?: ANY_OBJECT;
|
||||
// 当使用Dialog.show弹出组件时,须定义该prop属性,以便对dialog进行回调
|
||||
|
||||
@@ -125,14 +125,12 @@ import { useLayoutStore } from '@/store';
|
||||
const layoutStore = useLayoutStore();
|
||||
|
||||
interface IProps extends ThirdProps {
|
||||
flowEntry: ANY_OBJECT;
|
||||
flowEntry?: ANY_OBJECT | undefined;
|
||||
// 当使用Dialog.show弹出组件时,须定义该prop属性,以便对dialog进行回调
|
||||
dialog?: DialogProp<ANY_OBJECT>;
|
||||
}
|
||||
const props = withDefaults(defineProps<IProps>(), {
|
||||
flowEntry: () => {
|
||||
return {};
|
||||
},
|
||||
flowEntry: undefined,
|
||||
});
|
||||
const { thirdParams } = useThirdParty(props);
|
||||
const formItemSize = computed(() => {
|
||||
|
||||
Reference in New Issue
Block a user